Commits November 2011

commits@gajim.org

3 participants
55 discussions

gajim: improve search filter behaviour. Fixes #7049
by Yann Leboulanger 29 Nov '11

29 Nov '11

changeset fc1de074bf23 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fc1de074bf23 description: improve search filter behaviour. Fixes #7049 diffstat: src/roster_window.py | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diffs (85 lines): diff -r 963dae8934ce -r fc1de074bf23 src/roster_window.py --- a/src/roster_window.py Tue Nov 29 11:55:06 2011 +0100 +++ b/src/roster_window.py Tue Nov 29 17:20:25 2011 +0100 @@ -3335,7 +3335,10 @@ """ self.tooltip.hide_tooltip() if event.keyval == gtk.keysyms.Escape: - self.tree.get_selection().unselect_all() + if self.rfilter_enabled: + self.disable_rfilter() + else: + self.tree.get_selection().unselect_all() elif event.keyval == gtk.keysyms.F2: treeselection = self.tree.get_selection() model, list_of_paths = treeselection.get_selected_rows() @@ -3877,6 +3880,9 @@ def on_roster_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: + if self.rfilter_enabled: + self.disable_rfilter() + return if gajim.interface.msg_win_mgr.mode == \ MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER and \ gajim.interface.msg_win_mgr.one_window_opened(): @@ -4226,6 +4232,15 @@ if self.rfilter_string == '': self.disable_rfilter() self.refilter_shown_roster_items() + # select first row + self.tree.get_selection().unselect_all() + def _func(model, path, iter_): + if model[iter_][C_TYPE] == 'contact' and self.rfilter_string in \ + model[iter_][C_NAME].lower(): + col = self.tree.get_column(0) + self.tree.set_cursor_on_cell(path, col) + return True + self.modelfilter.foreach(_func) def on_rfilter_entry_icon_press(self, widget, icon, event): """ @@ -4233,16 +4248,32 @@ """ self.disable_rfilter() + def on_rfilter_entry_key_press_event(self, widget, event): + if event.keyval == gtk.keysyms.Escape: + self.disable_rfilter() + elif event.keyval == gtk.keysyms.Return: + self.tree.grab_focus() + self.tree.emit('key_press_event', event) + self.disable_rfilter() + elif event.keyval in (gtk.keysyms.Up, gtk.keysyms.Down): + self.tree.grab_focus() + self.tree.emit('key_press_event', event) + def enable_rfilter(self, search_string): - self.rfilter_enabled = True + if self.rfilter_enabled: + self.rfilter_entry.set_text(self.rfilter_entry.get_text() + \ + search_string) + else: + self.rfilter_enabled = True + self.rfilter_entry.set_text(search_string) self.rfilter_entry.set_visible(True) self.rfilter_entry.set_editable(True) - self.rfilter_entry.set_text(search_string) self.rfilter_entry.grab_focus() self.rfilter_entry.set_position(-1) def disable_rfilter(self): self.rfilter_enabled = False + self.rfilter_entry.set_text('') self.rfilter_entry.set_visible(False) self.rfilter_entry.set_editable(False) self.refilter_shown_roster_items() @@ -6436,6 +6467,8 @@ self.rfilter_entry = self.xml.get_object('rfilter_entry') self.rfilter_string = '' self.rfilter_enabled = False + self.rfilter_entry.connect('key-press-event', + self.on_rfilter_entry_key_press_event) gajim.ged.register_event_handler('presence-received', ged.GUI1, self._nec_presence_received)

1 0

gajim: modify /clear command in groupchats so that it also reset...
by Yann Leboulanger 29 Nov '11

29 Nov '11

changeset 963dae8934ce in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=963dae8934ce description: modify /clear command in groupchats so that it also reset color assignment. Fixes #7022 diffstat: src/command_system/implementation/standard.py | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diffs (48 lines): diff -r 1c20dc66ded3 -r 963dae8934ce src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Tue Nov 29 11:28:40 2011 +0100 +++ b/src/command_system/implementation/standard.py Tue Nov 29 11:55:06 2011 +0100 @@ -47,11 +47,6 @@ HOSTS = ChatCommands, PrivateChatCommands, GroupChatCommands @command - @doc(_("Clear the text window")) - def clear(self): - self.conv_textview.clear() - - @command @doc(_("Hide the chat buttons")) def compact(self): new_status = not self.hide_chat_buttons @@ -169,6 +164,11 @@ HOSTS = ChatCommands, PrivateChatCommands @command + @doc(_("Clear the text window")) + def clear(self): + self.conv_textview.clear() + + @command @doc(_("Toggle the GPG encryption")) def gpg(self): self._toggle_gpg() @@ -240,6 +240,13 @@ AUTOMATIC = True HOSTS = GroupChatCommands, + @command + @doc(_("Clear the text window")) + def clear(self): + self.conv_textview.clear() + self.gc_count_nicknames_colors = -1 + self.gc_custom_colors = {} + @command(raw=True) @doc(_("Change your nickname in a group chat")) def nick(self, new_nick): @@ -353,4 +360,4 @@ @command('unignore', raw=True) @doc(_("Allow an occupant to send you public or private messages")) def unblock(self, who): - self.on_unblock(None, who) \ No newline at end of file + self.on_unblock(None, who)

1 0

gajim: install correctly all files from plugins (png and files i...
by Yann Leboulanger 29 Nov '11

29 Nov '11

changeset 1c20dc66ded3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1c20dc66ded3 description: install correctly all files from plugins (png and files in subdirectories) diffstat: plugins/Makefile.am | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (19 lines): diff -r b1aee7edf511 -r 1c20dc66ded3 plugins/Makefile.am --- a/plugins/Makefile.am Tue Nov 29 12:48:06 2011 +0300 +++ b/plugins/Makefile.am Tue Nov 29 11:28:40 2011 +0100 @@ -5,10 +5,11 @@ dist_gajimplugins_PYTHON = -nobase_gajimplugins_DATA = \ - $(srcdir)/*/*.py \ - $(srcdir)/*/manifest.ini \ - $(srcdir)/*/*.ui +pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} + +pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png) + +nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) MAINTAINERCLEANFILES = Makefile.in

1 0

gajim: fix errors in building
by Fomin Denis 29 Nov '11

29 Nov '11

changeset b1aee7edf511 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b1aee7edf511 description: fix errors in building diffstat: plugins/Makefile.am | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 2d6b43b4dd8b -r b1aee7edf511 plugins/Makefile.am --- a/plugins/Makefile.am Sat Nov 26 22:52:04 2011 +0300 +++ b/plugins/Makefile.am Tue Nov 29 12:48:06 2011 +0300 @@ -8,8 +8,7 @@ nobase_gajimplugins_DATA = \ $(srcdir)/*/*.py \ $(srcdir)/*/manifest.ini \ - $(srcdir)/*/*.ui \ - $(srcdir)/*/*.png + $(srcdir)/*/*.ui MAINTAINERCLEANFILES = Makefile.in

1 0

gajim: Use set_rules_hint(True) in the installed plugins treeview
by Fomin Denis 26 Nov '11

26 Nov '11

changeset 2d6b43b4dd8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d6b43b4dd8b description: Use set_rules_hint(True) in the installed plugins treeview diffstat: src/plugins/gui.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 476d6876f5fb -r 2d6b43b4dd8b src/plugins/gui.py --- a/src/plugins/gui.py Tue Nov 22 22:51:33 2011 +0100 +++ b/src/plugins/gui.py Sat Nov 26 22:52:04 2011 +0300 @@ -62,6 +62,7 @@ self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT, gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) self.installed_plugins_treeview.set_model(self.installed_plugins_model) + self.installed_plugins_treeview.set_rules_hint(True) renderer = gtk.CellRendererText() col = gtk.TreeViewColumn(_('Plugin'), renderer, text=1)

1 0

gajim: print and ignore exceptions raised in an event handler.
by Yann Leboulanger 22 Nov '11

22 Nov '11

