Changeset 85

Timestamp:

07/16/07 22:06:21 (3 years ago)

Author:

roidelapluie

Message:

add continue support

Location:

gajim/branches/chat2muc/src

Files:

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

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

@@ -1448 +1448 @@
                         if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite:
                                 room_jid = xtag.getAttr('jid')
-                                self.dispatch('GC_INVITATION', (room_jid, frm, '', None))
+                                is_continued = False
+                                if xtag.getTag('continue'):
+                                        is_continued = True
+                                self.dispatch('GC_INVITATION', (room_jid, frm, '', None,
+                                        is_continued))
                                 return
                 # chatstates - look for chatstate tags in a message if not delayed
@@ -1524 +1528 @@
                                 item = invite.getTag('password')
                                 password = invite.getTagData('password')
-                                self.dispatch('GC_INVITATION',(frm, jid_from, reason, password))
+                                is_continued = False
+                                if invite.getTag('continue'):
+                                        is_continued = True
+                                        print '1'
+                                else:
+                                        print '0'
+                                self.dispatch('GC_INVITATION',(frm, jid_from, reason, password,
+                                        is_continued))
                                 return
                         if self.name not in no_log_for and jid not in no_log_for and msgtxt:

gajim/branches/chat2muc/src/dialogs.py

@@ -2563 +2563 @@
 class InvitationReceivedDialog:
         def __init__(self, account, room_jid, contact_jid, password = None,
-        comment = None):
+        comment = None, is_continued = False):
 
                 self.room_jid = room_jid
                 self.account = account
+                self.is_continued = is_continued
                 xml = gtkgui_helpers.get_glade('invitation_received_dialog.glade')
                 self.dialog = xml.get_widget('invitation_received_dialog')
 
                 #Don't translate $Contact
-                pritext = _('$Contact has invited you to group chat %(room_jid)s')\
-                        % {'room_jid': room_jid}
+                if is_continued:
+                        pritext = _('$Contact has invited you to join a discussion')
+                else:
+                        pritext = _('$Contact has invited you to group chat %(room_jid)s')\
+                                % {'room_jid': room_jid}
                 contact = gajim.contacts.get_first_contact_from_jid(account, contact_jid)
                 if contact and contact.name:
@@ -2600 +2604 @@
                 self.dialog.destroy()
                 try:
-                        JoinGroupchatWindow(self.account, self.room_jid)
+                        if self.is_continued:
+                                gajim.interface.roster.join_gc_room(self.account, self.room_jid,
+                                        gajim.nicks[self.account], None, is_continued=True)
+                        else:
+                                JoinGroupchatWindow(self.account, self.room_jid)
                 except GajimGeneralException:
                         pass

gajim/branches/chat2muc/src/gajim.py

@@ -1206 +1206 @@
 
         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[3])
                         return