Commits September 2011

commits@gajim.org

2 participants
107 discussions

gajim: fix previous commit
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 6dae5d22458f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6dae5d22458f description: fix previous commit diffstat: src/notify.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 206db0e724e7 -r 6dae5d22458f src/notify.py --- a/src/notify.py Fri Sep 23 21:23:56 2011 +0300 +++ b/src/notify.py Fri Sep 23 22:06:36 2011 +0300 @@ -366,6 +366,7 @@ hints['category'] = dbus.String(ntype) # it seems notification-daemon doesn't like empty text if self.text: + text = self.text if len(self.text) > 200: text = '%s\n...' % self.text[:200] else:

1 0

gajim: New gui_extension_point added. Do not use all args in rem...
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 5f6618d9cb7d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f6618d9cb7d description: New gui_extension_point added. Do not use all args in remove_gui_extension_point() to identify elements to be removed. Use only first one diffstat: src/chat_control.py | 8 ++++++-- src/conversation_textview.py | 9 +++++++++ src/plugins/pluginmanager.py | 8 ++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diffs (56 lines): diff -r 6dae5d22458f -r 5f6618d9cb7d src/chat_control.py --- a/src/chat_control.py Fri Sep 23 22:06:36 2011 +0300 +++ b/src/chat_control.py Mon Sep 26 20:47:33 2011 +0300 @@ -521,8 +521,12 @@ super(ChatControlBase, self).shutdown() # PluginSystem: removing GUI extension points connected with ChatControlBase # instance object - gajim.plugin_manager.remove_gui_extension_point('chat_control_base', self) - gajim.plugin_manager.remove_gui_extension_point('chat_control_base_draw_banner', self) + gajim.plugin_manager.remove_gui_extension_point('chat_control_base', + self) + gajim.plugin_manager.remove_gui_extension_point( + 'chat_control_base_draw_banner', self) + gajim.plugin_manager.remove_gui_extension_point('print_special_text', + self) gajim.ged.remove_event_handler('our-show', ged.GUI1, self._nec_our_status) diff -r 6dae5d22458f -r 5f6618d9cb7d src/conversation_textview.py --- a/src/conversation_textview.py Fri Sep 23 22:06:36 2011 +0300 +++ b/src/conversation_textview.py Mon Sep 26 20:47:33 2011 +0300 @@ -1039,6 +1039,15 @@ Is called by detect_and_print_special_text and prints special text (emots, links, formatting) """ + + + # PluginSystem: adding GUI extension point for ConversationTextview + self.plugin_modified = False + gajim.plugin_manager.gui_extension_point('print_special_text', self, + special_text, other_tags, graphics) + if self.plugin_modified: + return + tags = [] use_other_tags = True text_is_valid_uri = False diff -r 6dae5d22458f -r 5f6618d9cb7d src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Sep 23 22:06:36 2011 +0300 +++ b/src/plugins/pluginmanager.py Mon Sep 26 20:47:33 2011 +0300 @@ -215,9 +215,13 @@ extension point name) to identify element to be removed. :type args: tuple ''' + if gui_extpoint_name in self.gui_extension_points: + extension_points = list(self.gui_extension_points[gui_extpoint_name]) + for ext_point in extension_points: + if args[0] in ext_point: + self.gui_extension_points[gui_extpoint_name].remove( + ext_point) - if gui_extpoint_name in self.gui_extension_points: - self.gui_extension_points[gui_extpoint_name].remove(args) @log_calls('PluginManager') def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args):

1 0

gajim: show only first 200 chars in popups
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 206db0e724e7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=206db0e724e7 description: show only first 200 chars in popups diffstat: src/notify.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (26 lines): diff -r c1caeb5e8e24 -r 206db0e724e7 src/notify.py --- a/src/notify.py Fri Sep 23 19:01:42 2011 +0200 +++ b/src/notify.py Fri Sep 23 21:23:56 2011 +0300 @@ -236,7 +236,7 @@ def __init__(self, event_type, jid, account, msg_type='', path_to_image=None, title=None, text=None): - self.path_to_image = path_to_image + self.path_to_image = os.path.abspath(path_to_image) self.event_type = event_type self.title = title self.text = text @@ -366,11 +366,11 @@ hints['category'] = dbus.String(ntype) # it seems notification-daemon doesn't like empty text if self.text: - text = self.text + if len(self.text) > 200: + text = '%s\n...' % self.text[:200] 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>%s</td></tr></table>' % (self.path_to_image,

