Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: handle milliseconds in time result stanza. Fixes #5905
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 80e03420842a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=80e03420842a description: handle milliseconds in time result stanza. Fixes #5905 diffstat: src/common/connection_handlers.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 344c088cd176 -r 80e03420842a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Sep 11 15:32:44 2010 +0200 +++ b/src/common/connection_handlers.py Mon Sep 13 12:23:49 2010 +0200 @@ -1293,10 +1293,16 @@ try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - t = t.replace(tzinfo=UTC()) - time_info = t.astimezone(contact_tz()).strftime('%c') except ValueError, e: - log.info('Wrong time format: %s' % str(e)) + try: + t = datetime.datetime.strptime(utc_time, + '%Y-%m-%dT%H:%M:%S.%fZ') + except ValueError, e: + log.info('Wrong time format: %s' % str(e)) + return + + t = t.replace(tzinfo=UTC()) + time_info = t.astimezone(contact_tz()).strftime('%c') id_ = iq_obj.getID() if id_ in self.groupchat_jids:

1 0

gajim: [Dicson] fix typo preventing sending XHTML. Fixes #5900
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 344c088cd176 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=344c088cd176 description: [Dicson] fix typo preventing sending XHTML. Fixes #5900 diffstat: src/common/xmpp/protocol.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 7e596e838634 -r 344c088cd176 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Fri Sep 10 21:31:25 2010 +0200 +++ b/src/common/xmpp/protocol.py Sat Sep 11 15:32:44 2010 +0200 @@ -717,7 +717,8 @@ if xmllang: dom = NodeBuilder('<body xmlns="%s" xml:lang="%s">%s</body>' % (NS_XHTML, xmllang, val)).getDom() else: - dom = NodeBuilder('<body xmlns="%s">%s</body>, 0' % (NS_XHTML, val)).getDom() + dom = NodeBuilder('<body xmlns="%s">%s</body>' % (NS_XHTML, + val), 0).getDom() if self.getTag('html'): self.getTag('html').addChild(node=dom) else:

1 0

gajim: Fix running Gajim under windows for users with non-ascii ...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 7e596e838634 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7e596e838634 description: Fix running Gajim under windows for users with non-ascii char in account name. Fixes #5852 diffstat: src/common/zeroconf/connection_zeroconf.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 46e4d8425796 -r 7e596e838634 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Fri Sep 10 21:27:10 2010 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Fri Sep 10 21:31:25 2010 +0200 @@ -48,6 +48,8 @@ from common.zeroconf import zeroconf from connection_handlers_zeroconf import * +import locale + class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def __init__(self, name): ConnectionHandlersZeroconf.__init__(self) @@ -105,7 +107,8 @@ 'zeroconf_email') if not self.username: - self.username = unicode(getpass.getuser()) + self.username = unicode(getpass.getuser(), + locale.getpreferredencoding()) gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name', self.username) else:

1 0

gajim: prevent traceback when receiving strange reply to iq:last...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 46e4d8425796 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=46e4d8425796 description: prevent traceback when receiving strange reply to iq:last. Fixes #5898 diffstat: src/common/connection_handlers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r b5703ff5c457 -r 46e4d8425796 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 08 22:26:04 2010 +0200 +++ b/src/common/connection_handlers.py Fri Sep 10 21:27:10 2010 +0200 @@ -820,6 +820,8 @@ def _LastResultCB(self, con, iq_obj): log.debug('LastResultCB') qp = iq_obj.getTag('query') + if not qp: + return seconds = qp.getAttr('seconds') status = qp.getData() try:

1 0

