Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: correctly decode strings from treeview. Fixes #5996
by Yann Leboulanger 25 Oct '10

25 Oct '10

changeset c47219e5a552 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c47219e5a552 description: correctly decode strings from treeview. Fixes #5996 diffstat: src/history_manager.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 1f386a858d48 -r c47219e5a552 src/history_manager.py --- a/src/history_manager.py Mon Oct 25 11:23:10 2010 +0200 +++ b/src/history_manager.py Mon Oct 25 20:09:30 2010 +0200 @@ -279,7 +279,7 @@ path = rowref.get_path() if path is None: continue - jid = liststore[path][0] # jid + jid = liststore[path][0].decode('utf-8') # jid self._fill_logs_listview(jid) def _get_jid_id(self, jid): @@ -625,7 +625,7 @@ def on_search_results_listview_row_activated(self, widget, path, column): # get log_line_id, jid_id from row we double clicked log_line_id = self.search_results_liststore[path][0] - jid = self.search_results_liststore[path][1] + jid = self.search_results_liststore[path][1].decode('utf-8') # make it string as in gtk liststores I have them all as strings # as this is what db returns so I don't have to fight with types jid_id = self._get_jid_id(jid)

1 0

gajim: prevent traceback when we get a groupchat message for a r...
by Yann Leboulanger 25 Oct '10

25 Oct '10

changeset 1f386a858d48 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1f386a858d48 description: prevent traceback when we get a groupchat message for a room we're no more conencted. Fixes #5993 diffstat: src/remote_control.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 71889998d62f -r 1f386a858d48 src/remote_control.py --- a/src/remote_control.py Mon Oct 25 09:57:40 2010 +0200 +++ b/src/remote_control.py Mon Oct 25 11:23:10 2010 +0200 @@ -171,6 +171,9 @@ self.raise_signal('Unsubscribed', (obj.conn.name, obj.jid)) def on_gc_message_received(self, obj): + if not hasattr(obj, 'needs_highlight'): + # event has not been handled at GUI level + return self.raise_signal('GCMessage', (obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, obj.has_timestamp, obj.xhtml_msgtxt, obj.status_code, obj.displaymarking, obj.captcha_form, obj.needs_highlight]))

1 0

gajim: rename variables in plugins. Fixes #5994
by Yann Leboulanger 25 Oct '10

25 Oct '10

