Migrating from the early toolbarbox-toolkit modules to Sugar Toolkit

This little patch is the second step in the Gtk3 migration.
Here I remove some few unnecesary files always when it was possible, and use Sugar Toolkit.
The purpose is to prevent a headache at the time of porting to Gtk3 the activity, and of course remove some useless kilobytes and not having written the same code twice.

I also modified the .gitignore file, I didn't type 'git add .gitignore' previous than my commit so I didn't expect it would appear in my patch, I think git has its own life :) , but anyway, is better having a correct .gitignore .

Signed-off-by: Daniel Francis <francis@sugarlabs.org>

1 files changed, 115 insertions, 0 deletions

diff --git a/shared_activity.py b/shared_activity.py
new file mode 100644
index 0000000..a537958
--- /dev/null
+++ b/shared_activity.py
@@ -0,0 +1,115 @@
+# Copyright (C) 2009, Aleksey Lim
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+"""Extend sugar-toolkit activity class"""
+
+import logging
+import telepathy
+
+from sugar.activity import activity
+from sugar.presence.sugartubeconn import SugarTubeConnection
+
+
+class SharedActivity(activity.Activity):
+    """Basic activity class with sharing features"""
+
+    def __init__(self, canvas, service, handle):
+        """
+        Initialise the Activity.
+
+        canvas -- gtk.Widget
+            root widget for activity content
+
+        service -- string
+            dbus service for activity
+
+        handle -- sugar.activity.activityhandle.ActivityHandle
+            instance providing the activity id and access to the
+            presence service which *may* provide sharing for this
+            application
+
+        """
+        activity.Activity.__init__(self, handle)
+        self.set_canvas(canvas)
+        self.service = service
+
+        self.connect('shared', self._shared_cb)
+
+        # Owner.props.key
+        if self._shared_activity:
+            # We are joining the activity
+            self.connect('joined', self._joined_cb)
+            if self.get_shared():
+                # We've already joined
+                self._joined_cb()
+
+    def _shared_cb(self, activity):
+        logging.debug('My activity was shared')
+        self.__initiator = True
+        self._sharing_setup()
+
+        logging.debug('This is my activity: making a tube...')
+        self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
+                                                            self.service, {})
+
+    def _joined_cb(self, activity):
+        if not self._shared_activity:
+            return
+
+        logging.debug('Joined an existing shared activity')
+
+        self.__initiator = False
+        self._sharing_setup()
+
+        logging.debug('This is not my activity: waiting for a tube...')
+        self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes(
+            reply_handler=self._list_tubes_reply_cb,
+            error_handler=self._list_tubes_error_cb)
+
+    def _sharing_setup(self):
+        if self._shared_activity is None:
+            logging.error('Failed to share or join activity')
+            return
+        self._conn = self._shared_activity.telepathy_conn
+        self._tubes_chan = self._shared_activity.telepathy_tubes_chan
+        self._text_chan = self._shared_activity.telepathy_text_chan
+
+        self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
+                'NewTube', self._new_tube_cb)
+
+    def _list_tubes_reply_cb(self, tubes):
+        for tube_info in tubes:
+            self._new_tube_cb(*tube_info)
+
+    def _list_tubes_error_cb(self, e):
+        logging.error('ListTubes() failed: %s', e)
+
+    def _new_tube_cb(self, id, initiator, type, service, params, state):
+        logging.debug('New tube: ID=%d initator=%d type=%d service=%s '
+                     'params=%r state=%d', id, initiator, type, service,
+                     params, state)
+
+        if (type == telepathy.TUBE_TYPE_DBUS and
+                service == self.service):
+            if state == telepathy.TUBE_STATE_LOCAL_PENDING:
+                self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES] \
+                        .AcceptDBusTube(id)
+
+            tube_conn = SugarTubeConnection(self._conn,
+                self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES], id,
+                group_iface=self._text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
+
+            self._share(tube_conn, self.__initiator)