Changeset 7940 for branches/gajim_0.11/src

Timestamp:

02/06/07 20:54:30 (22 months ago)

Author:

asterix

Message:

merge diff from trunk

Location:

branches/gajim_0.11/src

Files:

• chat_control.py (modified) (3 diffs)
• common/commands.py (modified) (2 diffs)
• common/connection_handlers.py (modified) (10 diffs)
• common/connection.py (modified) (3 diffs)
• common/contacts.py (modified) (1 diff)
• common/fuzzyclock.py (modified) (1 diff)
• common/helpers.py (modified) (3 diffs)
• common/optparser.py (modified) (2 diffs)
• common/rst_xhtml_generator.py (modified) (2 diffs)
• common/xmpp/auth_nb.py (modified) (2 diffs)
• common/xmpp/protocol.py (modified) (2 diffs)
• common/xmpp_stringprep.py (modified) (6 diffs)
• config.py (modified) (1 diff)
• conversation_textview.py (modified) (1 diff)
• dialogs.py (modified) (1 diff)
• gajim.py (modified) (9 diffs)
• groupchat_control.py (modified) (5 diffs)
• gtkgui_helpers.py (modified) (1 diff)
• history_manager.py (modified) (4 diffs)
• history_window.py (modified) (1 diff)
• htmltextview.py (modified) (2 diffs)
• message_window.py (modified) (4 diffs)
• music_track_listener.py (modified) (2 diffs)
• notify.py (modified) (4 diffs)
• profile_window.py (modified) (1 diff)
• roster_window.py (modified) (6 diffs)
• statusicon.py (modified) (1 diff)
• tooltips.py (modified) (5 diffs)

branches/gajim_0.11/src/chat_control.py

@@ -718 +718 @@
                         if conversation_height + diff_y < min_height:
                                 if message_height + conversation_height - min_height > min_height:
-                                        self.msg_scrolledwindow.set_property('vscrollbar-policy', 
-                                                gtk.POLICY_AUTOMATIC)
-                                        self.msg_scrolledwindow.set_property('height-request', 
-                                                message_height + conversation_height - min_height)
-                                        self.bring_scroll_to_end(msg_textview)
+                                        policy = self.msg_scrolledwindow.get_property(
+                                                'vscrollbar-policy')
+                                        # scroll only when scrollbar appear
+                                        if policy != gtk.POLICY_AUTOMATIC:
+                                                self.msg_scrolledwindow.set_property('vscrollbar-policy', 
+                                                        gtk.POLICY_AUTOMATIC)
+                                                self.msg_scrolledwindow.set_property('height-request', 
+                                                        message_height + conversation_height - min_height)
+                                                self.bring_scroll_to_end(msg_textview)
                         else:
                                 self.msg_scrolledwindow.set_property('vscrollbar-policy', 
@@ -1303 +1307 @@
                 theme = gajim.config.get('roster_theme')
                 color = None
+                if not chatstate:
+                        chatstate = self.contact.chatstate
                 if chatstate is not None:
                         if chatstate == 'composing':
@@ -1324 +1330 @@
                         self.parent_win.get_active_control() != self:
                                 color = self.lighten_color(color)
-                elif chatstate == 'active' : # active, get color from gtk
+                else: # active or not chatstate, get color from gtk
                         color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE]
                 

branches/gajim_0.11/src/common/commands.py

@@ -118 +118 @@
                         presencetype = form['presence-type'].value
                         if not presencetype in \
-                            ('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'):
+                        ('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'):
                                 self.badRequest(request)
                                 return False
@@ -283 +283 @@
                         q = iq.getTag('query')
                         q.addChild('identity', attrs = {'type': 'command-node',
-                                                        'category': 'automation',
-                                                        'name': cmd.commandname})
+                                'category': 'automation',
+                                'name': cmd.commandname})
                         q.addChild('feature', attrs = {'var': xmpp.NS_COMMANDS})
                         for feature in cmd.commandfeatures:

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

@@ -746 +746 @@
                         if node in (None, client_version):
                                 q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC})