changeset 71889998d62f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71889998d62f description: rename variables in plugins. Fixes #5994 diffstat: plugins/google_translation/plugin.py | 6 +- plugins/new_events_example/plugin.py | 57 +++++++++++++++++------------------ 2 files changed, 30 insertions(+), 33 deletions(-) diffs (115 lines): diff -r 53102f47b5ba -r 71889998d62f plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Sun Oct 24 15:33:19 2010 +0200 +++ b/plugins/google_translation/plugin.py Mon Oct 25 09:57:40 2010 +0200 @@ -104,13 +104,13 @@ base_network_events = ['raw-message-received'] def generate(self): - msg_type = self.base_event.xmpp_msg.attrs.get('type', None) + msg_type = self.base_event.stanza.attrs.get('type', None) if msg_type == u'chat': - msg_text = "".join(self.base_event.xmpp_msg.kids[0].data) + msg_text = "".join(self.base_event.stanza.kids[0].data) if msg_text: from_lang = self.plugin.config['from_lang'] to_lang = self.plugin.config['to_lang'] - self.base_event.xmpp_msg.kids[0].setData( + self.base_event.stanza.kids[0].setData( self.plugin.translate_text(msg_text, from_lang, to_lang)) # We only want to modify old event, not emit another, so we return False diff -r 53102f47b5ba -r 71889998d62f plugins/new_events_example/plugin.py --- a/plugins/new_events_example/plugin.py Sun Oct 24 15:33:19 2010 +0200 +++ b/plugins/new_events_example/plugin.py Mon Oct 25 09:57:40 2010 +0200 @@ -46,34 +46,31 @@ #self.config_default_values = {} self.events_handlers = {'raw-message-received' : - (ged.POSTCORE, - self.raw_message_received), - 'customized-message-received' : - (ged.POSTCORE, - self.customized_message_received), - 'enriched-chat-message-received' : - (ged.POSTCORE, - self.enriched_chat_message_received)} + (ged.POSTCORE, self.raw_message_received), + 'customized-message-received' : + (ged.POSTCORE, self.customized_message_received), + 'enriched-chat-message-received' : + (ged.POSTCORE, self.enriched_chat_message_received)} self.events = [CustomizedMessageReceivedEvent, - MoreCustomizedMessageReceivedEvent, - ModifyOnlyMessageReceivedEvent, - EnrichedChatMessageReceivedEvent] + MoreCustomizedMessageReceivedEvent, + ModifyOnlyMessageReceivedEvent, + EnrichedChatMessageReceivedEvent] def enriched_chat_message_received(self, event_object): pass - #print "Event '%s' occured. Event object: %s\n\n===\n"%(event_object.name, - #event_object) + # print "Event '%s' occured. Event object: %s\n\n===\n" % \ + # (event_object.name, event_object) def raw_message_received(self, event_object): pass - #print "Event '%s' occured. Event object: %s\n\n===\n"%(event_object.name, - #event_object) + # print "Event '%s' occured. Event object: %s\n\n===\n" % \ + # (event_object.name,event_object) def customized_message_received(self, event_object): pass - #print "Event '%s' occured. Event object: %s\n\n===\n"%(event_object.name, - #event_object + # print "Event '%s' occured. Event object: %s\n\n===\n" % \ + # (event_object.name, event_object @log_calls('NewEventsExamplePlugin') def activate(self): @@ -107,11 +104,11 @@ base_network_events = ['raw-message-received'] def generate(self): - msg_type = self.base_event.xmpp_msg.attrs.get('type', None) + msg_type = self.base_event.stanza.attrs.get('type', None) if msg_type == u'chat': - msg_text = "".join(self.base_event.xmpp_msg.kids[0].data) - self.base_event.xmpp_msg.kids[0].setData( - u'%s [MODIFIED BY CUSTOM NETWORK EVENT]'%(msg_text)) + msg_text = ''.join(self.base_event.stanza.kids[0].data) + self.base_event.stanza.kids[0].setData( + u'%s [MODIFIED BY CUSTOM NETWORK EVENT]' % (msg_text)) return False @@ -124,17 +121,17 @@ base_network_events = ['raw-message-received'] def generate(self): - msg_type = self.base_event.xmpp_msg.attrs.get('type', None) + msg_type = self.base_event.stanza.attrs.get('type', None) if msg_type == u'chat': - self.xmpp_msg = self.base_event.xmpp_msg + self.stanza = self.base_event.stanza self.conn = self.base_event.conn - self.from_jid = helpers.get_full_jid_from_iq(self.xmpp_msg) - self.from_jid_without_resource = gajim.get_jid_without_resource(self.from_jid) - self.account = self.base_event.account - self.from_nickname = gajim.get_contact_name_from_jid( - self.account, - self.from_jid_without_resource) - self.msg_text = "".join(self.xmpp_msg.kids[0].data) + self.from_jid = helpers.get_full_jid_from_iq(self.stanza) + self.from_jid_without_resource = gajim.get_jid_without_resource( + self.from_jid) + self.account = self.conn.name + self.from_nickname = gajim.get_contact_name_from_jid( self.account, + self.from_jid_without_resource) + self.msg_text = ''.join(self.stanza.kids[0].data) return True

1 0

gajim: correctly clean groupchat_jids when we get an empty vcard.
by Yann Leboulanger 24 Oct '10

24 Oct '10

changeset 53e49988f563 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53e49988f563 description: correctly clean groupchat_jids when we get an empty vcard. diffstat: src/common/connection_handlers.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 8dfb09dc9387 -r 53e49988f563 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Oct 22 22:22:47 2010 +0200 +++ b/src/common/connection_handlers.py Sun Oct 24 15:32:38 2010 +0200 @@ -602,7 +602,11 @@ # We do as if it comes from the fake_jid frm = groupchat_jid our_jid = gajim.get_jid_from_account(self.name) - if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error': + if (not iq_obj.getTag('vCard') and iq_obj.getType() == 'result') or\ + iq_obj.getType() == 'error': + if id_ in self.groupchat_jids: + frm = self.groupchat_jids[id_] + del self.groupchat_jids[id_] if frm and frm != our_jid: # Write an empty file self._save_vcard_to_hd(frm, '')