1 0

gajim: don't crash when we get wrong streamhost. Fixes #6983
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset c1caeb5e8e24 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c1caeb5e8e24 description: don't crash when we get wrong streamhost. Fixes #6983 diffstat: src/common/protocol/bytestream.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 0516704ef506 -r c1caeb5e8e24 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Fri Sep 23 19:00:32 2011 +0200 +++ b/src/common/protocol/bytestream.py Fri Sep 23 19:01:42 2011 +0200 @@ -597,6 +597,12 @@ } for attr in item.getAttrs(): host_dict[attr] = item.getAttr(attr) + if 'host' not in host_dict: + continue + if 'jid' not in host_dict: + continue + if 'port' not in host_dict: + continue streamhosts.append(host_dict) if file_props is None: if sid in self.files_props:

1 0

gajim: sh autogen.sh don't work in ubuntu.
by Fomin Denis 27 Sep '11

27 Sep '11

changeset e87930960b2f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e87930960b2f description: sh autogen.sh don't work in ubuntu. diffstat: README.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 3566708f7cad -r e87930960b2f README.html --- a/README.html Thu Sep 22 11:43:51 2011 +0200 +++ b/README.html Thu Sep 22 19:26:25 2011 +0300 @@ -72,7 +72,7 @@ </ul> <p>steps to compile gajim:</p> <pre> - $ sh autogen.sh + $ ./autogen.sh $ ./configure $ make </pre> @@ -95,7 +95,7 @@ <h2>Miscellaneous</h2> <h3>XML & Debugging</h3> -<p>If you want to see the xml stanzas and/or help us debugging +<p>If you want to see the xml stanzas and/or help us debugging you're advised to enable verbose via advanced configuration window. If you don't want to make this permanent, execute gajim with --verbose everytime you want to have verbose output.</p>

1 0

gajim: add missing function. Fixes #6985
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 0516704ef506 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0516704ef506 description: add missing function. Fixes #6985 diffstat: src/plugins/pluginmanager.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (17 lines): diff -r e87930960b2f -r 0516704ef506 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Thu Sep 22 19:26:25 2011 +0300 +++ b/src/plugins/pluginmanager.py Fri Sep 23 19:00:32 2011 +0200 @@ -144,6 +144,13 @@ self.add_plugin(plugin_class) @log_calls('PluginManager') + def get_active_plugin(self, plugin_name): + for plugin in self.active_plugins: + if plugin.short_name == plugin_name: + return plugin + return None + + @log_calls('PluginManager') def gui_extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for particular GUI extension point

1 0

gajim: show our room nickname when chatting in pm. Fixes #6949
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 3566708f7cad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3566708f7cad description: show our room nickname when chatting in pm. Fixes #6949 diffstat: src/chat_control.py | 7 +++++-- src/groupchat_control.py | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diffs (61 lines): diff -r e4f1e451bc65 -r 3566708f7cad src/chat_control.py --- a/src/chat_control.py Thu Sep 22 11:25:02 2011 +0200 +++ b/src/chat_control.py Thu Sep 22 11:43:51 2011 +0200 @@ -2371,6 +2371,9 @@ elif isinstance(self.session, ArchivingStanzaSession): self.print_archiving_session_details() + def get_our_nick(self): + return gajim.nicks[self.account] + def print_conversation(self, text, frm='', tim=None, encrypted=False, subject=None, xhtml=None, simple=False, xep0184_id=None, displaymarking=None): @@ -2427,7 +2430,7 @@ name = contact.get_shown_name() else: kind = 'outgoing' - name = gajim.nicks[self.account] + name = self.get_our_nick() if not xhtml and not (encrypted and self.gpg_is_active) and \ gajim.config.get('rst_formatting_outgoing_messages'): from common.rst_xhtml_generator import create_xhtml @@ -2876,7 +2879,7 @@ if row[1] in (constants.KIND_CHAT_MSG_SENT, constants.KIND_SINGLE_MSG_SENT): kind = 'outgoing' - name = gajim.nicks[self.account] + name = self.get_our_nick() elif row[1] in (constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV): kind = 'incoming' diff -r e4f1e451bc65 -r 3566708f7cad src/groupchat_control.py --- a/src/groupchat_control.py Thu Sep 22 11:25:02 2011 +0200 +++ b/src/groupchat_control.py Thu Sep 22 11:43:51 2011 +0200 @@ -138,12 +138,12 @@ def __init__(self, parent_win, gc_contact, contact, account, session): room_jid = gc_contact.room_jid - room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, + self.room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) if room_jid in gajim.interface.minimized_controls[account]: - room_ctrl = gajim.interface.minimized_controls[account][room_jid] - if room_ctrl: - self.room_name = room_ctrl.name + self.room_ctrl = gajim.interface.minimized_controls[account][room_jid] + if self.room_ctrl: + self.room_name = self.room_ctrl.name else: self.room_name = room_jid self.gc_contact = gc_contact @@ -154,6 +154,9 @@ gajim.ged.register_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) + def get_our_nick(self): + return self.room_ctrl.nick + def shutdown(self): super(PrivateChatControl, self).shutdown() gajim.ged.remove_event_handler('caps-received', ged.GUI1,

