Commits

commits@gajim.org

17632 discussions

gajim: don't load unactivatable plugins
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 847f5ab1aaff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=847f5ab1aaff description: don't load unactivatable plugins diffstat: src/plugins/gui.py | 9 ++++++--- src/plugins/plugin.py | 1 + src/plugins/pluginmanager.py | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diffs (61 lines): diff -r f3a3b525516e -r 847f5ab1aaff src/plugins/gui.py --- a/src/plugins/gui.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/gui.py Mon Apr 30 21:04:37 2012 +0200 @@ -114,10 +114,13 @@ desc_textbuffer = self.plugin_description_textview.get_buffer() from plugins.plugins_i18n import _ - desc_textbuffer.set_text(_(plugin.description)) + txt = plugin.description + if plugin.available_text: + txt += '\n\n' + _('Warning: %s') % plugin.available_text + desc_textbuffer.set_text(txt) self.plugin_description_textview.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', - gajim.PLUGINS_DIRS[1] in plugin.__path__) + gajim.PLUGINS_DIRS[1] in plugin.__path__) if plugin.config_dialog is None: self.configure_plugin_button.set_property('sensitive', False) else: @@ -145,7 +148,7 @@ for plugin in pm.plugins: self.installed_plugins_model.append([plugin, plugin.name, - plugin.active, plugin.activatable]) + plugin.active and plugin.activatable, plugin.activatable]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): diff -r f3a3b525516e -r 847f5ab1aaff src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/plugin.py Mon Apr 30 21:04:37 2012 +0200 @@ -155,6 +155,7 @@ :type: `plugins.plugin.GajimPluginConfig` ''' self.activatable = True + self.available_text = '' self.load_config() self.config_dialog = GajimPluginConfigDialog(self) self.init() diff -r f3a3b525516e -r 847f5ab1aaff src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/pluginmanager.py Mon Apr 30 21:04:37 2012 +0200 @@ -292,7 +292,7 @@ :param plugin: plugin to be activated :type plugin: class object of `GajimPlugin` subclass ''' - if not plugin.active: + if not plugin.active and plugin.activatable: self._add_gui_extension_points_handlers_from_plugin(plugin) self._handle_all_gui_extension_points_with_plugin(plugin) @@ -374,7 +374,8 @@ def _activate_all_plugins_from_global_config(self): for plugin in self.plugins: - if self._plugin_is_active_in_global_config(plugin): + if self._plugin_is_active_in_global_config(plugin) and \ + plugin.activatable: try: self.activate_plugin(plugin) except GajimPluginActivateException:

1 0

gajim: fix gnomekeyring import
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 14f8ef5dacde in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=14f8ef5dacde description: fix gnomekeyring import diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6aa75f58fbc4 -r 14f8ef5dacde src/common/passwords.py --- a/src/common/passwords.py Mon Apr 30 10:52:12 2012 +0400 +++ b/src/common/passwords.py Mon Apr 30 14:16:04 2012 +0400 @@ -183,7 +183,7 @@ if gajim.config.get('use_gnomekeyring'): global gnomekeyring try: - __import__('gnomekeyring') + gnomekeyring = __import__('gnomekeyring') except ImportError: pass else:

1 0

gajim: ability for plugins to be activatable. True by default, b...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset f3a3b525516e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f3a3b525516e description: ability for plugins to be activatable. True by default, but plugin can be non-activatable is a dep is missing for example. diffstat: src/plugins/gui.py | 13 +++++++------ src/plugins/plugin.py | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diffs (63 lines): diff -r 14f8ef5dacde -r f3a3b525516e src/plugins/gui.py --- a/src/plugins/gui.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/plugins/gui.py Mon Apr 30 00:43:18 2012 +0200 @@ -60,7 +60,7 @@ self.plugin_name_label.set_attributes(attr_list) self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT, - gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) + gobject.TYPE_STRING, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN) self.installed_plugins_treeview.set_model(self.installed_plugins_model) self.installed_plugins_treeview.set_rules_hint(True) @@ -69,9 +69,8 @@ self.installed_plugins_treeview.append_column(col) renderer = gtk.CellRendererToggle() - renderer.set_property('activatable', True) renderer.connect('toggled', self.installed_plugins_toggled_cb) - col = gtk.TreeViewColumn(_('Active'), renderer, active=2) + col = gtk.TreeViewColumn(_('Active'), renderer, active=2, activatable=3) self.installed_plugins_treeview.append_column(col) # connect signal for selection change @@ -146,7 +145,7 @@ for plugin in pm.plugins: self.installed_plugins_model.append([plugin, plugin.name, - plugin.active]) + plugin.active, plugin.activatable]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): @@ -230,7 +229,8 @@ model.remove(model.get_iter((row, 0))) break - iter_ = model.append([plugin, plugin.name, False]) + iter_ = model.append([plugin, plugin.name, False, + plugin.activatable]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) @@ -252,7 +252,8 @@ show_warn_dialog() return model = self.installed_plugins_model - iter_ = model.append([plugin, plugin.name, False]) + iter_ = model.append([plugin, plugin.name, False, + plugin.activatable]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) diff -r 14f8ef5dacde -r f3a3b525516e src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/plugins/plugin.py Mon Apr 30 00:43:18 2012 +0200 @@ -154,6 +154,7 @@ :type: `plugins.plugin.GajimPluginConfig` ''' + self.activatable = True self.load_config() self.config_dialog = GajimPluginConfigDialog(self) self.init()