1 0

gajim: check use_ft_proxies before discovering our server's proxy
by Yann Leboulanger 24 Oct '10

24 Oct '10

changeset 8dfb09dc9387 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8dfb09dc9387 description: check use_ft_proxies before discovering our server's proxy diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 15db3c1d792b -r 8dfb09dc9387 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Oct 21 19:49:58 2010 +0200 +++ b/src/common/connection_handlers.py Fri Oct 22 22:22:47 2010 +0200 @@ -360,7 +360,8 @@ 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): + if features.__contains__(common.xmpp.NS_BYTESTREAM) and \ + gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_jid = helpers.parse_jid(gajim.get_jid_from_account( self.name) + '/' + self.server_resource) gajim.proxy65_manager.resolve(jid, self.connection, our_jid,

1 0

gajim: [Kaini] fix start chat menuitem with zeroconf account
by Yann Leboulanger 24 Oct '10

24 Oct '10

changeset 15db3c1d792b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=15db3c1d792b description: [Kaini] fix start chat menuitem with zeroconf account diffstat: src/roster_window.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diffs (34 lines): diff -r 0f64fdfb45ce -r 15db3c1d792b src/roster_window.py --- a/src/roster_window.py Tue Oct 19 21:43:09 2010 +0200 +++ b/src/roster_window.py Thu Oct 21 19:49:58 2010 +0200 @@ -4823,12 +4823,15 @@ # items that get shown whether an account is zeroconf or not accounts_list = sorted(gajim.contacts.get_accounts()) - if connected_accounts > 1: # 2 or more accounts? make submenus + if connected_accounts > 2 or \ + (connected_accounts > 1 and not gajim.zeroconf_is_connected()): + # 2 or more "real" (no zeroconf) accounts? make submenus new_chat_sub_menu = gtk.Menu() for account in accounts_list: - if gajim.connections[account].connected <= 1: - # if offline or connecting + if gajim.connections[account].connected <= 1 or \ + gajim.config.get_per('accounts', account, 'is_zeroconf'): + # if offline or connecting or zeroconf continue # new chat @@ -4956,8 +4959,9 @@ for account in gajim.connections: if gajim.account_is_connected(account) and \ gajim.connections[account].is_zeroconf: - for item in (join_gc_menuitem, add_new_contact_menuitem, - service_disco_menuitem, single_message_menuitem): + for item in (new_chat_menuitem, join_gc_menuitem, + add_new_contact_menuitem, service_disco_menuitem, + single_message_menuitem): item.set_sensitive(False) # Manage GC bookmarks

1 0

gajim: check real JID <-> fake JID correspondance only when needed.
by Yann Leboulanger 24 Oct '10

24 Oct '10

changeset 53102f47b5ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53102f47b5ba description: check real JID <-> fake JID correspondance only when needed. diffstat: src/common/connection_handlers_events.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (51 lines): diff -r b5efb8187db5 -r 53102f47b5ba src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 24 15:32:38 2010 +0200 +++ b/src/common/connection_handlers_events.py Sun Oct 24 15:33:19 2010 +0200 @@ -36,8 +36,9 @@ log = logging.getLogger('gajim.c.connection_handlers_events') class HelperEvent: - def get_jid_resource(self): - if hasattr(self, 'id_') and self.id_ in self.conn.groupchat_jids: + def get_jid_resource(self, check_fake_jid=False): + if check_fake_jid and hasattr(self, 'id_') and \ + self.id_ in self.conn.groupchat_jids: self.fjid = self.conn.groupchat_jids[self.id_] del self.conn.groupchat_jids[self.id_] else: @@ -81,7 +82,7 @@ def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) if self.id_ in self.conn.last_ids: self.conn.last_ids.remove(self.id_) @@ -109,7 +110,7 @@ def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) if self.id_ in self.conn.version_ids: self.conn.version_ids.remove(self.id_) @@ -135,7 +136,7 @@ def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) if self.id_ in self.conn.entity_time_ids: self.conn.entity_time_ids.remove(self.id_) @@ -592,7 +593,7 @@ def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) self.errmsg = self.stanza.getErrorMsg() self.errcode = self.stanza.getErrorCode() return True

1 0

gajim: correctly clean groupchat_jids when we get an empty vcard.
by Yann Leboulanger 24 Oct '10

24 Oct '10

changeset b5efb8187db5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b5efb8187db5 description: correctly clean groupchat_jids when we get an empty vcard. diffstat: src/common/connection_handlers.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 1ab5f2805c92 -r b5efb8187db5 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Oct 22 22:22:47 2010 +0200 +++ b/src/common/connection_handlers.py Sun Oct 24 15:32:38 2010 +0200 @@ -629,7 +629,11 @@ # We do as if it comes from the fake_jid frm = groupchat_jid our_jid = gajim.get_jid_from_account(self.name) - if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error': + if (not iq_obj.getTag('vCard') and iq_obj.getType() == 'result') or\ + iq_obj.getType() == 'error': + if id_ in self.groupchat_jids: + frm = self.groupchat_jids[id_] + del self.groupchat_jids[id_] if frm and frm != our_jid: # Write an empty file self._save_vcard_to_hd(frm, '')

1 0

gajim: check use_ft_proxies before discovering our server's proxy
by Yann Leboulanger 22 Oct '10

22 Oct '10

changeset 1ab5f2805c92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ab5f2805c92 description: check use_ft_proxies before discovering our server's proxy diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r da85ddd405c2 -r 1ab5f2805c92 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Oct 21 19:49:58 2010 +0200 +++ b/src/common/connection_handlers.py Fri Oct 22 22:22:47 2010 +0200 @@ -381,7 +381,8 @@ self.archive_manual_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE_PREF): self.archive_pref_supported = True - if features.__contains__(common.xmpp.NS_BYTESTREAM): + if features.__contains__(common.xmpp.NS_BYTESTREAM) and \ + gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_jid = helpers.parse_jid(gajim.get_jid_from_account( self.name) + '/' + self.server_resource) gajim.proxy65_manager.resolve(jid, self.connection, our_jid,

1 0

gajim: [Kaini] fix start chat menuitem with zeroconf account
by Yann Leboulanger 21 Oct '10

21 Oct '10

changeset da85ddd405c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=da85ddd405c2 description: [Kaini] fix start chat menuitem with zeroconf account diffstat: src/roster_window.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diffs (34 lines): diff -r cc570eefd2a4 -r da85ddd405c2 src/roster_window.py --- a/src/roster_window.py Wed Oct 20 21:53:36 2010 +0200 +++ b/src/roster_window.py Thu Oct 21 19:49:58 2010 +0200 @@ -4863,12 +4863,15 @@ # items that get shown whether an account is zeroconf or not accounts_list = sorted(gajim.contacts.get_accounts()) - if connected_accounts > 1: # 2 or more accounts? make submenus + if connected_accounts > 2 or \ + (connected_accounts > 1 and not gajim.zeroconf_is_connected()): + # 2 or more "real" (no zeroconf) accounts? make submenus new_chat_sub_menu = gtk.Menu() for account in accounts_list: - if gajim.connections[account].connected <= 1: - # if offline or connecting + if gajim.connections[account].connected <= 1 or \ + gajim.config.get_per('accounts', account, 'is_zeroconf'): + # if offline or connecting or zeroconf continue # new chat @@ -4977,8 +4980,9 @@ for account in gajim.connections: if gajim.account_is_connected(account) and \ gajim.connections[account].is_zeroconf: - for item in (join_gc_menuitem, add_new_contact_menuitem, - service_disco_menuitem, single_message_menuitem): + for item in (new_chat_menuitem, join_gc_menuitem, + add_new_contact_menuitem, service_disco_menuitem, + single_message_menuitem): item.set_sensitive(False) # Manage GC bookmarks

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010