Merge branch 'master' of git.sugarlabs.org:write/mainline

3 files changed, 12 insertions, 21 deletions

diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index 7de5423..76e72c4 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -173,22 +173,6 @@ class AbiWordActivity(activity.Activity):
 
         self.set_canvas(overlay)
 
-        self.abiword_canvas.connect_after('map-event', self.__map_event_cb)
-        self.abiword_canvas.show()
-        self.connect_after('map-event', self.__map_activity_event_cb)
-
-        self.abiword_canvas.connect('size-allocate', self.size_allocate_cb)
-
-    def size_allocate_cb(self, abi, alloc):
-        logging.error('size allocate %s', alloc)
-        GObject.idle_add(abi.queue_draw)
-
-    def __map_event_cb(self, event, activity):
-        logger.debug('__map_event_cb abi')
-
-        # no ugly borders please
-        #self.abiword_canvas.set_property("shadow-type", Gtk.ShadowType.NONE)
-
         # we want a nice border so we can select paragraphs easily
         self.abiword_canvas.set_show_margin(True)
 
@@ -211,12 +195,19 @@ class AbiWordActivity(activity.Activity):
                     self._buddy_joined_cb)
             self.shared_activity.connect('buddy-left', self._buddy_left_cb)
             if self.get_shared():
-#                # oh, OK, we've already joined
                 self._joined_cb(self)
         else:
             # we are creating the activity
             logger.error("We are creating an activity")
 
+        self.abiword_canvas.show()
+        self.connect_after('map-event', self.__map_activity_event_cb)
+
+        self.abiword_canvas.connect('size-allocate', self.size_allocate_cb)
+
+    def size_allocate_cb(self, abi, alloc):
+        GObject.idle_add(abi.queue_draw)
+
     def __map_activity_event_cb(self, event, activity):
         # set custom keybindings for Write
         # we do it later because have problems if done before - OLPC #11049
diff --git a/activity/activity.info b/activity/activity.info
index aa31c79..0562015 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,7 +3,7 @@ name = Write
 bundle_id = org.laptop.AbiWordActivity
 exec = sugar-activity AbiWordActivity.AbiWordActivity
 icon = activity-write
-activity_version = 89
+activity_version = 90
 show_launcher = 1
 mime_types = text/rtf;text/plain;application/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/xhtml+xml;text/html;application/vnd.oasis.opendocument.text
 license = GPLv2+
diff --git a/speechtoolbar.py b/speechtoolbar.py
index 1c9c291..268879a 100644
--- a/speechtoolbar.py
+++ b/speechtoolbar.py
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
-import simplejson
+import json
 from gettext import gettext as _
 import logging
 
@@ -97,7 +97,7 @@ class SpeechToolbar(Gtk.Toolbar):
         if os.path.exists(data_file_name):
             f = open(data_file_name, 'r')
             try:
-                speech_parameters = simplejson.load(f)
+                speech_parameters = json.load(f)
                 speech.voice = speech_parameters['voice']
             finally:
                 f.close()
@@ -150,7 +150,7 @@ class SpeechToolbar(Gtk.Toolbar):
         data_file_name = os.path.join(data_path, 'speech_params.json')
         f = open(data_file_name, 'w')
         try:
-            simplejson.dump(speech_parameters, f)
+            json.dump(speech_parameters, f)
         finally:
             f.close()