From 363f82820557e3b15e6c36334bceeae1f863ed31 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Thu, 15 Jul 2010 08:50:05 +0000
Subject: Handle invitations using Mission Control 5.

src/sugar/activity/activity.py: If the activity is being invoked to
handle an invite, create a Client.Handler instance and share the
activity when HandleChannels is invoked.

src/sugar/activity/activityfactory.py,
src/sugar/activity/activityhandle.py,
src/sugar/activity/main.py: Add a -i switch that indicates to the
activity that it should handle the channel from an invitation.

src/sugar/presence/activity.py: Expose Activity.room_handle.

src/sugar/presence/presenceservice.py: Add get_activity_by_handle().

src/sugar/presence/util.py: Add get_account_for_connection().
---
(limited to 'src/sugar/presence/presenceservice.py')

diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py
index d0e20dc..02f727c 100644
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar/presence/presenceservice.py
@@ -280,6 +280,24 @@ class PresenceService(gobject.GObject):
 
         return None
 
+    def get_activity_by_handle(self, connection_path, room_handle):
+        if self._activity_cache is not None:
+            if self._activity_cache.room_handle != room_handle:
+                raise RuntimeError('Activities can only access their own shared'
+                                   'instance')
+            return self._activity_cache
+        else:
+            connection_manager = get_connection_manager()
+            account_path = connection_manager.get_account_for_connection(connection_path)
+
+            connection_name = connection_path.replace('/', '.')[1:]
+            bus = dbus.SessionBus()
+            connection = bus.get_object(connection_name, connection_path)
+            activity = Activity(account_path, connection,
+                                room_handle=room_handle)
+            self._activity_cache = activity
+            return activity
+
     def get_buddies(self):
         """Retrieve set of all buddies from service
 
--
cgit v0.9.1