+                                q.addChild('feature', attrs = {'var': common.xmpp.NS_CHATSTATES})
+                                q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS})
+                                q.addChild('feature', attrs = {'var': common.xmpp.NS_DISCO_INFO})
+
                         if q.getChildren():
                                 self.connection.send(iq)
@@ -839 +843 @@
                                 entry = {}
                                 for c in info.getChildren():
-                                         entry[c.getName()] = c.getData()
+                                        entry[c.getName()] = c.getData()
                                 dict[name].append(entry)
                         elif info.getChildren() == []:
@@ -846 +850 @@
                                 dict[name] = {}
                                 for c in info.getChildren():
-                                         dict[name][c.getName()] = c.getData()
+                                        dict[name][c.getName()] = c.getData()
                 return dict
 
@@ -1050 +1054 @@
 
                 del self.awaiting_answers[id]
-        
+
         def _vCardCB(self, con, vc):
                 '''Called when we receive a vCard
                 Parse the vCard and send it to plugins'''
                 if not vc.getTag('vCard'):
+                        return
+                if not vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD:
                         return
                 frm_iq = vc.getFrom()
@@ -1064 +1070 @@
                 else:
                         who = frm = our_jid
-                if vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD:
-                        card = vc.getChildren()[0]
-                        vcard = self.node_to_dict(card)
-                        photo_decoded = None
-                        if vcard.has_key('PHOTO') and isinstance(vcard['PHOTO'], dict) and \
-                        vcard['PHOTO'].has_key('BINVAL'):
-                                photo = vcard['PHOTO']['BINVAL']
-                                try:
-                                        photo_decoded = base64.decodestring(photo)
-                                        avatar_sha = sha.sha(photo_decoded).hexdigest()
-                                except:
-                                        avatar_sha = ''
-                        else:
+                card = vc.getChildren()[0]
+                vcard = self.node_to_dict(card)
+                photo_decoded = None
+                if vcard.has_key('PHOTO') and isinstance(vcard['PHOTO'], dict) and \
+                vcard['PHOTO'].has_key('BINVAL'):
+                        photo = vcard['PHOTO']['BINVAL']
+                        try:
+                                photo_decoded = base64.decodestring(photo)
+                                avatar_sha = sha.sha(photo_decoded).hexdigest()
+                        except:
                                 avatar_sha = ''
-
-                        if avatar_sha:
-                                card.getTag('PHOTO').setTagData('SHA', avatar_sha)
-
-                        # Save it to file
-                        self.save_vcard_to_hd(who, card)
-                        # Save the decoded avatar to a separate file too, and generate files for dbus notifications
-                        puny_jid = helpers.sanitize_filename(frm)
-                        puny_nick = None
-                        begin_path = os.path.join(gajim.AVATAR_PATH, puny_jid)
-                        if frm in self.room_jids:
-                                puny_nick = helpers.sanitize_filename(resource)
-                                # create folder if needed
-                                if not os.path.isdir(begin_path):
-                                        os.mkdir(begin_path, 0700)
-                                begin_path = os.path.join(begin_path, puny_nick)
-                        if photo_decoded:
-                                avatar_file = begin_path + '_notif_size_colored.png'
-                                if frm == our_jid and avatar_sha != self.vcard_sha:
-                                        gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick)
-                                elif frm != our_jid and (not os.path.exists(avatar_file) or \
-                                        not self.vcard_shas.has_key(frm) or \
-                                        avatar_sha != self.vcard_shas[frm]):
-                                        gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick)
-                        else:
-                                for ext in ('.jpeg', '.png', '_notif_size_bw.png',
-                                        '_notif_size_colored.png'):
-                                        path = begin_path + ext
-                                        if os.path.isfile(path):
-                                                os.remove(path)
-
-                        if frm != our_jid:
+                else:
+                        avatar_sha = ''
+
+                if avatar_sha:
+                        card.getTag('PHOTO').setTagData('SHA', avatar_sha)
+
+                # Save it to file
+                self.save_vcard_to_hd(who, card)
+                # Save the decoded avatar to a separate file too, and generate files for dbus notifications
+                puny_jid = helpers.sanitize_filename(frm)
+                puny_nick = None
+                begin_path = os.path.join(gajim.AVATAR_PATH, puny_jid)
+                frm_jid = frm
+                if frm in self.room_jids:
+                        puny_nick = helpers.sanitize_filename(resource)
+                        # create folder if needed
+                        if not os.path.isdir(begin_path):
+                                os.mkdir(begin_path, 0700)
+                        begin_path = os.path.join(begin_path, puny_nick)
+                        frm_jid += '/' + resource
+                if photo_decoded:
+                        avatar_file = begin_path + '_notif_size_colored.png'
+                        if frm_jid == our_jid and avatar_sha != self.vcard_sha:
+                                gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick)
+                        elif frm_jid != our_jid and (not os.path.exists(avatar_file) or \
+                        not self.vcard_shas.has_key(frm_jid) or \
+                        avatar_sha != self.vcard_shas[frm_jid]):
+                                gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick)
                                 if avatar_sha:
