Changeset 83

Timestamp:

07/16/07 20:21:09 (1 year ago)

Author:

roidelapluie

Message:

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

Files:

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

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

@@ -1388 +1388 @@
-                        _on_unregister_account_connect(self.connection)
-
-
+, 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()
-
-
+...
-                self.server_selection_visible = True
-                self.toggle_server_selection_visible()
@@ -3348 +3348 @@
-                if server == '':
-                        return
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                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']:
-
+
+
-                        del gajim.automatic_rooms[account][room_jid]
-                elif not self.instances[account]['gc_config'].has_key(room_jid):