1 0

gajim: gnomekeyring import will not be delayed
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 6aa75f58fbc4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6aa75f58fbc4 description: gnomekeyring import will not be delayed diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bc8af06950aa -r 6aa75f58fbc4 src/common/passwords.py --- a/src/common/passwords.py Sat Apr 28 22:45:53 2012 +0200 +++ b/src/common/passwords.py Mon Apr 30 10:52:12 2012 +0400 @@ -183,7 +183,7 @@ if gajim.config.get('use_gnomekeyring'): global gnomekeyring try: - import gnomekeyring + __import__('gnomekeyring') except ImportError: pass else:

1 0

gajim: improve roster drawing when we get many presences. Fixes ...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset bc8af06950aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc8af06950aa description: improve roster drawing when we get many presences. Fixes #7125 diffstat: src/roster_window.py | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diffs (71 lines): diff -r 2ecc3bab9323 -r bc8af06950aa src/roster_window.py --- a/src/roster_window.py Sat Apr 28 22:45:17 2012 +0200 +++ b/src/roster_window.py Sat Apr 28 22:45:53 2012 +0200 @@ -1009,7 +1009,7 @@ ### Methods for adding and removing roster window items ################################################################################ - def draw_account(self, account): + def _really_draw_account(self, account): child_iter = self._get_account_iter(account, self.model) if not child_iter: assert False, 'Account iter of %s could not be found.' % account @@ -1073,9 +1073,21 @@ asPixbufIcon() else: self.model[child_iter][C_LOCATION_PIXBUF] = None + + def _really_draw_accounts(self): + for acct in self.accounts_to_draw: + self._really_draw_account(acct) + self.accounts_to_draw = [] return False - def draw_group(self, group, account): + def draw_account(self, account): + if account in self.accounts_to_draw: + return + self.accounts_to_draw.append(account) + if len(self.accounts_to_draw) == 1: + gobject.timeout_add(200, self._really_draw_accounts) + + def _really_draw_group(self, group, account): child_iter = self._get_group_iter(group, account, model=self.model) if not child_iter: # Eg. We redraw groups after we removed a entitiy @@ -1094,8 +1106,23 @@ text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) self.model[child_iter][C_NAME] = text + + def _really_draw_groups(self): + for ag in self.groups_to_draw.values(): + acct = ag['account'] + grp = ag['group'] + self._really_draw_group(grp, acct) + self.groups_to_draw = {} return False + def draw_group(self, group, account): + ag = account + group + if ag in self.groups_to_draw: + return + self.groups_to_draw[ag] = {'group': group, 'account': account} + if len(self.groups_to_draw) == 1: + gobject.timeout_add(200, self._really_draw_groups) + def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, model=self.model) if not child_iters: @@ -6362,6 +6389,11 @@ # it means we are waiting for this number of accounts to disconnect # before quitting self.quit_on_next_offline = -1 + + # groups to draw next time we draw groups. + self.groups_to_draw = {} + # accounts to draw next time we draw accounts. + self.accounts_to_draw = [] # uf_show, img, show, sensitive liststore = gtk.ListStore(str, gtk.Image, str, bool)

1 0

gajim: remove big time consuming and unused function pformat. se...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 2ecc3bab9323 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ecc3bab9323 description: remove big time consuming and unused function pformat. see #7125 diffstat: src/common/nec.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diffs (32 lines): diff -r 8dc22ed1fdae -r 2ecc3bab9323 src/common/nec.py --- a/src/common/nec.py Sat Apr 28 21:39:32 2012 +0200 +++ b/src/common/nec.py Sat Apr 28 22:45:17 2012 +0200 @@ -25,8 +25,6 @@ :license: GPL ''' -from pprint import pformat - #from plugins.helpers import log from common import gajim @@ -158,12 +156,6 @@ for k, v in kwargs.iteritems(): setattr(self, k, v) - def __str__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - - def __repr__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - class NetworkIncomingEvent(NetworkEvent): base_network_events = [] @@ -176,4 +168,4 @@ base_network_events = [] ''' Names of base network events that new event is going to be generated on. - ''' \ No newline at end of file + '''

