Changeset 8535 for trunk/src/gajim.py

Timestamp:

08/22/07 01:13:03 (17 months ago)

Author:

asterix

Message:

[roidelapluie, elghinn, msieurhappy, xbright and me] chat to muc convertion. see #2095 and #1408. TODO: DND

Files:

• trunk/src/gajim.py (modified) (5 diffs)

trunk/src/gajim.py

@@ -1211 +1211 @@
                         gajim.connections[account].send_gc_config(room_jid, array[1])
                         # invite contacts
+                        # check if it is necessary to add <continue />
+                        continue_tag = False
+                        if gajim.automatic_rooms[account][room_jid].has_key('continue_tag'):
+                                continue_tag = True
                         if gajim.automatic_rooms[account][room_jid].has_key('invities'):
                                 for jid in gajim.automatic_rooms[account][room_jid]['invities']:
-                                        gajim.connections[account].send_invite(room_jid, jid)
+                                        gajim.connections[account].send_invite(room_jid, jid,
+                                                continue_tag=continue_tag)
                         del gajim.automatic_rooms[account][room_jid]
                 elif not self.instances[account]['gc_config'].has_key(room_jid):
@@ -1290 +1295 @@
 
         def handle_event_gc_invitation(self, account, array):
-                #('GC_INVITATION', (room_jid, jid_from, reason, password))
+                #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))
                 jid = gajim.get_jid_without_resource(array[1])
                 room_jid = array[0]
                 if helpers.allow_popup_window(account) or not self.systray_enabled:
                         dialogs.InvitationReceivedDialog(account, room_jid, jid, array[3],
-                                array[2])
+                                array[2], is_continued=array[4])
                         return
 
                 self.add_event(account, jid, 'gc-invitation', (room_jid, array[2],
-                        array[3]))
+                        array[3], array[4]))
 
                 if helpers.allow_showing_notification(account):
@@ -1867 +1872 @@
                         _('You are already connected to this account with the same resource. Please type a new one'), input_str = gajim.connections[account].server_resource,
                         is_modal = False, ok_handler = on_ok)
+
+        def handle_event_unique_room_id_supported(self, account, data):
+                '''Receive confirmation that unique_room_id are supported'''
+                # ('UNIQUE_ROOM_ID_SUPPORTED', server, instance, room_id)
+                instance = data[1]
+                instance.unique_room_id_supported(data[0], data[2])
+
+        def handle_event_unique_room_id_unsupported(self, account, data):
+                # ('UNIQUE_ROOM_ID_UNSUPPORTED', server, instance)
+                instance = data[1]
+                instance.unique_room_id_error(data[0])
 
         def read_sleepy(self):
@@ -2196 +2212 @@
                         'SEARCH_RESULT': self.handle_event_search_result,
                         'RESOURCE_CONFLICT': self.handle_event_resource_conflict,
+                        'UNIQUE_ROOM_ID_UNSUPPORTED': \
+                                self.handle_event_unique_room_id_unsupported,
+                        'UNIQUE_ROOM_ID_SUPPORTED': self.handle_event_unique_room_id_supported,
                 }
                 gajim.handlers = self.handlers
@@ -2288 +2307 @@
                         data = event.parameters
                         dialogs.InvitationReceivedDialog(account, data[0], jid, data[2],
-                                data[1])
+                                data[1], data[3])
                         gajim.events.remove_events(account, jid, event)
                         self.roster.draw_contact(jid, account)