Changeset 8711 for branches/gajim_0.11.1

Timestamp:

09/04/07 21:01:00 (15 months ago)

Author:

asterix

Message:

request vcard, last_status_time and os_info to real jid if we know it. fixes #3304

Location:

branches/gajim_0.11.1/src

Files:

• common/connection_handlers.py (modified) (3 diffs)
• common/connection.py (modified) (4 diffs)
• vcard.py (modified) (4 diffs)

branches/gajim_0.11.1/src/common/connection_handlers.py

@@ -797 +797 @@
                 self.vcard_shas = {} # sha of contacts
                 self.room_jids = [] # list of gc jids so that vcard are saved in a folder
-                self.groupchat_jids = {} # {ID : groupchat_jid}
-                
+
         def add_sha(self, p, send_caps = True):
                 c = p.setTag('x', namespace = common.xmpp.NS_VCARD_UPDATE)
@@ -1300 +1299 @@
                 except:
                         return
-                who = helpers.get_full_jid_from_iq(iq_obj)
+                id = iq_obj.getID()
+                if id in self.groupchat_jids:
+                        who = self.groupchat_jids[id]
+                        del self.groupchat_jids[id]
+                else:
+                        who = helpers.get_full_jid_from_iq(iq_obj)
                 jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
                 self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status))
@@ -1315 +1319 @@
                 if qp.getTag('os'):
                         os_info += qp.getTag('os').getData()
-                who = helpers.get_full_jid_from_iq(iq_obj)
+                id = iq_obj.getID()
+                if id in self.groupchat_jids:
+                        who = self.groupchat_jids[id]
+                        del self.groupchat_jids[id]
+                else:
+                        who = helpers.get_full_jid_from_iq(iq_obj)
                 jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
                 self.dispatch('OS_INFO', (jid_stripped, resource, client_info, os_info))

branches/gajim_0.11.1/src/common/connection.py

@@ -80 +80 @@
                 # Do we continue connection when we get roster (send presence,get vcard...)
                 self.continue_connect_info = None
+                # To know the groupchat jid associated with a sranza ID. Useful to
+                # request vcard or os info... to a real JID but act as if it comes from
+                # the fake jid
+                self.groupchat_jids = {} # {ID : groupchat_jid}
                 if USE_GPG:
                         self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
@@ -905 +909 @@
                 self.name = new_name
 
-        def request_last_status_time(self, jid, resource):
+        def request_last_status_time(self, jid, resource, groupchat_jid=None):
+                '''groupchat_jid is used when we want to send a request to a real jid
+                and act as if the answer comes from the groupchat_jid'''
                 if not self.connection:
                         return
@@ -913 +919 @@
                 iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\
                         common.xmpp.NS_LAST)
-                self.connection.send(iq)
-
-        def request_os_info(self, jid, resource):
+                id = self.connection.getAnID()
+                iq.setID(id)
+                if groupchat_jid:
+                        self.groupchat_jids[id] = groupchat_jid
+                self.connection.send(iq)
+
+        def request_os_info(self, jid, resource, groupchat_jid=None):
+                '''groupchat_jid is used when we want to send a request to a real jid
+                and act as if the answer comes from the groupchat_jid'''
                 if not self.connection:
                         return
@@ -927 +939 @@
                 iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\
                         common.xmpp.NS_VERSION)
+                id = self.connection.getAnID()
+                iq.setID(id)
+                if groupchat_jid:
+                        self.groupchat_jids[id] = groupchat_jid
                 self.connection.send(iq)
 

branches/gajim_0.11.1/src/vcard.py

@@ -67 +67 @@
                 self.account = account
                 self.gc_contact = gc_contact
+
+                # Get real jid
+                if gc_contact:
+                        if gc_contact.jid:
+                                self.real_jid = gc_contact.jid
+                                if gc_contact.resource:
+                                        self.real_jid += '/' + gc_contact.resource
+                        else:
+                                self.real_jid = gc_contact.get_full_jid()
+                else:
+                        self.real_jid = contact.get_full_jid()
 
                 self.avatar_mime_type = None
@@ -321 +332 @@
 
                 # Request list time status
-                gajim.connections[self.account].request_last_status_time(self.contact.jid,
-                        self.contact.resource)
+                if self.gc_contact:
+                        j, r = gajim.get_room_and_nick_from_fjid(self.real_jid)
+                        gajim.connections[self.account].request_last_status_time(j, r,
+                                self.contact.jid)
+                else:
+                        gajim.connections[self.account].request_last_status_time(
+                                self.contact.jid, self.contact.resource)
 
                 # do not wait for os_info if contact is not connected or has error
@@ -330 +346 @@
                         self.os_info_arrived = True
                 else: # Request os info if contact is connected
-                        gobject.idle_add(gajim.connections[self.account].request_os_info,
-                                self.contact.jid, self.contact.resource)
+                        if self.gc_contact:
+                                j, r = gajim.get_room_and_nick_from_fjid(self.real_jid)
+                                gobject.idle_add(gajim.connections[self.account].request_os_info,
+                                        j, r, self.contact.jid)
+                        else:
+                                gobject.idle_add(gajim.connections[self.account].request_os_info,
+                                        self.contact.jid, self.contact.resource)
                 self.os_info = {0: {'resource': self.contact.resource, 'client': '',
                         'os': ''}}
@@ -360 +381 @@
 
                 if self.gc_contact:
-                        gajim.connections[self.account].request_vcard(self.contact.jid,
+                        gajim.connections[self.account].request_vcard(self.real_jid,
                                 self.gc_contact.get_full_jid())
                 else: