Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: typo. Fixes #5940
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 2b1cce2bc4c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b1cce2bc4c0 description: typo. Fixes #5940 diffstat: src/notify.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 74bbb6db15ec -r 2b1cce2bc4c0 src/notify.py --- a/src/notify.py Thu Sep 30 22:36:55 2010 +0200 +++ b/src/notify.py Fri Oct 01 10:31:26 2010 +0200 @@ -587,7 +587,7 @@ self.path_to_image = os.path.abspath(self.path_to_image) text = '<table style=\'padding: 3px\'><tr><td>' \ '<img src=\"%s\"></td><td width=20> </td>' \ - '<td>%st4i</td></tr></table>' % (self.path_to_image, + '<td>%s</td></tr></table>' % (self.path_to_image, text) self.path_to_image = os.path.abspath( gtkgui_helpers.get_icon_path('gajim', 48))

1 0

gajim: [Dicson] improve KDE4 notifications. Fixes #5940
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 74bbb6db15ec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74bbb6db15ec description: [Dicson] improve KDE4 notifications. Fixes #5940 diffstat: src/notify.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 68efb9f2b39b -r 74bbb6db15ec src/notify.py --- a/src/notify.py Thu Sep 30 09:12:07 2010 +0200 +++ b/src/notify.py Thu Sep 30 22:36:55 2010 +0200 @@ -583,6 +583,14 @@ text = self.text else: text = ' ' + if os.environ.get('KDE_FULL_SESSION') == 'true': + self.path_to_image = os.path.abspath(self.path_to_image) + text = '<table style=\'padding: 3px\'><tr><td>' \ + '<img src=\"%s\"></td><td width=20> </td>' \ + '<td>%st4i</td></tr></table>' % (self.path_to_image, + text) + self.path_to_image = os.path.abspath( + gtkgui_helpers.get_icon_path('gajim', 48)) actions = () if 'actions' in self.capabilities: actions = (dbus.String('default'), dbus.String(

1 0

gajim: remove ununsed signal from gtk builder file. Fixes #5954
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 68efb9f2b39b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=68efb9f2b39b description: remove ununsed signal from gtk builder file. Fixes #5954 diffstat: data/gui/input_dialog.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 5d3374fcfecf -r 68efb9f2b39b data/gui/input_dialog.ui --- a/data/gui/input_dialog.ui Fri Sep 24 19:25:04 2010 +0200 +++ b/data/gui/input_dialog.ui Thu Sep 30 09:12:07 2010 +0200 @@ -7,7 +7,6 @@ <property name="type_hint">dialog</property> <property name="has_separator">False</property> <signal name="destroy" handler="on_input_dialog_destroy"/> - <signal name="delete_event" handler="on_input_dialog_delete_event"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox10"> <property name="visible">True</property>

1 0

gajim: add Deutsche Telekom Root CA 2 vert. Fixes #5937
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 5d3374fcfecf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5d3374fcfecf description: add Deutsche Telekom Root CA 2 vert. Fixes #5937 diffstat: data/other/cacerts.pem | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diffs (30 lines): diff -r 974491837e04 -r 5d3374fcfecf data/other/cacerts.pem --- a/data/other/cacerts.pem Thu Sep 23 13:05:33 2010 +0200 +++ b/data/other/cacerts.pem Fri Sep 24 19:25:04 2010 +0200 @@ -2552,3 +2552,26 @@ um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= -----END CERTIFICATE----- +Deutsche Telekom Root CA 2 +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc +MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj +IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB +IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE +RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl +U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290 +IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU +ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC +QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr +rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S +NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc +QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH +txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP +BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC +AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp +tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa +IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl +6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+ +xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU +Cm26OWMohpLzGITY+9HPBVZkVw== +-----END CERTIFICATE-----

1 0

gajim: ignore invalid payload types. Fixes #5919
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 974491837e04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=974491837e04 description: ignore invalid payload types. Fixes #5919 diffstat: src/common/jingle_rtp.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r abbb452ce234 -r 974491837e04 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Sep 19 22:14:43 2010 +0200 +++ b/src/common/jingle_rtp.py Thu Sep 23 13:05:33 2010 +0200 @@ -250,6 +250,9 @@ codecs = [] for codec in content.getTag('description').iterTags('payload-type'): + if not codec['id'] or not codec['name'] or not codec['clockrate']: + # ignore invalid payload-types + continue c = farsight.Codec(int(codec['id']), codec['name'], self.farsight_media, int(codec['clockrate'])) if 'channels' in codec:

1 0

gajim: don't request vcard to full JID but to barr JID
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset abbb452ce234 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=abbb452ce234 description: don't request vcard to full JID but to barr JID diffstat: src/groupchat_control.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r cad205ef02b9 -r abbb452ce234 src/groupchat_control.py --- a/src/groupchat_control.py Sat Sep 18 23:06:36 2010 +0200 +++ b/src/groupchat_control.py Sun Sep 19 22:14:43 2010 +0200 @@ -1444,8 +1444,6 @@ con = gajim.connections[self.account] if gc_c and gc_c.jid: real_jid = gc_c.jid - if gc_c.resource: - real_jid += '/' + gc_c.resource else: real_jid = fake_jid if fake_jid in con.vcard_shas:

1 0

