Changeset 83

Timestamp:

07/16/07 20:21:09 (3 years ago)

Author:

roidelapluie

Message:

Fatser way to determine unqiue room ID (don't ask server ...) & add a
<continue /> tag to invitation

Location:

gajim/branches/chat2muc/src

Files:

• common/connection.py (modified) (2 diffs)
• dialogs.py (modified) (3 diffs)
• gajim.py (modified) (1 diff)

gajim/branches/chat2muc/src/common/connection.py

@@ -1388 +1388 @@
                         _on_unregister_account_connect(self.connection)
 
-        def send_invite(self, room, to, reason=''):
+        def send_invite(self, room, to, reason='', continue_tag=False):
                 '''sends invitation'''
                 message=common.xmpp.Message(to = room)
@@ -1395 +1395 @@
                 if reason != '':
                         c.setTagData('reason', reason)
+                if continue_tag:
+                        c.addChild(name = 'continue')
                 self.connection.send(message)
 

gajim/branches/chat2muc/src/dialogs.py

@@ -3321 +3321 @@
                 self.window.show_all()
 
-                # hide this
+                # ...hide this
                 self.server_selection_visible = True
                 self.toggle_server_selection_visible()
@@ -3348 +3348 @@
                 if server == '':
                         return
-                if self.servers_support.has_key(server):
-                        self.unique_room_id_supported(server, self.servers_support[server])
-                        return
-                gajim.connections[self.account].check_unique_room_id_support(server, self)
-
-        def unique_room_id_supported(self, server, room_id):
-                if not self.servers_support.has_key(server):
-                        self.servers_support[server] = room_id
+                room_id = gajim.nicks[self.account] + str(randrange(9999999))
+#               if self.servers_support.has_key(server):
+#                       self.unique_room_id_supported(server, self.servers_support[server])
+#                       return
+#               gajim.connections[self.account].check_unique_room_id_support(server, self)
+
+#       def unique_room_id_supported(self, server, room_id):
+#               if not self.servers_support.has_key(server):
+#                       self.servers_support[server] = room_id
                 guest_list = []
                 guests = self.guests_treeview.get_selection().get_selected_rows()
@@ -3366 +3367 @@
                 gajim.automatic_rooms[self.account][room_jid] = {}
                 gajim.automatic_rooms[self.account][room_jid]['invities'] = guest_list 
+                gajim.automatic_rooms[self.account][room_jid]['continue_tag'] = True
                 gajim.interface.roster.join_gc_room(self.account, room_jid,
                         gajim.nicks[self.account], None)

gajim/branches/chat2muc/src/gajim.py

@@ -1185 +1185 @@
                         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):