Show
Ignore:
Timestamp:
12/16/07 01:04:45 (11 months ago)
Author:
nicfit
Message:

Merged revisions 9142-9155 via svnmerge from
svn://88.191.11.156/gajim/trunk

........

r9143 | nicfit | 2007-12-13 20:32:59 -0700 (Thu, 13 Dec 2007) | 2 lines


svnmerge.py init one_window branch

........

r9146 | asterix | 2007-12-15 01:31:42 -0700 (Sat, 15 Dec 2007) | 2 lines


[shprotx] fix loading of multiple SSL certificates and better error message. fixes #3619

........

r9147 | asterix | 2007-12-15 02:04:10 -0700 (Sat, 15 Dec 2007) | 2 lines


[shprotx] save config when gnome sessions ends. fixes #3618

........

r9148 | asterix | 2007-12-15 05:10:25 -0700 (Sat, 15 Dec 2007) | 2 lines


get SSL error message where it is in Error instance

........

r9149 | asterix | 2007-12-15 05:15:10 -0700 (Sat, 15 Dec 2007) | 2 lines


don't crash when dbus is not supported

........

r9150 | asterix | 2007-12-15 05:33:21 -0700 (Sat, 15 Dec 2007) | 2 lines


fix showing of systray popup menu under Windows. fixes #3611

........

r9151 | asterix | 2007-12-15 05:41:39 -0700 (Sat, 15 Dec 2007) | 2 lines


fix creation of account on server that supports dataforms

........

Location:
branches/one_window
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/one_window

    • Property svnmerge-integrated changed from /trunk:1-9141 to /trunk:1-9155

  • branches/one_window/src/common/connection_handlers.py

    r9138 r9156  
    836836                                        'pep': 
    837837                                                self.pep_supported = True 
    838                                                 listener = MusicTrackListener.get() 
    839                                                 track = listener.get_playing_track() 
    840                                                 if gajim.config.get('publish_tune'): 
    841                                                         gajim.interface.roster._music_track_changed(listener, 
    842                                                                         track, self.name) 
     838                                                if dbus_support.supported: 
     839                                                        listener = MusicTrackListener.get() 
     840                                                        track = listener.get_playing_track() 
     841                                                        if gajim.config.get('publish_tune'): 
     842                                                                gajim.interface.roster._music_track_changed(listener, 
     843                                                                                track, self.name) 
    843844                                                break 
    844845                        if features.__contains__(common.xmpp.NS_BYTESTREAM):