gajim: [Dicson] Don't always show Tray icon if "only when pendin...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset cad205ef02b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cad205ef02b9 description: [Dicson] Don't always show Tray icon if "only when pending events" option is used. Fixes #5921 diffstat: src/config.py | 2 -- src/statusicon.py | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (42 lines): diff -r df7b76bb3419 -r cad205ef02b9 src/config.py --- a/src/config.py Fri Sep 17 12:41:00 2010 +0200 +++ b/src/config.py Sat Sep 18 23:06:36 2010 +0200 @@ -853,12 +853,10 @@ gajim.config.set('trayicon', 'on_event') gajim.interface.systray_enabled = True gajim.interface.systray.show_icon() - gajim.interface.systray.set_img() else: gajim.config.set('trayicon', 'always') gajim.interface.systray_enabled = True gajim.interface.systray.show_icon() - gajim.interface.systray.set_img() def on_advanced_notifications_button_clicked(self, widget): dialogs.AdvancedNotificationsWindow() diff -r df7b76bb3419 -r cad205ef02b9 src/statusicon.py --- a/src/statusicon.py Fri Sep 17 12:41:00 2010 +0200 +++ b/src/statusicon.py Sat Sep 18 23:06:36 2010 +0200 @@ -97,7 +97,6 @@ self.on_status_icon_size_changed) self.set_img() - self.status_icon.set_visible(True) self.subscribe_events() def on_status_icon_right_clicked(self, widget, event_button, event_time): @@ -131,9 +130,14 @@ """ if not gajim.interface.systray_enabled: return + if gajim.config.get('trayicon') == 'always': + self.status_icon.set_visible(True) if gajim.events.get_nb_systray_events(): + self.status_icon.set_visible(True) self.status_icon.set_blinking(True) else: + if gajim.config.get('trayicon') == 'on_event': + self.status_icon.set_visible(False) self.status_icon.set_blinking(False) image = gajim.interface.jabber_state_images[self.statusicon_size][

1 0

gajim: fix a bug in ged that prevent callback to be called in th...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset df7b76bb3419 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=df7b76bb3419 description: fix a bug in ged that prevent callback to be called in the correct order. diffstat: src/common/ged.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 25f5bb310768 -r df7b76bb3419 src/common/ged.py --- a/src/common/ged.py Thu Sep 16 21:15:12 2010 +0200 +++ b/src/common/ged.py Fri Sep 17 12:41:00 2010 +0200 @@ -43,6 +43,9 @@ for i, h in enumerate(handlers_list): if priority < h[0]: break + else: + # no event with smaller prio found, put it at the end + i += 1 handlers_list.insert(i, (priority, handler)) else:

1 0

gajim: handle canceling of creating gnome keyring. Fixes #5909
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 25f5bb310768 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25f5bb310768 description: handle canceling of creating gnome keyring. Fixes #5909 diffstat: src/common/passwords.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 82d4a7e724c6 -r 25f5bb310768 src/common/passwords.py --- a/src/common/passwords.py Thu Sep 16 20:27:54 2010 +0200 +++ b/src/common/passwords.py Thu Sep 16 21:15:12 2010 +0200 @@ -197,7 +197,8 @@ if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() - except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError): + except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, + gnomekeyring.CancelledError): storage = None if storage is None: if gajim.config.get('use_kwalletcli'):

1 0

gajim: [Dicson] Ability to resize statusicon when statusbar chan...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 82d4a7e724c6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=82d4a7e724c6 description: [Dicson] Ability to resize statusicon when statusbar changes. Fixes #5911 diffstat: src/statusicon.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diffs (47 lines): diff -r 80e03420842a -r 82d4a7e724c6 src/statusicon.py --- a/src/statusicon.py Mon Sep 13 12:23:49 2010 +0200 +++ b/src/statusicon.py Thu Sep 16 20:27:54 2010 +0200 @@ -86,12 +86,15 @@ def show_icon(self): if not self.status_icon: self.status_icon = gtk.StatusIcon() + self.statusicon_size = '16' self.status_icon.set_property('has-tooltip', True) self.status_icon.connect('activate', self.on_status_icon_left_clicked) self.status_icon.connect('popup-menu', self.on_status_icon_right_clicked) self.status_icon.connect('query-tooltip', self.on_status_icon_query_tooltip) + self.status_icon.connect('size-changed', + self.on_status_icon_size_changed) self.set_img() self.status_icon.set_visible(True) @@ -112,6 +115,16 @@ def on_status_icon_left_clicked(self, widget): self.on_left_click() + def on_status_icon_size_changed(self, statusicon, size): + if size > 31: + self.statusicon_size = '32' + else: + self.statusicon_size = '16' + if os.environ.get('KDE_FULL_SESSION') == 'true': + # detect KDE session. see #5476 + self.statusicon_size = '32' + self.set_img() + def set_img(self): """ Apart from image, we also update tooltip text here @@ -123,8 +136,8 @@ else: self.status_icon.set_blinking(False) - # FIXME: do not always use 16x16 (ask actually used size and use that) - image = gajim.interface.jabber_state_images['16'][self.status] + image = gajim.interface.jabber_state_images[self.statusicon_size][ + self.status] if image.get_storage_type() == gtk.IMAGE_PIXBUF: self.status_icon.set_from_pixbuf(image.get_pixbuf()) # FIXME: oops they forgot to support GIF animation?

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010