Commits December 2007

commits@gajim.org

6 participants
149 discussions

[commit-gajim] r9149 - trunk/src/common
by asterix＠gajim.org 15 Dec '07

15 Dec '07

Author: asterix Date: 2007-12-15 13:15:10 +0100 (Sat, 15 Dec 2007) New Revision: 9149 Modified: trunk/src/common/connection_handlers.py Log: don't crash when dbus is not supported Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-12-15 12:10:25 UTC (rev 9148) +++ trunk/src/common/connection_handlers.py 2007-12-15 12:15:10 UTC (rev 9149) @@ -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)

1 0

[commit-gajim] r9148 - trunk/src/common/xmpp
by asterix＠gajim.org 15 Dec '07

15 Dec '07

Author: asterix Date: 2007-12-15 13:10:25 +0100 (Sat, 15 Dec 2007) New Revision: 9148 Modified: trunk/src/common/xmpp/transports_nb.py Log: get SSL error message where it is in Error instance Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2007-12-15 09:04:10 UTC (rev 9147) +++ trunk/src/common/xmpp/transports_nb.py 2007-12-15 12:10:25 UTC (rev 9148) @@ -769,7 +769,7 @@ 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.message[0][2])) + (gajim.MY_CACERTS, exception_obj.args[0][0][2])) except: log.warning( 'Unknown error while loading certificate from file %s' % \

1 0

[commit-gajim] r9147 - trunk/src
by asterix＠gajim.org 15 Dec '07

15 Dec '07

Author: asterix Date: 2007-12-15 10:04:10 +0100 (Sat, 15 Dec 2007) New Revision: 9147 Modified: trunk/src/gajim.py Log: [shprotx] save config when gnome sessions ends. fixes #3618 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-15 08:31:42 UTC (rev 9146) +++ trunk/src/gajim.py 2007-12-15 09:04:10 UTC (rev 9147) @@ -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)

1 0

[commit-gajim] r9146 - trunk/src/common/xmpp
by asterix＠gajim.org 15 Dec '07

15 Dec '07

Author: asterix Date: 2007-12-15 09:31:42 +0100 (Sat, 15 Dec 2007) New Revision: 9146 Modified: trunk/src/common/xmpp/transports_nb.py Log: [shprotx] fix loading of multiple SSL certificates and better error message. fixes #3619 Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2007-12-14 04:49:09 UTC (rev 9145) +++ trunk/src/common/xmpp/transports_nb.py 2007-12-15 08:31:42 UTC (rev 9146) @@ -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.message[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

1 0

[commit-gajim] r9145 - in branches/one_window: data/glade src
by nicfit＠gajim.org 14 Dec '07

14 Dec '07

Author: nicfit Date: 2007-12-14 05:49:09 +0100 (Fri, 14 Dec 2007) New Revision: 9145 Modified: branches/one_window/data/glade/roster_window.glade branches/one_window/src/roster_window.py Log: Implemented the original Nikos patch with an HPaned instead of a HBox and only do this mode when one_message_window == 'always' Modified: branches/one_window/data/glade/roster_window.glade =================================================================== --- branches/one_window/data/glade/roster_window.glade 2007-12-14 03:33:17 UTC (rev 9144) +++ branches/one_window/data/glade/roster_window.glade 2007-12-14 04:49:09 UTC (rev 9145) @@ -352,45 +352,65 @@ </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> + <widget class="GtkHPaned" id="roster_hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">2</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkTreeView" id="roster_treeview"> + <widget class="GtkVBox" id="roster_vbox2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="reorderable">True</property> - <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/> - <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/> - <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/> - <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> - <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> - <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> - <signal name="row_activated" handler="on_roster_treeview_row_activated"/> - <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/> - <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/> - <signal name="style_set" handler="on_roster_treeview_style_set"/> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">2</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <child> + <widget class="GtkTreeView" id="roster_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="reorderable">True</property> + <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/> + <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/> + <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/> + <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> + <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> + <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> + <signal name="row_activated" handler="on_roster_treeview_row_activated"/> + <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/> + <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/> + <signal name="style_set" handler="on_roster_treeview_style_set"/> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkComboBox" id="status_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_status_combobox_changed"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> </widget> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> </child> + <child> + <placeholder/> + </child> </widget> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkComboBox" id="status_combobox"> - <property name="visible">True</property> - <signal name="changed" handler="on_status_combobox_changed"/> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> </widget> </child> </widget> Modified: branches/one_window/src/roster_window.py =================================================================== --- branches/one_window/src/roster_window.py 2007-12-14 03:33:17 UTC (rev 9144) +++ branches/one_window/src/roster_window.py 2007-12-14 04:49:09 UTC (rev 9145) @@ -4397,7 +4397,15 @@ gajim.connections[account].status in ('offline', 'invisible'): win.get_control(fjid, account).got_disconnected() - win.window.present() + if gajim.config.get('one_message_window') == 'always': + win.window.hide() + hpaned = self.xml.get_widget('roster_hpaned') + notebook = win.xml.get_widget('notebook') + notebook.reparent(hpaned) + hpaned.pack2(notebook, resize=True, shrink=True) + notebook.show_all() + else: + win.window.present() def on_row_activated(self, widget, path): '''When an iter is activated (dubblick or single click if gnome is set

1 0

[commit-gajim] r9144 - branches/one_window
by nicfit＠gajim.org 14 Dec '07

14 Dec '07

Author: nicfit Date: 2007-12-14 04:33:17 +0100 (Fri, 14 Dec 2007) New Revision: 9144 Modified: branches/one_window/ Log: svnmerge.py init trunk Property changes on: branches/one_window ___________________________________________________________________ Name: svnmerge-integrated + /trunk:1-9141

1 0

[commit-gajim] r9143 - trunk
by nicfit＠gajim.org 14 Dec '07

14 Dec '07

Author: nicfit Date: 2007-12-14 04:32:59 +0100 (Fri, 14 Dec 2007) New Revision: 9143 Modified: trunk/ Log: svnmerge.py init one_window branch Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated + /branches/one_window:1-9142

1 0

[commit-gajim] r9142 - branches
by nicfit＠gajim.org 14 Dec '07

14 Dec '07

Author: nicfit Date: 2007-12-14 04:30:09 +0100 (Fri, 14 Dec 2007) New Revision: 9142 Added: branches/one_window/ Log: Added branch for #1743 dev Copied: branches/one_window (from rev 9141, trunk)

1 0

[commit-gajim] r9141 - trunk/src
by nicfit＠gajim.org 14 Dec '07

14 Dec '07

Author: nicfit Date: 2007-12-14 04:25:13 +0100 (Fri, 14 Dec 2007) New Revision: 9141 Modified: trunk/src/message_control.py Log: grammar fix Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2007-12-14 03:19:22 UTC (rev 9140) +++ trunk/src/message_control.py 2007-12-14 03:25:13 UTC (rev 9141) @@ -86,7 +86,7 @@ pass # NOTE: Derived classes SHOULD implement this def get_tab_label(self, chatstate): - '''Return a suitable the tab label string. Returns a tuple such as: + '''Return a suitable tab label string. Returns a tuple such as: (label_str, color) either of which can be None if chatstate is given that means we have HE SENT US a chatstate and we want it displayed'''

1 0

[commit-gajim] r9140 - trunk/src
by nicfit＠gajim.org 14 Dec '07

14 Dec '07

Author: nicfit Date: 2007-12-14 04:19:22 +0100 (Fri, 14 Dec 2007) New Revision: 9140 Modified: trunk/src/remote_control.py Log: raise and return, right next to each other? Go with the newer revision of returning DBUS_BOOLEAN(False) Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2007-12-13 20:51:13 UTC (rev 9139) +++ trunk/src/remote_control.py 2007-12-14 03:19:22 UTC (rev 9140) @@ -373,7 +373,6 @@ if not specified status is changed for all accounts. ''' if status not in ('offline', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'): - raise InvalidArgument return DBUS_BOOLEAN(False) if account: gobject.idle_add(gajim.interface.roster.send_status, account,

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
15
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2007