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/gajim.py

    r9125 r9156  
    29152915                else: 
    29162916                        def die_cb(cli): 
    2917                                 gtk.main_quit() 
     2917                                gajim.interface.roster.quit_gtkgui_interface() 
    29182918                        gnome.program_init('gajim', gajim.version) 
    29192919                        cli = gnome.ui.master_client()