changeset 476d6876f5fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=476d6876f5fb description: print and ignore exceptions raised in an event handler. diffstat: src/common/ged.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 8491c04c2a1f -r 476d6876f5fb src/common/ged.py --- a/src/common/ged.py Tue Nov 22 20:08:08 2011 +0100 +++ b/src/common/ged.py Tue Nov 22 22:51:33 2011 +0100 @@ -25,6 +25,8 @@ :license: GPL ''' +import traceback + import logging log = logging.getLogger('gajim.c.ged') @@ -85,5 +87,10 @@ log.debug('%s\nArgs: %s'%(event_name, str(args))) if event_name in self.handlers: for priority, handler in self.handlers[event_name]: - if handler(*args, **kwargs): - return True + try: + if handler(*args, **kwargs): + return True + except Exception, e: + log.error('Error while running an even handler: %s' % \ + handler) + traceback.print_exc()

1 0

gajim: add some missing import
by Yann Leboulanger 22 Nov '11

22 Nov '11

changeset 8491c04c2a1f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8491c04c2a1f description: add some missing import diffstat: src/common/jingle_rtp.py | 1 + src/common/protocol/bytestream.py | 2 +- src/config.py | 1 + src/gui_interface.py | 2 +- src/session.py | 3 ++- 5 files changed, 6 insertions(+), 3 deletions(-) diffs (59 lines): diff -r 83d31be7fe16 -r 8491c04c2a1f src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Nov 22 19:25:15 2011 +0100 +++ b/src/common/jingle_rtp.py Tue Nov 22 20:08:08 2011 +0100 @@ -28,6 +28,7 @@ from jingle_transport import JingleTransportICEUDP from jingle_content import contents, JingleContent, JingleContentSetupException +from connection_handlers_events import InformationEvent import logging diff -r 83d31be7fe16 -r 8491c04c2a1f src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Nov 22 19:25:15 2011 +0100 +++ b/src/common/protocol/bytestream.py Tue Nov 22 20:08:08 2011 +0100 @@ -38,7 +38,7 @@ from common import helpers from common import dataforms from common.connection_handlers_events import FileRequestReceivedEvent, \ - FileRequestErrorEvent + FileRequestErrorEvent, InformationEvent from common import ged from common.socks5 import Socks5Receiver diff -r 83d31be7fe16 -r 8491c04c2a1f src/config.py --- a/src/config.py Tue Nov 22 19:25:15 2011 +0100 +++ b/src/config.py Tue Nov 22 20:08:08 2011 +0100 @@ -68,6 +68,7 @@ HAS_GST = False from common.exceptions import GajimGeneralException +from common.connection_handlers_events import InformationEvent #---------- PreferencesWindow class -------------# class PreferencesWindow: diff -r 83d31be7fe16 -r 8491c04c2a1f src/gui_interface.py --- a/src/gui_interface.py Tue Nov 22 19:25:15 2011 +0100 +++ b/src/gui_interface.py Tue Nov 22 20:08:08 2011 +0100 @@ -81,7 +81,7 @@ from common import passwords from common import logging_helpers from common.connection_handlers_events import OurShowEvent, \ - FileRequestErrorEvent + FileRequestErrorEvent, InformationEvent from common.connection import Connection import roster_window diff -r 83d31be7fe16 -r 8491c04c2a1f src/session.py --- a/src/session.py Tue Nov 22 19:25:15 2011 +0100 +++ b/src/session.py Tue Nov 22 20:08:08 2011 +0100 @@ -28,7 +28,8 @@ from common import stanza_session from common import contacts from common import ged -from common.connection_handlers_events import ChatstateReceivedEvent +from common.connection_handlers_events import ChatstateReceivedEvent, \ + InformationEvent import common.xmpp

1 0

gajim: handle ERROR and INFORMATION events through NEC
by Yann Leboulanger 22 Nov '11

22 Nov '11

changeset 83d31be7fe16 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=83d31be7fe16 description: handle ERROR and INFORMATION events through NEC diffstat: src/common/connection.py | 48 ++++++++++++++++++----------- src/common/connection_handlers.py | 22 ++++++++----- src/common/connection_handlers_events.py | 28 ++++++++++++----- src/common/jingle_rtp.py | 20 ++++++----- src/common/protocol/bytestream.py | 5 +- src/common/zeroconf/connection_zeroconf.py | 5 +- src/config.py | 9 +++-- src/gui_interface.py | 22 ++++++++----- src/session.py | 8 +++- 9 files changed, 103 insertions(+), 64 deletions(-) diffs (truncated from 373 to 300 lines): diff -r 8f1155cc30d5 -r 83d31be7fe16 src/common/connection.py --- a/src/common/connection.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/common/connection.py Tue Nov 22 19:25:15 2011 +0100 @@ -256,9 +256,10 @@ try: jid = self.check_jid(jid) except helpers.InvalidFormat: - self.dispatch('ERROR', (_('Invalid Jabber ID'), - _('It is not possible to send a message to %s, this JID is not ' - 'valid.') % jid)) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Invalid Jabber ID'), sec_txt=_( + 'It is not possible to send a message to %s, this JID is not ' + 'valid.') % jid)) return if msg and not xhtml and gajim.config.get( @@ -912,9 +913,10 @@ self.disconnect(on_purpose=True) return if not data[1]: # wrong answer - self.dispatch('ERROR', (_('Invalid answer'), - _('Transport %(name)s answered wrongly to register ' - 'request: %(error)s') % {'name': data[0], + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=_('Invalid answer'), + sec_txt=_('Transport %(name)s answered wrongly to ' + 'register request: %(error)s') % {'name': data[0], 'error': data[3]})) return is_form = data[2] @@ -1195,7 +1197,9 @@ key = common.xmpp.NS_XMPP_STREAMS + ' ' + self.streamError if key in common.xmpp.ERRORS: sectxt2 = _('Server replied: %s') % common.xmpp.ERRORS[key][2] - self.dispatch('ERROR', (pritxt, '%s\n%s' % (sectxt2, sectxt))) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=pritxt, + sec_txt='%s\n%s' % (sectxt2, sectxt))) return # show popup gajim.nec.push_incoming_event(ConnectionLostEvent(None, @@ -1363,9 +1367,10 @@ self.disconnect(on_purpose = True) gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) - self.dispatch('ERROR', (_('Authentication failed with "%s"') % \ - self._hostname, - _('Please check your login and password for correctness.'))) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Authentication failed with "%s"') % \ + self._hostname, sec_txt=_('Please check your login and password' + 'for correctness.'))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None @@ -1438,10 +1443,11 @@ gajim.nec.push_incoming_event(PrivacyListRemovedEvent(None, conn=self, list_name=privacy_list)) else: - self.dispatch('ERROR', (_('Error while removing privacy list'), - _('Privacy list %s has not been removed. It is maybe active in ' - 'one of your connected resources. Deactivate it and try ' - 'again.') % privacy_list)) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Error while removing privacy ' + 'list'), sec_txt=_('Privacy list %s has not been removed. ' + 'It is maybe active in one of your connected resources. ' + 'Deactivate it and tryagain.') % privacy_list)) common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list, _on_del_privacy_list_result) @@ -1516,8 +1522,10 @@ if not self.privacy_rules_supported: gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show=gajim.SHOW_LIST[self.connected])) - self.dispatch('ERROR', (_('Invisibility not supported'), - _('Account %s doesn\'t support invisibility.') % self.name)) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Invisibility not supported', + sec_txt=_('Account %s doesn\'t support invisibility.') % \ + self.name))) return # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 @@ -2522,9 +2530,11 @@ if result.getID() == id_: on_remove_success(True) return - self.dispatch('ERROR', (_('Unregister failed'), - _('Unregistration with server %(server)s failed: ' - '%(error)s') % {'server': hostname, + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', + pri_txt=_('Unregister failed'), + sec_txt=_('Unregistration with server %(server)s ' + 'failed: %(error)s') % {'server': hostname, 'error': result.getErrorMsg()})) on_remove_success(False) con.RegisterHandler('iq', _on_answer, 'result', system=True) diff -r 8f1155cc30d5 -r 83d31be7fe16 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/common/connection_handlers.py Tue Nov 22 19:25:15 2011 +0100 @@ -125,8 +125,9 @@ def _agent_registered_cb(self, con, resp, agent): if resp.getType() == 'result': - self.dispatch('INFORMATION', (_('Registration succeeded'), - _('Registration with agent %s succeeded') % agent)) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='info', pri_txt=_('Registration succeeded'), sec_txt=_( + 'Registration with agent %s succeeded') % agent)) self.request_subscription(agent, auto_auth=True) self.agent_registrations[agent]['roster_push'] = True if self.agent_registrations[agent]['sub_received']: @@ -134,9 +135,10 @@ p = self.add_sha(p) self.connection.send(p) if resp.getType() == 'error': - self.dispatch('ERROR', (_('Registration failed'), _('Registration ' - 'with agent %(agent)s failed with error %(error)s: ' - '%(error_msg)s') % {'agent': agent, 'error': resp.getError(), + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Registration failed'), sec_txt=_( + 'Registration with agent %(agent)s failed with error %(error)s:' + ' %(error_msg)s') % {'agent': agent, 'error': resp.getError(), 'error_msg': resp.getErrorMsg()})) def register_agent(self, agent, info, is_form=False): @@ -328,7 +330,8 @@ fil.write(str(card)) fil.close() except IOError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Disk Write Error'), sec_txt=str(e))) def get_cached_vcard(self, fjid, is_fake_jid=False): """ @@ -564,9 +567,10 @@ self.disconnect(on_purpose=True) gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) - self.dispatch('ERROR', (_('Invisibility not supported'), - _('Account %s doesn\'t support invisibility.') % \ - self.name)) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=_('Invisibility not ' + 'supported'), sec_txt=_('Account %s doesn\'t support ' + 'invisibility.') % self.name)) return # Ask metacontacts before roster self.get_metacontacts() diff -r 8f1155cc30d5 -r 83d31be7fe16 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/common/connection_handlers_events.py Tue Nov 22 19:25:15 2011 +0100 @@ -997,8 +997,9 @@ try: self.get_jid_resource() except helpers.InvalidFormat: - self.conn.dispatch('ERROR', (_('Invalid Jabber ID'), - _('A message from a non-valid JID arrived, it has been ' + gajim.nec.push_incoming_event(InformationEvent(None, conn=self.conn, + level='error', pri_txt=_('Invalid Jabber ID'), + sec_txt=_('A message from a non-valid JID arrived, it has been ' 'ignored.'))) return @@ -1027,9 +1028,11 @@ try: self.get_jid_resource() except helpers.InvalidFormat: - self.conn.dispatch('ERROR', (_('Invalid Jabber ID'), - _('A message from a non-valid JID arrived, it has been ' - 'ignored.'))) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self.conn, level='error', + pri_txt=_('Invalid Jabber ID'), + sec_txt=_('A message from a non-valid JID arrived, it ' + 'has been ignored.'))) return self.forwarded = True elif sent_tag: @@ -1041,9 +1044,11 @@ try: self.get_jid_resource() except helpers.InvalidFormat: - self.conn.dispatch('ERROR', (_('Invalid Jabber ID'), - _('A message from a non-valid JID arrived, it has been ' - 'ignored.'))) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self.conn, level='error', + pri_txt=_('Invalid Jabber ID'), + sec_txt=_('A message from a non-valid JID arrived, it ' + 'has been ignored.'))) return self.forwarded = True self.sent = True @@ -2268,3 +2273,10 @@ class ClientCertPassphraseEvent(nec.NetworkIncomingEvent): name = 'client-cert-passphrase' base_network_events = [] + +class InformationEvent(nec.NetworkIncomingEvent): + name = 'information' + base_network_events = [] + + def init(self): + self.popup = True diff -r 8f1155cc30d5 -r 83d31be7fe16 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/common/jingle_rtp.py Tue Nov 22 19:25:15 2011 +0100 @@ -103,11 +103,12 @@ bin = gst.parse_bin_from_description(pipeline, True) return bin except GError, error_str: - self.session.connection.dispatch('ERROR', - (_("%s configuration error") % text.capitalize(), - _("Couldn't setup %s. Check your configuration.\n\n" - "Pipeline was:\n%s\n\n" - "Error was:\n%s") % (text, pipeline, error_str))) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self.session.connection, level='error', + pri_txt=_('%s configuration error') % text.capitalize(), + sec_txt=_("Couldn't setup %s. Check your configuration.\n\n" + "Pipeline was:\n%s\n\nError was:\n%s") % (text, pipeline, + error_str))) raise JingleContentSetupException def add_remote_candidates(self, candidates): @@ -201,10 +202,11 @@ # or raise an error, Jingle way # or maybe one-sided stream? if not self.stream_failed_once: - self.session.connection.dispatch('ERROR', - (_("GStreamer error"), - _("Error: %s\nDebug: %s" % (message.structure['gerror'], - message.structure['debug'])))) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self.session.connection, level='error', + pri_txt=_('GStreamer error'), sec_txt=_('Error: %s\nDebug: ' + '%s' % (message.structure['gerror'], + message.structure['debug'])))) sink_pad = self.p2psession.get_property('sink-pad') diff -r 8f1155cc30d5 -r 83d31be7fe16 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/common/protocol/bytestream.py Tue Nov 22 19:25:15 2011 +0100 @@ -374,8 +374,9 @@ port = gajim.config.get('file_transfers_port') self._add_streamhosts_to_query(query, sender, port, my_ips) except socket.gaierror: - self.dispatch('ERROR', (_('Wrong host'), - _('Invalid local address? :-O'))) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Wrong host'), + sec_txt=_('Invalid local address? :-O'))) def _add_addiditional_streamhosts_to_query(self, query, file_props): sender = file_props['sender'] diff -r 8f1155cc30d5 -r 83d31be7fe16 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Tue Nov 22 19:25:15 2011 +0100 @@ -189,8 +189,9 @@ alt_name=alt_name)) def _on_error(self, message): - self.dispatch('ERROR', (_('Avahi error'), - _('%s\nLink-local messaging might not work properly.') % message)) + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Avahi error'), sec_txt=_('%s\nLink-local ' + 'messaging might not work properly.') % message)) def connect(self, show='online', msg=''): self.get_config_values_or_default() diff -r 8f1155cc30d5 -r 83d31be7fe16 src/config.py --- a/src/config.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/config.py Tue Nov 22 19:25:15 2011 +0100 @@ -2575,10 +2575,11 @@ return if gajim.ZEROCONF_ACC_NAME in gajim.connections and not \ gajim.connections[gajim.ZEROCONF_ACC_NAME].is_zeroconf: - gajim.connections[gajim.ZEROCONF_ACC_NAME].dispatch('ERROR', - (_('Account Local already exists.'), - _('Please rename or remove it before enabling link-local messaging' - '.'))) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=gajim.connections[gajim.ZEROCONF_ACC_NAME], + level='error', pri_txt=_('Account Local already exists.'), + sec_txt=_('Please rename or remove it before enabling ' + 'link-local messaging.'))) return if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') \ diff -r 8f1155cc30d5 -r 83d31be7fe16 src/gui_interface.py --- a/src/gui_interface.py Mon Nov 21 23:51:14 2011 +0100 +++ b/src/gui_interface.py Tue Nov 22 19:25:15 2011 +0100 @@ -105,10 +105,6 @@ ### Methods handling events from connection

1 0

gajim: fix class name
by Yann Leboulanger 21 Nov '11

21 Nov '11

changeset 8f1155cc30d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8f1155cc30d5 description: fix class name diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3673d343ae76 -r 8f1155cc30d5 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 21 16:30:28 2011 +0100 +++ b/src/common/connection_handlers_events.py Mon Nov 21 23:51:14 2011 +0100 @@ -2236,7 +2236,7 @@ self.handle_incoming_pres_event(self.base_event) return True -class MessageOutgoingEvent(nec.NetworkIncomingEvent): +class MessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'message-outgoing' base_network_events = []

1 0

gajim: re-add a Makefile.am in plugins dir that includes nothing...
by Yann Leboulanger 21 Nov '11

21 Nov '11

changeset 3673d343ae76 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3673d343ae76 description: re-add a Makefile.am in plugins dir that includes nothing in the generated tarball, but that installs plugins in this directory. diffstat: Makefile.am | 2 +- configure.ac | 1 + plugins/Makefile.am | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diffs (39 lines): diff -r 88229d3332e4 -r 3673d343ae76 Makefile.am --- a/Makefile.am Sat Nov 19 22:19:16 2011 +0100 +++ b/Makefile.am Mon Nov 21 16:30:28 2011 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = src data po icons +SUBDIRS = src data po icons plugins ACLOCAL_AMFLAGS = -I m4 diff -r 88229d3332e4 -r 3673d343ae76 configure.ac --- a/configure.ac Sat Nov 19 22:19:16 2011 +0100 +++ b/configure.ac Mon Nov 21 16:30:28 2011 +0100 @@ -79,6 +79,7 @@ scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in po/Makefile.in + plugins/Makefile ]) AC_OUTPUT echo " diff -r 88229d3332e4 -r 3673d343ae76 plugins/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/Makefile.am Mon Nov 21 16:30:28 2011 +0100 @@ -0,0 +1,15 @@ +INCLUDES = \ + $(PYTHON_INCLUDES) + +gajimpluginsdir = $(gajim_pluginsdir) + +dist_gajimplugins_PYTHON = + +nobase_gajimplugins_DATA = \ + $(srcdir)/*/*.py \ + $(srcdir)/*/manifest.ini \ + $(srcdir)/*/*.ui \ + $(srcdir)/*/*.png + + +MAINTAINERCLEANFILES = Makefile.in

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2011