-                                        self.vcard_shas[frm] = avatar_sha
-                                elif self.vcard_shas.has_key(frm):
-                                        del self.vcard_shas[frm]
-
-                        vcard['jid'] = frm
-                        vcard['resource'] = resource
-                        if frm == our_jid:
-                                self.dispatch('MYVCARD', vcard)
-                                # we re-send our presence with sha if has changed and if we are
-                                # not invisible
-                                if self.vcard_sha == avatar_sha:
-                                        return
-                                self.vcard_sha = avatar_sha
-                                if STATUS_LIST[self.connected] == 'invisible':
-                                        return
-                                sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected])
-                                p = common.xmpp.Presence(typ = None, priority = self.priority,
-                                        show = sshow, status = self.status)
-                                p = self.add_sha(p)
-                                self.connection.send(p)
-                        else:
-                                self.dispatch('VCARD', vcard)
+                                        self.vcard_shas[frm_jid] = avatar_sha
+                        elif self.vcard_shas.has_key(frm):
+                                del self.vcard_shas[frm]
+                else:
+                        for ext in ('.jpeg', '.png', '_notif_size_bw.png',
+                                '_notif_size_colored.png'):
+                                path = begin_path + ext
+                                if os.path.isfile(path):
+                                        os.remove(path)
+
+                vcard['jid'] = frm
+                vcard['resource'] = resource
+                if frm_jid == our_jid:
+                        self.dispatch('MYVCARD', vcard)
+                        # we re-send our presence with sha if has changed and if we are
+                        # not invisible
+                        if self.vcard_sha == avatar_sha:
+                                return
+                        self.vcard_sha = avatar_sha
+                        if STATUS_LIST[self.connected] == 'invisible':
+                                return
+                        sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected])
+                        p = common.xmpp.Presence(typ = None, priority = self.priority,
+                                show = sshow, status = self.status)
+                        p = self.add_sha(p)
+                        self.connection.send(p)
+                else:
+                        self.dispatch('VCARD', vcard)
 
 class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub):
@@ -1460 +1465 @@
                         if msg.timestamp:
                                 has_timestamp = True
-                        if subject:
+                        if subject != None:
                                 self.dispatch('GC_SUBJECT', (frm, subject, msgtxt, has_timestamp))
                         else:
@@ -1633 +1638 @@
                         if not ptype or ptype == 'unavailable':
                                 if gajim.config.get('log_contact_status_changes') and self.name\
-                                        not in no_log_for and jid_stripped not in no_log_for:
+                                not in no_log_for and jid_stripped not in no_log_for:
                                         gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped, resource)
                                         st = status or ''
@@ -1649 +1654 @@
                                                 puny_nick = helpers.sanitize_filename(resource)
                                                 gajim.interface.remove_avatar_files(jid_stripped, puny_nick)
-                                        if self.vcard_shas.has_key(who):
+                                        if self.vcard_shas.has_key(who): # Verify sha cached in mem
                                                 if avatar_sha != self.vcard_shas[who]:
                                                         # avatar has been updated
                                                         self.request_vcard(who, True)
