Author: nicfit Date: 2007-12-16 01:04:45 +0100 (Sun, 16 Dec 2007) New Revision: 9156

Modified: branches/one_window/ branches/one_window/src/common/connection.py branches/one_window/src/common/connection_handlers.py branches/one_window/src/common/xmpp/transports_nb.py branches/one_window/src/gajim.py branches/one_window/src/systray.py Log: 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 ........

Property changes on: branches/one_window ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-9141 + /trunk:1-9155

Modified: branches/one_window/src/common/connection.py =================================================================== --- branches/one_window/src/common/connection.py 2007-12-16 00:01:13 UTC (rev 9155) +++ branches/one_window/src/common/connection.py 2007-12-16 00:04:45 UTC (rev 9156) @@ -1114,7 +1114,7 @@ def send_new_account_infos(self, form, is_form): if is_form: # Get username and password and put them in new_account_info - for field in self._data_form.iter_fields(): + for field in form.iter_fields(): if field.var == 'username': self.new_account_info['name'] = field.value if field.var == 'password':

Modified: branches/one_window/src/common/connection_handlers.py =================================================================== --- branches/one_window/src/common/connection_handlers.py 2007-12-16 00:01:13 UTC (rev 9155) +++ branches/one_window/src/common/connection_handlers.py 2007-12-16 00:04:45 UTC (rev 9156) @@ -835,11 +835,12 @@ if identity['category'] == 'pubsub' and identity['type'] == \ 'pep': self.pep_supported = True - listener = MusicTrackListener.get() - track = listener.get_playing_track() - if gajim.config.get('publish_tune'): - gajim.interface.roster._music_track_changed(listener, - track, self.name) + if dbus_support.supported: + listener = MusicTrackListener.get() + track = listener.get_playing_track() + if gajim.config.get('publish_tune'): + gajim.interface.roster._music_track_changed(listener, + track, self.name) break if features.__contains__(common.xmpp.NS_BYTESTREAM): gajim.proxy65_manager.resolve(jid, self.connection, self.name)

Modified: branches/one_window/src/common/xmpp/transports_nb.py =================================================================== --- branches/one_window/src/common/xmpp/transports_nb.py 2007-12-16 00:01:13 UTC (rev 9155) +++ branches/one_window/src/common/xmpp/transports_nb.py 2007-12-16 00:04:45 UTC (rev 9156) @@ -761,15 +761,18 @@ for line in lines: if 'BEGIN CERTIFICATE' in line: begin = i - continue elif 'END CERTIFICATE' in line and begin > -1: cert = ''.join(lines[begin:i+2]) try: X509cert = OpenSSL.crypto.load_certificate( OpenSSL.crypto.FILETYPE_PEM, cert) store.add_cert(X509cert) + except OpenSSL.crypto.Error, exception_obj: + log.warning('Unable to load a certificate from file %s: %s' %\ + (gajim.MY_CACERTS, exception_obj.args[0][0][2])) except: - log.warning('Unable to load a certificate from file %s' % \ + log.warning( + 'Unknown error while loading certificate from file %s' % \ gajim.MY_CACERTS) begin = -1 i += 1

Modified: branches/one_window/src/gajim.py =================================================================== --- branches/one_window/src/gajim.py 2007-12-16 00:01:13 UTC (rev 9155) +++ branches/one_window/src/gajim.py 2007-12-16 00:04:45 UTC (rev 9156) @@ -2914,7 +2914,7 @@ print >> sys.stderr, _('Session Management support not available (missing gnome.ui module)') else: def die_cb(cli): - gtk.main_quit() + gajim.interface.roster.quit_gtkgui_interface() gnome.program_init('gajim', gajim.version) cli = gnome.ui.master_client() cli.connect('die', die_cb)

Modified: branches/one_window/src/systray.py =================================================================== --- branches/one_window/src/systray.py 2007-12-16 00:01:13 UTC (rev 9155) +++ branches/one_window/src/systray.py 2007-12-16 00:04:45 UTC (rev 9156) @@ -247,21 +247,17 @@

sounds_mute_menuitem.set_active(not gajim.config.get('sounds_on'))

- if os.name == 'nt': + if os.name == 'nt': if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0): if self.added_hide_menuitem is False: - self.systray_context_menu.prepend(gtk.SeparatorMenuItem()) - item = gtk.MenuItem(_('Hide this menu')) - self.systray_context_menu.prepend(item) - self.added_hide_menuitem = True - self.systray_context_menu.popup(None, None, - gtk.status_icon_position_menu, event_button, - event_time, self.status_icon) + self.systray_context_menu.prepend(gtk.SeparatorMenuItem()) + item = gtk.MenuItem(_('Hide this menu')) + self.systray_context_menu.prepend(item) + self.added_hide_menuitem = True

- else: # GNU and Unices - self.systray_context_menu.popup(None, None, None, event_button, - event_time) self.systray_context_menu.show_all() + self.systray_context_menu.popup(None, None, None, event_button, + event_time)

def on_show_all_events_menuitem_activate(self, widget): events = gajim.events.get_systray_events()