From 9ba6b821e9acf2558c53334c779c0da9ef5d4836 Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@uwog.net>
Date: Mon, 28 May 2007 19:18:56 +0000
Subject: Fix merge

Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write

Conflicts:

	AbiWordActivity.py
	activity/activity.info
---
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])
diff --git a/activity/activity.info b/activity/activity.info
index 523504f..87e9519 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,5 +3,5 @@ name = Write
 service_name = org.laptop.AbiWordActivity
 class = AbiWordActivity.AbiWordActivity
 icon = activity-write
-activity_version = 18
+activity_version = 19
 show_launcher = 1
--
cgit v0.9.1