Commits

commits@gajim.org

17632 discussions

gajim: decrease call to get_contact(s) function to improve speed...
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 4199041f5034 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4199041f5034 description: decrease call to get_contact(s) function to improve speed. see #7125 diffstat: src/common/contacts.py | 2 +- src/roster_window.py | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diffs (79 lines): diff -r 682b687ebdc5 -r 4199041f5034 src/common/contacts.py --- a/src/common/contacts.py Sun Sep 23 13:34:21 2012 +0200 +++ b/src/common/contacts.py Mon Sep 24 12:24:10 2012 +0200 @@ -370,7 +370,7 @@ self.is_big_brother(account, jid, accounts): # count metacontacts only once continue - contact = self.get_contact_with_highest_priority(account, jid) + contact = self._accounts[account].contacts._contacts[jid][0] if _('Not in roster') in contact.groups: continue in_groups = False diff -r 682b687ebdc5 -r 4199041f5034 src/roster_window.py --- a/src/roster_window.py Sun Sep 23 13:34:21 2012 +0200 +++ b/src/roster_window.py Mon Sep 24 12:24:10 2012 +0200 @@ -1136,16 +1136,18 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected=False, focus=False): + def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None): """ Draw the correct state image, name BUT not avatar """ # focus is about if the roster window has toplevel-focus or not # FIXME: We really need a custom cell_renderer - contact_instances = gajim.contacts.get_contacts(account, jid) - contact = gajim.contacts.get_highest_prio_contact_from_contacts( - contact_instances) + if not contact_instances: + contact_instances = gajim.contacts.get_contacts(account, jid) + if not contact: + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) if not contact: return False @@ -1308,11 +1310,11 @@ else: return False - def draw_all_pep_types(self, jid, account): + def draw_all_pep_types(self, jid, account, contact=None): for pep_type in self._pep_type_to_model_column: - self.draw_pep(jid, account, pep_type) - - def draw_pep(self, jid, account, pep_type): + self.draw_pep(jid, account, pep_type, contact=contact) + + def draw_pep(self, jid, account, pep_type, contact=None): if pep_type not in self._pep_type_to_model_column: return if not self._is_pep_shown_in_roster(pep_type): @@ -1322,7 +1324,8 @@ iters = self._get_contact_iter(jid, account, model=self.model) if not iters: return - contact = gajim.contacts.get_contact(account, jid) + if not contact: + contact = gajim.contacts.get_contact(account, jid) if pep_type in contact.pep: pixbuf = contact.pep[pep_type].asPixbufIcon() else: @@ -1345,8 +1348,12 @@ return False def draw_completely(self, jid, account): - self.draw_contact(jid, account) - self.draw_all_pep_types(jid, account) + contact_instances = gajim.contacts.get_contacts(account, jid) + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) + self.draw_contact(jid, account, contact_instances=contact_instances, + contact=contact) + self.draw_all_pep_types(jid, account, contact=contact) self.draw_avatar(jid, account) def adjust_and_draw_contact_context(self, jid, account):

1 0

gajim: fix var name. Fixes #7229
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 682b687ebdc5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=682b687ebdc5 description: fix var name. Fixes #7229 diffstat: src/common/connection_handlers.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 4f9b0ddf7b2f -r 682b687ebdc5 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 19 09:49:43 2012 +0200 +++ b/src/common/connection_handlers.py Sun Sep 23 13:34:21 2012 +0200 @@ -999,9 +999,9 @@ def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt): - encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] - gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], + self._on_message_decrypted, [obj2]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

1 0

gajim: fix function argument. Fixes #7229
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 4f9b0ddf7b2f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f9b0ddf7b2f description: fix function argument. Fixes #7229 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 65424188a04f -r 4f9b0ddf7b2f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 18 16:07:11 2012 +0200 +++ b/src/common/connection_handlers.py Wed Sep 19 09:49:43 2012 +0200 @@ -965,7 +965,7 @@ if sess.enable_encryption: sess.terminate_e2e() - def decrypt_thread(encmsg, keyID, obj): + def decrypt_thread(self, encmsg, keyID, obj): decmsg = self.gpg.decrypt(encmsg, keyID) decmsg = self.connection.Dispatcher.replace_non_character(decmsg) # \x00 chars are not allowed in C (so in GTK)

1 0

gajim: decrypt GPG messages one after the other. Fixes #7229
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 65424188a04f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=65424188a04f description: decrypt GPG messages one after the other. Fixes #7229 diffstat: src/common/connection_handlers.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diffs (57 lines): diff -r e0de4f6d0d18 -r 65424188a04f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Sep 03 22:02:07 2012 +0400 +++ b/src/common/connection_handlers.py Tue Sep 18 16:07:11 2012 +0200 @@ -763,6 +763,9 @@ # keep track of sessions this connection has with other JIDs self.sessions = {} + # We decrypt GPG messages one after the other. Keep queue in mem + self.gpg_messages_to_decrypt = [] + gajim.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, @@ -962,6 +965,14 @@ if sess.enable_encryption: sess.terminate_e2e() + def decrypt_thread(encmsg, keyID, obj): + decmsg = self.gpg.decrypt(encmsg, keyID) + decmsg = self.connection.Dispatcher.replace_non_character(decmsg) + # \x00 chars are not allowed in C (so in GTK) + obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', '')) + obj.encrypted = 'xep27' + self.gpg_messages_to_decrypt.remove([encmsg, keyID, obj]) + def _nec_message_received(self, obj): if obj.conn.name != self.name: return @@ -979,20 +990,18 @@ keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID: - def decrypt_thread(encmsg, keyID, obj): - decmsg = self.gpg.decrypt(encmsg, keyID) - decmsg = self.connection.Dispatcher.replace_non_character( - decmsg) - # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', - '')) - obj.encrypted = 'xep27' - gajim.thread_interface(decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + self.gpg_messages_to_decrypt.append([encmsg, keyID, obj]) + if len(self.gpg_messages_to_decrypt) == 1: + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, + obj], self._on_message_decrypted, [obj]) return self._on_message_decrypted(None, obj) def _on_message_decrypted(self, output, obj): + if len(self.gpg_messages_to_decrypt): + encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], + self._on_message_decrypted, [obj]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

1 0