1 0

gajim: don't loose in logs MUC messages arriving in the same sec...
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset e4f1e451bc65 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e4f1e451bc65 description: don't loose in logs MUC messages arriving in the same second. Fixes #6860 diffstat: src/common/logger.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 9e24f308f977 -r e4f1e451bc65 src/common/logger.py --- a/src/common/logger.py Wed Sep 21 21:53:29 2011 +0200 +++ b/src/common/logger.py Thu Sep 22 11:25:02 2011 +0200 @@ -1106,9 +1106,10 @@ self.write(type_, with_, message=msg, tim=tim) def _nec_gc_message_received(self, obj): - tim_int = int(float(time.mktime(obj.timestamp))) + tim_f = float(time.mktime(obj.timestamp)) + tim_int = int(tim_f) if gajim.config.should_log(obj.conn.name, obj.jid) and not \ - tim_int <= obj.conn.last_history_time[obj.jid] and obj.msgtxt and \ + tim_int < obj.conn.last_history_time[obj.jid] and obj.msgtxt and \ obj.nick: # if not obj.nick, it means message comes from room itself # usually it hold description and can be send at each connection @@ -1118,7 +1119,7 @@ # store in memory time of last message logged. # this will also be saved in rooms_last_message_time table # when we quit this muc - obj.conn.last_history_time[obj.jid] = time.mktime(obj.timestamp) + obj.conn.last_history_time[obj.jid] = tim_f except exceptions.PysqliteOperationalError, e: obj.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e)))

1 0

gajim: handle only systray events when using gajim-remote show_n...
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 9e24f308f977 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9e24f308f977 description: handle only systray events when using gajim-remote show_next_pending_event. Fixes #6962 diffstat: src/remote_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a9235c029fd5 -r 9e24f308f977 src/remote_control.py --- a/src/remote_control.py Tue Sep 20 16:53:29 2011 +0200 +++ b/src/remote_control.py Wed Sep 21 21:53:29 2011 +0200 @@ -605,7 +605,7 @@ Show the window(s) with next pending event in tabbed/group chats """ if gajim.events.get_nb_events(): - account, jid, event = gajim.events.get_first_event() + account, jid, event = gajim.events.get_first_systray_event() if not event: return gajim.interface.handle_event(account, jid, event.type_)

1 0

gajim: don't keep in mem notifications when we handle them Fixes...
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset a9235c029fd5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9235c029fd5 description: don't keep in mem notifications when we handle them Fixes #6891 diffstat: src/notify.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 2a983ea40af2 -r a9235c029fd5 src/notify.py --- a/src/notify.py Sun Sep 18 16:11:27 2011 +0200 +++ b/src/notify.py Tue Sep 20 16:53:29 2011 +0200 @@ -192,11 +192,14 @@ self.interface.connect_to_signal('NotificationClosed', self.on_closed) def on_action_invoked(self, id_, reason): - self.received.append((id_, time.time(), reason)) if id_ in self.pending: notification = self.pending[id_] notification.on_action_invoked(id_, reason) del self.pending[id_] + return + # got an action on popup that isn't handled yet? Maybe user clicked too + # fast. Remember it. + self.received.append((id_, time.time(), reason)) if len(self.received) > 20: curt = time.time() for rec in self.received: @@ -410,9 +413,8 @@ self.notify_another_way(e) def attach_by_id(self, id_): - self.id = id_ notification_response_manager.attach_to_interface() - notification_response_manager.add_pending(self.id, self) + notification_response_manager.add_pending(id_, self) def notify_another_way(self, e): gajim.log.debug('Error when trying to use notification daemon: %s' % \

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2011