1 0

gajim: [Aleksey Rybalkin] improve popup notification behaviour
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 3823069dea90 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3823069dea90 description: [Aleksey Rybalkin] improve popup notification behaviour diffstat: src/dialogs.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (29 lines): diff -r 53b548422fc3 -r 3823069dea90 src/dialogs.py --- a/src/dialogs.py Sat Apr 21 23:49:42 2012 +0200 +++ b/src/dialogs.py Mon Apr 23 23:22:12 2012 +0200 @@ -2748,6 +2748,7 @@ self.account = account self.jid = jid self.msg_type = msg_type + self.index = len(gajim.interface.roster.popup_notification_windows) xml = gtkgui_helpers.get_gtk_builder('popup_notification_window.ui') self.window = xml.get_object('popup_notification_window') @@ -2832,12 +2833,15 @@ self.window.destroy() if len(gajim.interface.roster.popup_notification_windows) > 0: - # we want to remove the first window added in the list - gajim.interface.roster.popup_notification_windows.pop(0) + # we want to remove the destroyed window from the list + gajim.interface.roster.popup_notification_windows.pop(self.index) # move the rest of popup windows gajim.interface.roster.popups_notification_height = 0 + current_index = 0 for window_instance in gajim.interface.roster.popup_notification_windows: + window_instance.index = current_index + current_index += 1 window_width, window_height = window_instance.window.get_size() gajim.interface.roster.popups_notification_height += window_height window_instance.window.move(gtk.gdk.screen_width() - window_width,

1 0

gajim: improve Gajim startup. see #7125
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 8dc22ed1fdae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8dc22ed1fdae description: improve Gajim startup. see #7125 diffstat: src/roster_window.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (38 lines): diff -r 3823069dea90 -r 8dc22ed1fdae src/roster_window.py --- a/src/roster_window.py Mon Apr 23 23:22:12 2012 +0200 +++ b/src/roster_window.py Sat Apr 28 21:39:32 2012 +0200 @@ -1375,6 +1375,7 @@ # disable sorting self.model.set_sort_column_id(-2, gtk.SORT_ASCENDING) self.starting = True + self.starting_filtering = True def _after_fill(self): self.starting = False @@ -1392,6 +1393,8 @@ self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(self.modelfilter) self.tree.thaw_child_notify() + self.starting_filtering = False + self.refilter_shown_roster_items() def setup_and_draw_roster(self): """ @@ -1548,6 +1551,8 @@ """ Determine whether iter should be visible in the treeview """ + if self.starting_filtering: + return False type_ = model[titer][C_TYPE] if not type_: return False @@ -6288,6 +6293,8 @@ def __init__(self): self.filtering = False + self.starting = False + self.starting_filtering = False # Number of renderers plugins added self.nb_ext_renderers = 0 # [icon, name, type, jid, account, editable, mood_pixbuf,

1 0

