diff sat_bridge/DBus.py @ 72:f271fff3a713

MUC implementation: first draft /!\ the experimental muc branche of wokkel must be used - bridge: new roomJoined signal - wix: contact list widget is now in a separate file, and manage different kinds of presentation - wix: chat window now manage group chat (first draft, not working yet) - wix: constants are now in a separate class, so then can be accessible from everywhere - wix: new menu to join room (do nothing yet, except entering in a test room) - new plugin for xep 0045 (MUC), use wokkel experimental MUC branch - plugins: the profile is now given for get_handler, cause it can be used internally by a plugin (e.g.: xep-0045 plugin)
author Goffi <goffi@goffi.org>
date Sun, 21 Mar 2010 10:28:55 +1100
parents 9b842086d915
children 9d113b5471e6
line wrap: on
line diff
--- a/sat_bridge/DBus.py	Sat Mar 06 14:57:23 2010 +1100
+++ b/sat_bridge/DBus.py	Sun Mar 21 10:28:55 2010 +1100
@@ -69,6 +69,11 @@
         debug("presence update signal (from:%s show:%s priority:%d statuses:%s profile:%s) sended" , entity, show, priority, statuses, profile)
 
     @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
+                         signature='ssasss')
+    def roomJoined(self, room_id, room_service, room_nicks, user_nick, profile):
+        debug("room joined signal: id:%(room_id)s service:%(room_service)s nicks:%(room_nicks)s user:%(user_nick)s profile=%(profile)s" % {'room_id':room_id, 'room_service':room_service, 'room_nicks':room_nicks, 'user_nick':user_nick, 'profile':profile})
+
+    @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
                          signature='sss')
     def subscribe(self, type, entity, profile):
         debug("subscribe (type: [%s] from:[%s] profile:[%s])" , type, entity, profile)
@@ -307,6 +312,9 @@
     def presenceUpdate(self, entity, show, priority, statuses, profile):
         debug("updating presence for %s",entity)
         self.dbus_bridge.presenceUpdate(entity, show, priority, statuses, profile)
+    
+    def roomJoined(self, room_id, room_service, room_nicks, user_nick, profile):
+        self.dbus_bridge.roomJoined(room_id, room_service, room_nicks, user_nick, profile)
 
     def subscribe(self, type, entity, profile):
         debug("subscribe request for %s",entity)