Changeset 86

Timestamp:

07/16/07 22:51:53 (3 years ago)

Author:

roidelapluie

Message:

beter handling of invitations

Location:

gajim/branches/chat2muc/src

Files:

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

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

@@ -1393 +1393 @@
                 c = message.addChild(name = 'x', namespace = common.xmpp.NS_MUC_USER)
                 c = c.addChild(name = 'invite', attrs={'to' : to})
+                if continue_tag:
+                        c.addChild(name = 'continue')
                 if reason != '':
                         c.setTagData('reason', reason)
-                if continue_tag:
-                        c.addChild(name = 'continue')
                 self.connection.send(message)
 

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

@@ -1529 +1529 @@
                                 password = invite.getTagData('password')
                                 is_continued = False
-                                if invite.getTag('continue'):
+                                if invite.getTag('invite').getTag('continue'):
                                         is_continued = True
                                         print '1'

gajim/branches/chat2muc/src/dialogs.py

@@ -3300 +3300 @@
 
                 # TODO: make a list based on service discovery
+                self.servers.append(['chat.jabberfr.org'])
                 self.servers.append(['conference.gajim.org'])
 
@@ -3348 +3349 @@
 
         def _on_keypress_event(self, widget, event):
-                if event.state and gtk.gdk.MOD1_MASK and (event.keyval == gtk.keysyms.c \
+                if (event.state & gtk.gdk.MOD1_MASK) and (event.keyval == gtk.keysyms.c \
                 or event.keyval == gtk.keysyms.C):
                                 self.toggle_server_selection_visible()

gajim/branches/chat2muc/src/gajim.py

@@ -1210 +1210 @@
                 room_jid = array[0]
                 if helpers.allow_popup_window(account) or not self.systray_enabled:
+                        print '11'
                         dialogs.InvitationReceivedDialog(account, room_jid, jid, array[3],
-                                array[2], is_continued=array[3])
+                                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):
@@ -1224 +1225 @@
                         notify.popup(event_type, jid, account, 'gc-invitation', path,
                                 event_type, room_jid)
+                        print '12'
 
         def handle_event_bad_passphrase(self, account, array):
@@ -2206 +2208 @@
                         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)