diff options
author | Marc Maurer <uwog@uwog.net> | 2007-05-28 19:18:56 (GMT) |
---|---|---|
committer | Marc Maurer <uwog@uwog.net> | 2007-05-28 19:18:56 (GMT) |
commit | 9ba6b821e9acf2558c53334c779c0da9ef5d4836 (patch) | |
tree | 2fc018e8fc0a9db7debd43f55874b95515d68780 /AbiWordActivity.py | |
parent | d79fad4a0364f951ddd8ae4c3ee3d5813f06d892 (diff) | |
parent | 1a35837b2e33407a62909d6a2fc7884df7fe9f28 (diff) |
Fix merge
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write
Conflicts:
AbiWordActivity.py
activity/activity.info
Diffstat (limited to 'AbiWordActivity.py')
-rw-r--r-- | AbiWordActivity.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/AbiWordActivity.py b/AbiWordActivity.py index 661e47a..1c06878 100644 --- a/AbiWordActivity.py +++ b/AbiWordActivity.py @@ -95,7 +95,9 @@ class AbiWordActivity (Activity): def _map_cb(self, activity): logger.debug('_map_cb') - self.read_file() + # FIXME: this should be called by activity.Activity on realize + if self.jobject.file_path: + self.read_file() # activity sharing pservice = presenceservice.get_instance() @@ -277,7 +279,6 @@ class AbiWordActivity (Activity): def write_file(self): text_content = self.abiword_canvas.get_content(".txt")[0] self.jobject['preview'] = text_content[0:60] - self.jobject['icon'] = 'theme:object-text' f = open(self.jobject.file_path, 'w') try: f.write(self.abiword_canvas.get_content(".abw")[0]) |