gajim: [Aлекс]. Fix time string encoding in the russian windows(...
by Fomin Denis 30 Oct '12

30 Oct '12

changeset e0de4f6d0d18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0de4f6d0d18 description: [Aлекс]. Fix time string encoding in the russian windows(cp1251). diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d3368ce04285 -r e0de4f6d0d18 src/conversation_textview.py --- a/src/conversation_textview.py Mon Oct 29 15:11:16 2012 +0100 +++ b/src/conversation_textview.py Mon Sep 03 22:02:07 2012 +0400 @@ -1334,7 +1334,7 @@ timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str tim_format = time.strftime(format_, tim) - if locale.getpreferredencoding() != 'KOI8-R': + if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'): # if tim_format comes as unicode because of day_str. # we convert it to the encoding that we want (and that is utf-8) tim_format = helpers.ensure_utf8_string(tim_format)

1 0

gajim: change Name in gajim.desktop. Fixes #7256
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset d3368ce04285 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d3368ce04285 description: change Name in gajim.desktop. Fixes #7256 diffstat: data/gajim.desktop.in.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 6f0e22a69b08 -r d3368ce04285 data/gajim.desktop.in.in --- a/data/gajim.desktop.in.in Thu Oct 18 00:36:57 2012 +0400 +++ b/data/gajim.desktop.in.in Mon Oct 29 15:11:16 2012 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Network;InstantMessaging;GTK;GNOME; -_Name=Gajim Instant Messenger +_Name=Gajim _GenericName=Jabber IM Client _Comment=A GTK+ Jabber client Version=1.0

1 0

gajim: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBA...
by Fomin Denis 30 Oct '12

30 Oct '12

changeset 6f0e22a69b08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f0e22a69b08 description: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBAL = 70. A network device is connected, with global network connectivity.) diffstat: src/network_manager_listener.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 48536d028e08 -r 6f0e22a69b08 src/network_manager_listener.py --- a/src/network_manager_listener.py Sun Oct 14 18:21:30 2012 +0200 +++ b/src/network_manager_listener.py Thu Oct 18 00:36:57 2012 +0400 @@ -45,9 +45,10 @@ def state_changed(state): """ - For Network Manager 0.7 + For Network Manager 0.7 - 0.9 """ - if props.Get("org.freedesktop.NetworkManager", "State") == 3: + nm_state = props.Get("org.freedesktop.NetworkManager", "State") + if nm_state == 3 or nm_state == 70: for connection in gajim.connections.itervalues(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect:

1 0

gajim: fix typo
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 48536d028e08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=48536d028e08 description: fix typo diffstat: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 734d02e7be50 -r 48536d028e08 ChangeLog --- a/ChangeLog Mon Oct 08 11:14:47 2012 +0200 +++ b/ChangeLog Sun Oct 14 18:21:30 2012 +0200 @@ -1,7 +1,7 @@ Gajim 0.15.1 (29 August 2012) * Switch from python-farsight to python-farstream - * improve performences + * improve performances * Fix roster filter with unicode chars * Fix connection to msn jabber server * Fix some GPG issues

1 0

gajim: prevent traceback when a wrong certificate is being check...
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 734d02e7be50 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=734d02e7be50 description: prevent traceback when a wrong certificate is being checked. Fixes #7242 diffstat: src/common/check_X509.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 1571a300a583 -r 734d02e7be50 src/common/check_X509.py --- a/src/common/check_X509.py Sat Oct 06 19:07:48 2012 +0200 +++ b/src/common/check_X509.py Mon Oct 08 11:14:47 2012 +0200 @@ -133,7 +133,12 @@ for i in range(0, cnt): ext = cert.get_extension(i) if ext.get_short_name() == 'subjectAltName': - r = _parse_asn1(ext.get_data()) + try: + r = _parse_asn1(ext.get_data()) + except: + log.error('Wrong data in certificate: subjectAltName=%s' % \ + ext.get_data()) + continue if 'otherName' in r: if oid_xmppaddr in r['otherName']: for host in r['otherName'][oid_xmppaddr]:

1 0

gajim: prevent some traceback. see #7152
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 1571a300a583 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1571a300a583 description: prevent some traceback. see #7152 diffstat: src/roster_window.py | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diffs (66 lines): diff -r 55f14a850972 -r 1571a300a583 src/roster_window.py --- a/src/roster_window.py Sun Sep 30 21:54:08 2012 +0200 +++ b/src/roster_window.py Sat Oct 06 19:07:48 2012 +0200 @@ -5019,7 +5019,10 @@ """ When a row is added, set properties for icon renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return if type_ == 'account': self._set_account_row_background_color(renderer) renderer.set_property('xalign', 0) @@ -5049,8 +5052,11 @@ """ When a row is added, set properties for name renderer """ + try: + type_ = model[titer][C_TYPE] + except TypeError: + return theme = gajim.config.get('roster_theme') - type_ = model[titer][C_TYPE] if type_ == 'account': color = gajim.config.get_per('themes', theme, 'accounttextcolor') if color: @@ -5112,7 +5118,10 @@ """ When a row is added, draw the respective pep icon """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return # allocate space for the icon only if needed if not model[titer][data]: @@ -5136,7 +5145,11 @@ """ When a row is added, set properties for avatar renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return + if type_ in ('group', 'account'): renderer.set_property('visible', False) return @@ -5168,7 +5181,11 @@ """ When a row is added, set properties for padlock renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return + # allocate space for the icon only if needed if type_ == 'account' and model[titer][C_PADLOCK_PIXBUF]: renderer.set_property('visible', True)

1 0

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