gajim: fix changing account name. Fixes #5891
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset b5703ff5c457 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b5703ff5c457 description: fix changing account name. Fixes #5891 diffstat: src/common/pep.py | 3 +++ src/common/protocol/caps.py | 3 +++ src/config.py | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-) diffs (38 lines): diff -r 8b30d25dfd60 -r b5703ff5c457 src/common/pep.py --- a/src/common/pep.py Wed Sep 08 09:03:43 2010 +0200 +++ b/src/common/pep.py Wed Sep 08 22:26:04 2010 +0200 @@ -502,6 +502,9 @@ self._pubsub_connection = pubsub_connection self.reset_awaiting_pep() + def pep_change_account_name(self, new_name): + self._account = new_name + def reset_awaiting_pep(self): self.to_be_sent_activity = None self.to_be_sent_mood = None diff -r 8b30d25dfd60 -r b5703ff5c457 src/common/protocol/caps.py --- a/src/common/protocol/caps.py Wed Sep 08 09:03:43 2010 +0200 +++ b/src/common/protocol/caps.py Wed Sep 08 22:26:04 2010 +0200 @@ -38,6 +38,9 @@ self._capscache = capscache self._create_suitable_client_caps = client_caps_factory + def caps_change_account_name(self, new_name): + self._account = new_name + def _capsPresenceCB(self, con, presence): """ XMMPPY callback method to handle retrieved caps info diff -r 8b30d25dfd60 -r b5703ff5c457 src/config.py --- a/src/config.py Wed Sep 08 09:03:43 2010 +0200 +++ b/src/config.py Wed Sep 08 22:26:04 2010 +0200 @@ -2068,6 +2068,8 @@ del gajim.gajim_optional_features[old_name] del gajim.caps_hash[old_name] gajim.connections[old_name].name = new_name + gajim.connections[old_name].pep_change_account_name(new_name) + gajim.connections[old_name].caps_change_account_name(new_name) gajim.connections[new_name] = gajim.connections[old_name] del gajim.connections[old_name] gajim.config.add_per('accounts', new_name)

1 0

gajim: prevent a traceback when trying to redraw a contact that ...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 8b30d25dfd60 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b30d25dfd60 description: prevent a traceback when trying to redraw a contact that is no more in our roster. Fixes #5876 diffstat: src/roster_window.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 9887186c3a21 -r 8b30d25dfd60 src/roster_window.py --- a/src/roster_window.py Wed Sep 08 08:58:29 2010 +0200 +++ b/src/roster_window.py Wed Sep 08 09:03:43 2010 +0200 @@ -1110,7 +1110,9 @@ contact_instances = gajim.contacts.get_contacts(account, jid) contact = gajim.contacts.get_highest_prio_contact_from_contacts( - contact_instances) + contact_instances) + if not contact: + return False child_iters = self._get_contact_iter(jid, account, contact, self.model) if not child_iters:

1 0

gajim: hide a widget when it's unused
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 9887186c3a21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9887186c3a21 description: hide a widget when it's unused diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c190d442ea41 -r 9887186c3a21 src/config.py --- a/src/config.py Wed Sep 08 08:56:06 2010 +0200 +++ b/src/config.py Wed Sep 08 08:58:29 2010 +0200 @@ -2744,7 +2744,7 @@ self.xml.get_object('title_label').set_text(self.form.title) else: self.xml.get_object('title_hseparator').set_no_show_all(True) -# self.xml.get_object('title_hseparator').hide() + self.xml.get_object('title_hseparator').hide() self.data_form_widget.show() config_vbox.pack_start(self.data_form_widget)

1 0