gajim: correctly handle see-other-host (earlier in the connectio...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset dd85d8b743c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd85d8b743c2 description: correctly handle see-other-host (earlier in the connection process). Fixes #7179 diffstat: src/common/connection.py | 5 +++++ src/common/connection_handlers.py | 3 +-- src/common/connection_handlers_events.py | 6 ++++-- src/common/resolver.py | 2 ++ src/common/xmpp/client_nb.py | 11 ++++++++--- src/common/xmpp/dispatcher_nb.py | 3 +++ 6 files changed, 23 insertions(+), 7 deletions(-) diffs (132 lines): diff -r c10af231f45f -r dd85d8b743c2 src/common/connection.py --- a/src/common/connection.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection.py Tue Jun 19 19:19:24 2012 +0200 @@ -1134,6 +1134,10 @@ self._disconnectedReconnCB() def connect_to_next_type(self, retry=False): + if self.redirected: + self.disconnect(on_purpose=True) + self.connect() + return if len(self._connection_types): self._current_type = self._connection_types.pop(0) if self.last_connection: @@ -1194,6 +1198,7 @@ on_connect=self.on_connect_success, on_proxy_failure=self.on_proxy_failure, on_connect_failure=self.connect_to_next_type, + on_stream_error_cb=self._StreamCB, proxy=self._proxy, secure_tuple = secure_tuple) diff -r c10af231f45f -r dd85d8b743c2 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers.py Tue Jun 19 19:19:24 2012 +0200 @@ -1257,6 +1257,7 @@ PrivateStorageRosternotesReceivedEvent) gajim.nec.register_incoming_event(RosternotesReceivedEvent) gajim.nec.register_incoming_event(StreamConflictReceivedEvent) + gajim.nec.register_incoming_event(StreamOtherHostReceivedEvent) gajim.nec.register_incoming_event(MessageReceivedEvent) gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( @@ -2018,8 +2019,6 @@ if obj.conn.name != self.name: return self.redirected = obj.redirected - self.disconnect(on_purpose=True) - self.connect() def _StreamCB(self, con, obj): log.debug('StreamCB') diff -r c10af231f45f -r dd85d8b743c2 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Jun 19 19:19:24 2012 +0200 @@ -680,8 +680,10 @@ base_network_events = ['stream-received'] def generate(self): - other_host = obj.getTag('see-other-host') - if other_host and self.conn.last_connection_type in ('ssl', 'tls'): + self.conn = self.base_event.conn + self.stanza = self.base_event.stanza + other_host = self.stanza.getTag('see-other-host') + if other_host and self.conn._current_type in ('ssl', 'tls'): host = other_host.getData() if ':' in host: host_l = host.split(':', 1) diff -r c10af231f45f -r dd85d8b743c2 src/common/resolver.py --- a/src/common/resolver.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/resolver.py Tue Jun 19 19:19:24 2012 +0200 @@ -63,6 +63,7 @@ self.handlers = {} def resolve(self, host, on_ready, type='srv'): + host = host.lower() log.debug('resolve %s type=%s' % (host, type)) assert(type in ['srv', 'txt']) if not host: @@ -88,6 +89,7 @@ def _on_ready(self, host, type, result_list): # practically it is impossible to be the opposite, but who knows :) + host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) if not self.resolved_hosts.has_key(host+type): self.resolved_hosts[host+type] = result_list diff -r c10af231f45f -r dd85d8b743c2 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/client_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -67,6 +67,7 @@ self.on_connect_failure = None self.proxy = None self.got_features = False + self.got_see_other_host = None self.stream_started = False self.disconnecting = False self.protocol_type = 'XMPP' @@ -138,8 +139,8 @@ self.disconnecting = False def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, - on_proxy_failure=None, proxy=None, secure_tuple=('plain', None, - None)): + on_proxy_failure=None, on_stream_error_cb=None, proxy=None, + secure_tuple=('plain', None, None)): """ Open XMPP connection (open XML streams in both directions) @@ -161,6 +162,7 @@ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure + self.on_stream_error_cb = on_stream_error_cb self.desired_security, self.cacerts, self.mycerts = secure_tuple self.Connection = None self.Port = port @@ -350,7 +352,10 @@ # sometimes <features> are received together with document # attributes and sometimes on next receive... self.Dispatcher.ProcessNonBlocking(data) - if not self.got_features: + if self.got_see_other_host: + log.info('got see-other-host') + self.on_stream_error_cb(self, self.got_see_other_host) + elif not self.got_features: self._xmpp_connect_machine( mode='FAILURE', data='Missing <features> in 1.0 stream') diff -r c10af231f45f -r dd85d8b743c2 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -415,6 +415,9 @@ if name == 'features': self._owner.got_features = True session.Stream.features = stanza + if name == 'error': + if stanza.getTag('see-other-host'): + self._owner.got_see_other_host = stanza xmlns = stanza.getNamespace()

1 0

gajim: current version is 0.15.0.1
by Yann Leboulanger 17 Jun '12

17 Jun '12

changeset c10af231f45f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c10af231f45f description: current version is 0.15.0.1 diffstat: autogen.sh | 7 +------ src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diffs (34 lines): diff -r 0f13f6f2b647 -r c10af231f45f autogen.sh --- a/autogen.sh Sat Jun 16 18:46:21 2012 -0400 +++ b/autogen.sh Sun Jun 17 22:11:17 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15" + gajimversion="0.15.0.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -10,11 +10,6 @@ AM_ARGS="--add-missing --gnu --copy -Wno-portability" CONF_ARGS="" - if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then - . /Library/Frameworks/GTK+.framework/Versions/Current/env - AM_ARGS="${AM_ARGS} --ignore-deps" - CONF_ARGS="${CONF_ARGS} --disable-idle --without-x" - fi echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ diff -r 0f13f6f2b647 -r c10af231f45f src/common/defs.py --- a/src/common/defs.py Sat Jun 16 18:46:21 2012 -0400 +++ b/src/common/defs.py Sun Jun 17 22:11:17 2012 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15' +version = '0.15.0.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=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