-                                        else:
-                                                self.vcard_shas[who] = avatar_sha
+                                        else: # Verify sha cached in hdd
+                                                cached_vcard = self.get_cached_vcard(who, True)
+                                                if cached_vcard and cached_vcard.has_key('PHOTO') and \
+                                                cached_vcard['PHOTO'].has_key('SHA'):
+                                                        cached_sha = cached_vcard['PHOTO']['SHA']
+                                                else:
+                                                        cached_sha = ''
+                                                if cached_sha != avatar_sha:
+                                                        # avatar has been updated
+                                                        # sha in mem will be updated later
+                                                        self.request_vcard(who, True)
+                                                else:
+                                                        # save sha in mem NOW
+                                                        self.vcard_shas[who] = avatar_sha
                                 self.dispatch('GC_NOTIFY', (jid_stripped, show, status, resource,
                                         prs.getRole(), prs.getAffiliation(), prs.getJid(),
@@ -1847 +1864 @@
                 self.dispatch('MSGERROR', (jid, errcode, errmsg))
 
+        def _IqPingCB(self, con, iq_obj):
+                gajim.log.debug('IqPingCB')
+                iq_obj = iq_obj.buildReply('result')
+                self.connection.send(iq_obj)
+                raise common.xmpp.NodeProcessed
+
         def _getRosterCB(self, con, iq_obj):
                 if not self.connection:
@@ -2011 +2034 @@
                 con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get',
                         common.xmpp.NS_DISCO_ITEMS)
+                con.RegisterHandler('iq', self._IqPingCB, 'get',
+                        common.xmpp.NS_PING)
                 con.RegisterHandler('iq', self._PubSubCB, 'result')
                 con.RegisterHandler('iq', self._ErrorCB, 'error')

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

@@ -108 +108 @@
                 # Do not try to reco while we are already trying
                 self.time_to_reconnect = None
-                if self.connected < 2: #connection failed
+                if self.connected < 2: # connection failed
                         gajim.log.debug('reconnect')
                         self.retrycount += 1
@@ -146 +146 @@
                                 self.connected = 1
                                 self.dispatch('STATUS', 'connecting')
+                                if gajim.status_before_autoaway[self.name]:
+                                        # We were auto away. So go back online
+                                        self.status = gajim.status_before_autoaway[self.name]
+                                        gajim.status_before_autoaway[self.name] = ''
+                                        self.old_show = 'online'
                                 # this check has moved from _reconnect method
                                 # do exponential backoff until 15 minutes,
@@ -1097 +1102 @@
                 if show == 'offline':
                         ptype = 'unavailable'
-                show = helpers.get_xmpp_show(show)
+                xmpp_show = helpers.get_xmpp_show(show)
                 p = common.xmpp.Presence(to = '%s/%s' % (jid, nick), typ = ptype,
-                        show = show, status = status)
-                if gajim.config.get('send_sha_in_gc_presence'):
+                        show = xmpp_show, status = status)
+                if gajim.config.get('send_sha_in_gc_presence') and show != 'offline':
                         p = self.add_sha(p, ptype != 'unavailable')
                 # send instantly so when we go offline, status is sent to gc before we

branches/gajim_0.11/src/common/contacts.py

@@ -277 +277 @@
                                         contact_groups = contact.groups
                                         if not contact_groups:
-                                                # Contact is not in a group, so count it in General group
-                                                contact_groups.append(_('General'))
+                                                # Contact is not in a group, so count it in General or
+                                                # Transports group
+                                                if common.gajim.jid_is_transport(jid):
+                                                        contact_groups = [_('Transports')]
+                                                else:
+                                                        contact_groups = [_('General')]
                                         for group in groups:
                                                 if group in contact_groups:

branches/gajim_0.11/src/common/fuzzyclock.py

@@ -35 +35 @@
 
 class FuzzyClock:
