changes2

2 files changed, 20 insertions, 19 deletions

diff --git a/activity.py b/activity.py
index 2920950..39b0660 100644
--- a/activity.py
+++ b/activity.py
@@ -106,8 +106,8 @@ class SpeakActivity(SharedActivity):
 
         box.show_all()
         self.notebook.append_page(box)
-
-     """   self.chat = chat.View()
+        """
+        self.chat = chat.View()
         self.chat.show_all()
         self.notebook.append_page(self.chat)
 	"""
@@ -220,10 +220,10 @@ class SpeakActivity(SharedActivity):
                         for i in self.entrycombo.get_model()],
                 }
         file(file_path, 'w').write(json.dumps(cfg))
-"""
+    """
     def share_instance(self, connection, is_initiator):
         self.chat.messenger = Messenger(connection, is_initiator, self.chat)
-"""
+    """
     def _cursor_moved_cb(self, entry, *ignored):
         # make the eyes track the motion of the text cursor
         index = entry.props.cursor_position
@@ -469,11 +469,11 @@ class SpeakActivity(SharedActivity):
         old_voice = self.voices.props.value
         self.voices.set_model(voices_model)
         self._set_voice(old_voice)
-  """ 
+        """ 
         if is_first_session:
         	self.chat.me.say_notification(
                     _("You are in off-line mode, share and invite someone."))
-"""
+        """
     def __changed_voices_cb(self, combo):
         voice = combo.props.value
         self.face.set_voice(voice)
diff --git a/toolkit/activity.py b/toolkit/activity.py
index 13897e9..4a8b670 100644
--- a/toolkit/activity.py
+++ b/toolkit/activity.py
@@ -81,9 +81,9 @@ class Activity(activity.Activity):
     def on_save_instance(self, cb, *args):
         """ Register callback which will be invoked before save_instance """
         self.__on_save_instance.append((cb, args))
-
+    """
     def share_instance(self, connection, is_initiator):
-        """
+        
         Activity was shared/joined.
 
         connection -- SugarTubeConnection object
@@ -96,9 +96,9 @@ class Activity(activity.Activity):
 
         Will be invoked after __init__() and {new,resume}_instance().
         Subclass should implement this method to catch sharing stage.
-        """
+        
         pass
-
+    """
     def set_toolbar_box(self, toolbox):
         if hasattr(activity.Activity, 'set_toolbar_box'):
             activity.Activity.set_toolbar_box(self, toolbox)
@@ -112,13 +112,13 @@ class Activity(activity.Activity):
             return self.get_toolbox()
 
     toolbar_box = property(get_toolbar_box, set_toolbar_box)
-
+    """
     def get_shared_activity(self):
         if hasattr(activity.Activity, 'get_shared_activity'):
             return activity.Activity.get_shared_activity(self)
         else:
             return self._shared_activity
-
+    """
     def notify_alert(self, title, msg):
         """Raise standard notify alert"""
         alert = NotifyAlert(title=title, msg=msg)
@@ -152,7 +152,7 @@ class Activity(activity.Activity):
 
         if self._cursor != cursor:
             self._cursor = cursor
-            self.window.set_cursor(self._cursor)
+            self.get_window().set_cursor(self._cursor)
 
     def __init__(self, canvas, handle):
         """
@@ -227,7 +227,7 @@ class Activity(activity.Activity):
             self.__instance();
 
         return False
-
+    """
     def _share(self, tube_conn, initiator):
         logging.debug('Activity._share state=%s' % self.__state)
 
@@ -239,13 +239,13 @@ class Activity(activity.Activity):
             self.__instance();
         elif self.__state == _POST_INSTANCE:
             self.share_instance(tube_conn, initiator)
-
-
+    """
+"""
 class SharedActivity(Activity):
-    """Basic activity class with sharing features"""
+    Basic activity class with sharing features
 
     def __init__(self, canvas, service, handle):
-        """
+        
         Initialise the Activity.
 
         canvas -- Gtk.Widget
@@ -259,7 +259,7 @@ class SharedActivity(Activity):
             presence service which *may* provide sharing for this
             application
 
-        """
+        
         Activity.__init__(self, canvas, handle)
         self.service = service
 
@@ -330,3 +330,4 @@ class SharedActivity(Activity):
                 group_iface=self._text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
 
             self._share(tube_conn, self.__initiator)
+"""