Now that there is no activity-shared signal, remove the signal param throughout the join process

1 files changed, 20 insertions, 20 deletions

diff --git a/src/server_plugin.py b/src/server_plugin.py
index 6545fa1..84554bd 100644
--- a/src/server_plugin.py
+++ b/src/server_plugin.py
@@ -478,13 +478,13 @@ class ServerPlugin(gobject.GObject):
                 reply_handler=set_self_avatar_cb,
                 error_handler=lambda e: self._log_error_cb("setting avatar", e))
 
-    def _join_activity_channel_props_set_cb(self, activity_id, signal, handle,
+    def _join_activity_channel_props_set_cb(self, activity_id, handle,
                                             channel, userdata):
         self._joined_activities.append((activity_id, handle))
         self._set_self_activities()
-        self.emit(signal, activity_id, channel, None, userdata)
+        self.emit('activity-joined', activity_id, channel, None, userdata)
 
-    def _join_activity_channel_props_listed_cb(self, activity_id, signal,
+    def _join_activity_channel_props_listed_cb(self, activity_id,
                                                handle, channel, userdata,
                                                props, prop_specs):
 
@@ -501,15 +501,15 @@ class ServerPlugin(gobject.GObject):
         if props_to_set:
             channel[PROPERTIES_INTERFACE].SetProperties(props_to_set,
                 reply_handler=lambda: self._join_activity_channel_props_set_cb(
-                    activity_id, signal, handle, channel, userdata),
+                    activity_id, handle, channel, userdata),
                 error_handler=lambda e: self._join_error_cb(
-                    activity_id, signal, userdata,
+                    activity_id, userdata,
                     'SetProperties(%r)' % props_to_set, e))
         else:
-            self._join_activity_channel_props_set_cb(activity_id, signal,
+            self._join_activity_channel_props_set_cb(activity_id,
                     handle, channel, userdata)
 
-    def _join_activity_create_channel_cb(self, activity_id, signal, handle,
+    def _join_activity_create_channel_cb(self, activity_id, handle,
                                          userdata, chan_path):
         channel = Channel(self._conn.service_name, chan_path)
         props = {
@@ -521,11 +521,11 @@ class ServerPlugin(gobject.GObject):
         }
         channel[PROPERTIES_INTERFACE].ListProperties(
             reply_handler=lambda prop_specs: self._join_activity_channel_props_listed_cb(
-                activity_id, signal, handle, channel, userdata, props, prop_specs),
+                activity_id, handle, channel, userdata, props, prop_specs),
             error_handler=lambda e: self._join_error_cb(
-                activity_id, signal, userdata, 'ListProperties', e))
+                activity_id, userdata, 'ListProperties', e))
 
-    def _join_activity_get_channel_cb(self, activity_id, signal, userdata,
+    def _join_activity_get_channel_cb(self, activity_id, userdata,
                                       handles):
         if not self._activities.has_key(activity_id):
             self._activities[activity_id] = handles[0]
@@ -533,24 +533,24 @@ class ServerPlugin(gobject.GObject):
         if (activity_id, handles[0]) in self._joined_activities:
             e = RuntimeError("Already joined activity %s" % activity_id)
             _logger.debug('%s', e)
-            self.emit(signal, activity_id, None, e, userdata)
+            self.emit('activity-joined', activity_id, None, e, userdata)
             return
 
         self._conn[CONN_INTERFACE].RequestChannel(CHANNEL_TYPE_TEXT,
             HANDLE_TYPE_ROOM, handles[0], True,
             reply_handler=lambda *args: self._join_activity_create_channel_cb(
-                activity_id, signal, handles[0], userdata, *args),
-            error_handler=lambda e: self._join_error_cb(activity_id, signal,
+                activity_id, handles[0], userdata, *args),
+            error_handler=lambda e: self._join_error_cb(activity_id,
                 userdata, 'RequestChannel(TEXT, ROOM, %r, True)' % handles[0],
                 e))
 
-    def _join_error_cb(self, activity_id, signal, userdata, where, err):
+    def _join_error_cb(self, activity_id, userdata, where, err):
         e = Exception("Error joining/sharing activity %s: (%s): %s"
                       % (activity_id, where, err))
         _logger.debug('%s', e)
-        self.emit(signal, activity_id, None, e, userdata)
+        self.emit('activity-joined', activity_id, None, e, userdata)
 
-    def _internal_join_activity(self, activity_id, signal, userdata):
+    def _internal_join_activity(self, activity_id, userdata):
         handle = self._activities.get(activity_id)
         if not handle:
             # FIXME: figure out why the server can't figure this out itself
@@ -558,12 +558,12 @@ class ServerPlugin(gobject.GObject):
             self._conn[CONN_INTERFACE].RequestHandles(HANDLE_TYPE_ROOM,
                     [room_jid],
                     reply_handler=lambda *args: self._join_activity_get_channel_cb(
-                        activity_id, signal, userdata, *args),
+                        activity_id, userdata, *args),
                     error_handler=lambda e: self._join_error_cb(activity_id,
-                        signal, userdata, 'RequestHandles([%u])' % room_jid,
+                        userdata, 'RequestHandles([%u])' % room_jid,
                         e))
         else:
-            self._join_activity_get_channel_cb(activity_id, signal, userdata,
+            self._join_activity_get_channel_cb(activity_id, userdata,
                     [handle])
 
     def join_activity(self, activity_id, userdata):
@@ -578,7 +578,7 @@ class ServerPlugin(gobject.GObject):
         for the activity or return a handle to an already created
         conference channel for the activity.
         """
-        self._internal_join_activity(activity_id, "activity-joined", userdata)
+        self._internal_join_activity(activity_id, userdata)
 
     def _ignore_success_cb(self):
         """Ignore an event (null-operation)"""