gajim: show MUC configuration form title in the MUC config windo...
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset c190d442ea41 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c190d442ea41 description: show MUC configuration form title in the MUC config window. Fixes #5886 diffstat: data/gui/data_form_window.ui | 6 +++--- src/config.py | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diffs (55 lines): diff -r f09377c97f04 -r c190d442ea41 data/gui/data_form_window.ui --- a/data/gui/data_form_window.ui Fri Sep 03 11:29:15 2010 +0200 +++ b/data/gui/data_form_window.ui Wed Sep 08 08:56:06 2010 +0200 @@ -34,7 +34,7 @@ <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <object class="GtkLabel" id="instructions_label"> + <object class="GtkLabel" id="title_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="wrap">True</property> @@ -47,7 +47,7 @@ </packing> </child> <child> - <object class="GtkHSeparator" id="hseparator15"> + <object class="GtkHSeparator" id="title_hseparator"> <property name="visible">True</property> </object> <packing> @@ -65,7 +65,7 @@ </packing> </child> <child> - <object class="GtkHSeparator" id="hseparator14"> + <object class="GtkHSeparator" id="config_hseparator"> <property name="visible">True</property> </object> <packing> diff -r f09377c97f04 -r c190d442ea41 src/config.py --- a/src/config.py Fri Sep 03 11:29:15 2010 +0200 +++ b/src/config.py Wed Sep 08 08:56:06 2010 +0200 @@ -2740,9 +2740,21 @@ # widget sw = self.data_form_widget.xml.get_object('single_form_scrolledwindow') sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER) + if self.form.title: + self.xml.get_object('title_label').set_text(self.form.title) + else: + self.xml.get_object('title_hseparator').set_no_show_all(True) +# self.xml.get_object('title_hseparator').hide() self.data_form_widget.show() config_vbox.pack_start(self.data_form_widget) + else: + self.xml.get_object('title_label').set_no_show_all(True) + self.xml.get_object('title_label').hide() + self.xml.get_object('title_hseparator').set_no_show_all(True) + self.xml.get_object('title_hseparator').hide() + self.xml.get_object('config_hseparator').set_no_show_all(True) + self.xml.get_object('config_hseparator').hide() # Draw the edit affiliation list things add_on_vbox = self.xml.get_object('add_on_vbox')

1 0

gajim: check server features in correct stanza
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset f09377c97f04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f09377c97f04 description: check server features in correct stanza diffstat: src/common/connection_handlers.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diffs (41 lines): diff -r 8edc45e9a637 -r f09377c97f04 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Sep 03 08:01:37 2010 +0200 +++ b/src/common/connection_handlers.py Fri Sep 03 11:29:15 2010 +0200 @@ -348,22 +348,23 @@ 'pep': self.pep_supported = True break - if features.__contains__(common.xmpp.NS_VCARD): - self.vcard_supported = True - if features.__contains__(common.xmpp.NS_PUBSUB): - self.pubsub_supported = True - if features.__contains__(common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): - self.pubsub_publish_options_supported = True - else: - # Remove stored bookmarks accessible to everyone. - our_jid = gajim.get_jid_from_account(self.name) - self.send_pb_purge(our_jid, 'storage:bookmarks') - self.send_pb_delete(our_jid, 'storage:bookmarks') + if features.__contains__(common.xmpp.NS_VCARD): + self.vcard_supported = True + if features.__contains__(common.xmpp.NS_PUBSUB): + self.pubsub_supported = True + if features.__contains__( + common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): + self.pubsub_publish_options_supported = True + else: + # Remove stored bookmarks accessible to everyone. + our_jid = gajim.get_jid_from_account(self.name) + self.send_pb_purge(our_jid, 'storage:bookmarks') + self.send_pb_delete(our_jid, 'storage:bookmarks') if features.__contains__(common.xmpp.NS_BYTESTREAM): - our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) +\ - '/' + self.server_resource) + our_jid = helpers.parse_jid(gajim.get_jid_from_account( + self.name) + '/' + self.server_resource) gajim.proxy65_manager.resolve(jid, self.connection, our_jid, - self.name) + self.name) if features.__contains__(common.xmpp.NS_MUC) and is_muc: type_ = transport_type or 'jabber' self.muc_jid[type_] = jid

1 0

gajim: prevent traceback
by Yann Leboulanger 01 Oct '10

01 Oct '10

changeset 8edc45e9a637 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8edc45e9a637 description: prevent traceback diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e1edaf27dd11 -r 8edc45e9a637 src/dialogs.py --- a/src/dialogs.py Fri Sep 03 10:49:19 2010 +0200 +++ b/src/dialogs.py Fri Sep 03 08:01:37 2010 +0200 @@ -1471,7 +1471,7 @@ HigDialog.__init__( self, None, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, pritext, sectext) self.set_modal(False) - if hasattr(gajim.interface, 'roster'): + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: self.set_transient_for(gajim.interface.roster.window) self.popup()

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