-    def __init__(self):
-        self.__hour = 0
-        self.__minute = 0
-        self.__dayOfWeek = 0
+        def __init__(self):
+                self.__hour = 0
+                self.__minute = 0
+                self.__dayOfWeek = 0
 
-        self.__hourNames = [ _('one'), _('two'), _('three'), _('four'), _('five'), _('six'),
-                             _('seven'), _('eight'), _('nine'), _('ten'), _('eleven'),
-                             _('twelve')]
+                self.__hourNames = [ _('one'), _('two'), _('three'), _('four'), _('five'), _('six'),
+                        _('seven'), _('eight'), _('nine'), _('ten'), _('eleven'),
+                        _('twelve')]
 
-        #Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-        self.__normalFuzzy = [ _("$0 o'clock"), _('five past $0'),
-                                                                                _('ten past $0'), _('quarter past $0'),
-                                                                                _('twenty past $0'), _('twenty five past $0'),
-                                                                                _('half past $0'), _('twenty five to $1'),
-                                                                                _('twenty to $1'), _('quarter to $1'),
-                                                                                _('ten to $1'), _('five to $1'), _("$1 o'clock") ]
+                #Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+                self.__normalFuzzy = [ _("$0 o'clock"), _('five past $0'),
+                        _('ten past $0'), _('quarter past $0'),
+                        _('twenty past $0'), _('twenty five past $0'),
+                        _('half past $0'), _('twenty five to $1'),
+                        _('twenty to $1'), _('quarter to $1'),
+                        _('ten to $1'), _('five to $1'), _("$1 o'clock") ]
 
-        #A "singular-form". It is used when talking about hour 0
-        self.__normalFuzzyOne = [ _("$0 o'clock"), _('five past $0'),
-                                  _('ten past $0'), _('quarter past $0'),
-                                  _('twenty past $0'), _('twenty five past $0'),
-                                  _('half past $0'), _('twenty five to $1'),
-                                  _('twenty to $1'), _('quarter to $1'),
-                                  _('ten to $1'), _('five to $1'),
-                                                                                         _("$1 o'clock") ]
+                #A "singular-form". It is used when talking about hour 0
+                self.__normalFuzzyOne = [ _("$0 o'clock"), _('five past $0'),
+                        _('ten past $0'), _('quarter past $0'),
+                        _('twenty past $0'), _('twenty five past $0'),
+                        _('half past $0'), _('twenty five to $1'),
+                        _('twenty to $1'), _('quarter to $1'),
+                        _('ten to $1'), _('five to $1'),
+                        _("$1 o'clock") ]
 
 
-        self.__dayTime = [ _('Night'), _('Early morning'), _('Morning'), _('Almost noon'),
-                           _('Noon'), _('Afternoon'), _('Evening'), _('Late evening') ]
+                self.__dayTime = [ _('Night'), _('Early morning'), _('Morning'), _('Almost noon'),
+                        _('Noon'), _('Afternoon'), _('Evening'), _('Late evening') ]
 
-        self.__fuzzyWeek = [ _('Start of week'), _('Middle of week'), _('End of week'),
-                             _('Weekend!') ]
+                self.__fuzzyWeek = [ _('Start of week'), _('Middle of week'), _('End of week'),
+                        _('Weekend!') ]
 
-        self.setCurrent()
+                self.setCurrent()
 
-    def setHour(self,hour):
-        self.__hour = int(hour)
+        def setHour(self,hour):
+                self.__hour = int(hour)
 
-    def setMinute(self,minute):
-        self.__minute=int(minute)
+        def setMinute(self,minute):
+                self.__minute=int(minute)
 
-    def setDayOfWeek(self,day):
-        self.__dayOfWeek=int(day)
+        def setDayOfWeek(self,day):
+                self.__dayOfWeek=int(day)
 
-    def setTime(self,time):
-        timeArray = time.split(":")
-        self.setHour(timeArray[0])
-        self.setMinute(timeArray[1])
+        def setTime(self,time):
+                timeArray = time.split(":")
+                self.setHour(timeArray[0])
+                self.setMinute(timeArray[1])
 
-    def setCurrent(self):
-        hour=time.strftime("%H")
-