Commits August 2012

commits@gajim.org

3 participants
152 discussions

gajim: remove imort dbus.glib to remove a warning
by Yann Leboulanger 11 Aug '12

11 Aug '12

changeset 10a73406c098 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=10a73406c098 description: remove imort dbus.glib to remove a warning diffstat: plugins/dbus_plugin/plugin.py | 1 - src/common/dbus_support.py | 3 ++- src/common/location_listener.py | 1 - src/common/zeroconf/zeroconf_avahi.py | 1 - src/music_track_listener.py | 1 - src/network_manager_listener.py | 1 - src/notify.py | 1 - src/remote_control.py | 1 - src/upower_listener.py | 3 +-- 9 files changed, 3 insertions(+), 10 deletions(-) diffs (108 lines): diff -r 7af7ec865838 -r 10a73406c098 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Sat Aug 11 22:34:44 2012 +0200 +++ b/plugins/dbus_plugin/plugin.py Sat Aug 11 22:46:39 2012 +0200 @@ -48,7 +48,6 @@ SERVICE = 'org.gajim.dbusplugin' import dbus.service - import dbus.glib # type mapping # in most cases it is a utf-8 string diff -r 7af7ec865838 -r 10a73406c098 src/common/dbus_support.py --- a/src/common/dbus_support.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/dbus_support.py Sat Aug 11 22:46:39 2012 +0200 @@ -33,7 +33,8 @@ try: import dbus - import dbus.glib + from dbus.mainloop.glib import DBusGMainLoop + DBusGMainLoop(set_as_default=True) except ImportError: supported = False if not os.name == 'nt': # only say that to non Windows users diff -r 7af7ec865838 -r 10a73406c098 src/common/location_listener.py --- a/src/common/location_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/location_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -25,7 +25,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib class LocationListener: _instance = None diff -r 7af7ec865838 -r 10a73406c098 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 22:46:39 2012 +0200 @@ -21,7 +21,6 @@ log = logging.getLogger('gajim.c.z.zeroconf_avahi') try: - import dbus.glib import dbus.exceptions except ImportError, e: pass diff -r 7af7ec865838 -r 10a73406c098 src/music_track_listener.py --- a/src/music_track_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/music_track_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -31,7 +31,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib class MusicTrackInfo(object): __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', diff -r 7af7ec865838 -r 10a73406c098 src/network_manager_listener.py --- a/src/network_manager_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/network_manager_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -64,7 +64,6 @@ if dbus_support.supported: import dbus - import dbus.glib try: from common.dbus_support import system_bus diff -r 7af7ec865838 -r 10a73406c098 src/notify.py --- a/src/notify.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/notify.py Sat Aug 11 22:46:39 2012 +0200 @@ -41,7 +41,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib USER_HAS_PYNOTIFY = True # user has pynotify module diff -r 7af7ec865838 -r 10a73406c098 src/remote_control.py --- a/src/remote_control.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/remote_control.py Sat Aug 11 22:46:39 2012 +0200 @@ -43,7 +43,6 @@ import dbus if dbus_support: import dbus.service - import dbus.glib INTERFACE = 'org.gajim.dbus.RemoteInterface' OBJ_PATH = '/org/gajim/dbus/RemoteObject' diff -r 7af7ec865838 -r 10a73406c098 src/upower_listener.py --- a/src/upower_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/upower_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -34,7 +34,6 @@ if dbus_support.supported: import dbus - import dbus.glib try: from common.dbus_support import system_bus @@ -47,4 +46,4 @@ '/org/freedesktop/UPower') supported = True except Exception: - pass \ No newline at end of file + pass

1 0

gajim: Add 'role' and 'affiliate' command to command system.
by Fomin Denis 11 Aug '12

11 Aug '12

changeset e3941cc6b21a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e3941cc6b21a description: Add 'role' and 'affiliate' command to command system. diffstat: src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 24 ++++++++++++++++++++++++ src/command_system/mapping.py | 8 ++++---- 3 files changed, 29 insertions(+), 5 deletions(-) diffs (85 lines): diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Fri Aug 10 10:43:02 2012 +0200 +++ b/src/command_system/implementation/middleware.py Sat Aug 11 14:59:05 2012 +0400 @@ -71,7 +71,7 @@ except CommandError, error: self.echo_error("%s: %s" % (error.name, error.message)) except Exception: - self.echo_error("Error during command execution!") + self.echo_error(_("Error during command execution!")) print_exc() else: self.command_succeeded = True diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Aug 10 10:43:02 2012 +0200 +++ b/src/command_system/implementation/standard.py Sat Aug 11 14:59:05 2012 +0400 @@ -352,6 +352,30 @@ raise CommandError(_("Nickname not found")) self.connection.gc_set_role(self.room_jid, who, 'none', reason or str()) + @command(raw=True) + @doc(_("""Set occupant role in group chat. + Role can be given as one of the following values: + moderator, participant, visitor, none""")) + def role(self, who, role): + if role not in ('moderator', 'participant', 'visitor', 'none'): + raise CommandError(_("Invalid role given")) + if not who in gajim.contacts.get_nick_list(self.account, self.room_jid): + raise CommandError(_("Nickname not found")) + self.connection.gc_set_role(self.room_jid, who, role) + + @command(raw=True) + @doc(_("""Set occupant affiliation in group chat. + Affiliation can be given as one of the following values: + owner, admin, member, outcast, none""")) + def affiliate(self, who, affiliation): + if affiliation not in ('owner', 'admin', 'member', 'outcast', 'none'): + raise CommandError(_("Invalid affiliation given")) + if not who in gajim.contacts.get_nick_list(self.account, self.room_jid): + raise CommandError(_("Nickname not found")) + contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, who) + self.connection.gc_set_affiliation(self.room_jid, contact.jid, + affiliation) + @command @doc(_("Display names of all group chat occupants")) def names(self, verbose=False): diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/mapping.py --- a/src/command_system/mapping.py Fri Aug 10 10:43:02 2012 +0200 +++ b/src/command_system/mapping.py Sat Aug 11 14:59:05 2012 +0400 @@ -162,7 +162,7 @@ try: stopper, (start, end) = args[spec_len - 2] except IndexError: - raise CommandError("Missing arguments", command) + raise CommandError(_("Missing arguments"), command) # The essential point of the whole play. After # boundaries are being determined (supposingly correct) @@ -172,7 +172,7 @@ raw = raw.strip() or None if not raw and not command.empty: - raise CommandError("Missing arguments", command) + raise CommandError(_("Missing arguments"), command) # Discard residual arguments and all of the options as # raw command does not support options and if an option @@ -192,7 +192,7 @@ if command.empty: args.append((None, (0, 0))) else: - raise CommandError("Missing arguments", command) + raise CommandError(_("Missing arguments"), command) # The first stage of transforming options we have got to a format # that can be used to associate them with declared keyword @@ -259,7 +259,7 @@ for arg, (spec_key, spec_value) in zip(overlapped, spec_kwargs): opts.append((spec_key, arg)) else: - raise CommandError("Excessive arguments", command) + raise CommandError(_("Excessive arguments"), command) # Detect every switch and ensure it will not receive any arguments. # Normally this does not happen unless overlapping is enabled.

1 0

gajim: handle see-other-host at different state of connection (a...
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset 42f7ecdf64a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=42f7ecdf64a2 description: handle see-other-host at different state of connection (after authentication). Fixes #7179 diffstat: src/common/connection.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 64e27acebbdd -r 42f7ecdf64a2 src/common/connection.py --- a/src/common/connection.py Fri Aug 10 10:22:09 2012 +0200 +++ b/src/common/connection.py Fri Aug 10 10:43:02 2012 +0200 @@ -850,7 +850,12 @@ # show error dialog self._connection_lost() else: - self.disconnect() + if self.redirected: + self.disconnect(on_purpose=True) + self.connect() + return + else: + self.disconnect() self.on_purpose = False # END disconnectedReconnCB

1 0

gajim: fix var name
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset 64e27acebbdd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64e27acebbdd description: fix var name diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 4c87beb0324c -r 64e27acebbdd src/roster_window.py --- a/src/roster_window.py Fri Aug 10 10:21:01 2012 +0200 +++ b/src/roster_window.py Fri Aug 10 10:22:09 2012 +0200 @@ -2620,8 +2620,8 @@ account, jid) gajim.interface.on_open_chat_window(None, contact, account) - gajim.config.set_per('accounts', acct, 'opened_chat_controls', - '') + gajim.config.set_per('accounts', account, + 'opened_chat_controls', '') gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj):

1 0

gajim: reopen saved opened chat controls only once.
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset 4c87beb0324c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c87beb0324c description: reopen saved opened chat controls only once. diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r ca60dd525823 -r 4c87beb0324c src/roster_window.py --- a/src/roster_window.py Fri Aug 10 08:06:41 2012 +0200 +++ b/src/roster_window.py Fri Aug 10 10:21:01 2012 +0200 @@ -2620,6 +2620,8 @@ account, jid) gajim.interface.on_open_chat_window(None, contact, account) + gajim.config.set_per('accounts', acct, 'opened_chat_controls', + '') gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj):

1 0

gajim: use a "gajim" logger name for gnupg.py. see #7149
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset ca60dd525823 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca60dd525823 description: use a "gajim" logger name for gnupg.py. see #7149 diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 321ef21af2e5 -r ca60dd525823 src/common/gnupg.py --- a/src/common/gnupg.py Thu Aug 09 21:55:35 2012 +0400 +++ b/src/common/gnupg.py Fri Aug 10 08:06:41 2012 +0200 @@ -64,7 +64,7 @@ except NameError: _py3k = True -logger = logging.getLogger(__name__) +logger = logging.getLogger('gajim.c.gnupg') if not logger.handlers: logger.addHandler(NullHandler())

1 0

gajim: typo
by Fomin Denis 09 Aug '12

09 Aug '12

changeset 321ef21af2e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=321ef21af2e5 description: typo diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cb7602bb9c5c -r 321ef21af2e5 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:55:35 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' - for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): + for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]]: pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config()

1 0

gajim: first load the plugins of the user directory. does not l...
by Fomin Denis 09 Aug '12

09 Aug '12

changeset cb7602bb9c5c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb7602bb9c5c description: first load the plugins of the user directory. does not load the module twice. diffstat: src/plugins/pluginmanager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 27b33dd6fe25 -r cb7602bb9c5c src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Aug 05 13:34:35 2012 +0200 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' - for path in gajim.PLUGINS_DIRS: + for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() @@ -433,6 +433,9 @@ elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name + if module_name in sys.modules: + # do not load the module twice + continue file_path += os.path.sep try: module = __import__(module_name)

1 0

gajim: add option to enable / disable the remember opened chats ...
by Yann Leboulanger 05 Aug '12

05 Aug '12

changeset 27b33dd6fe25 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=27b33dd6fe25 description: add option to enable / disable the remember opened chats option. Fixes #7193 diffstat: src/common/config.py | 1 + src/message_window.py | 2 ++ src/roster_window.py | 19 +++++++++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diffs (52 lines): diff -r 7ed0b34c4945 -r 27b33dd6fe25 src/common/config.py --- a/src/common/config.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/common/config.py Sun Aug 05 13:34:35 2012 +0200 @@ -311,6 +311,7 @@ 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')], 'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')], + 'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], }, {}) __options_per_key = { diff -r 7ed0b34c4945 -r 27b33dd6fe25 src/message_window.py --- a/src/message_window.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/message_window.py Sun Aug 05 13:34:35 2012 +0200 @@ -1246,6 +1246,8 @@ mw.new_tab(ctrl) def save_opened_controls(self): + if not gajim.config.get('remember_opened_chat_controls'): + return chat_controls = {} for acct in gajim.connections: chat_controls[acct] = [] diff -r 7ed0b34c4945 -r 27b33dd6fe25 src/roster_window.py --- a/src/roster_window.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/roster_window.py Sun Aug 05 13:34:35 2012 +0200 @@ -2609,14 +2609,17 @@ self.add_account_contacts(obj.conn.name) self.fire_up_unread_messages_events(obj.conn.name) else: - account = obj.conn.name - controls = gajim.config.get_per('accounts', account, - 'opened_chat_controls') - if controls: - for jid in controls.split(','): - contact = gajim.contacts.get_contact_with_highest_priority( - account, jid) - gajim.interface.on_open_chat_window(None, contact, account) + if gajim.config.get('remember_opened_chat_controls'): + account = obj.conn.name + controls = gajim.config.get_per('accounts', account, + 'opened_chat_controls') + if controls: + for jid in controls.split(','): + contact = \ + gajim.contacts.get_contact_with_highest_priority( + account, jid) + gajim.interface.on_open_chat_window(None, contact, + account) gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj):

1 0

gajim: hide invite contacts buttons in zeroconf chat controls. F...
by Yann Leboulanger 04 Aug '12

04 Aug '12

changeset 7ed0b34c4945 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7ed0b34c4945 description: hide invite contacts buttons in zeroconf chat controls. Fixes #7188 diffstat: src/chat_control.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (21 lines): diff -r a6ff4ecd0114 -r 7ed0b34c4945 src/chat_control.py --- a/src/chat_control.py Sat Aug 04 10:51:02 2012 +0200 +++ b/src/chat_control.py Sat Aug 04 17:14:34 2012 +0200 @@ -1744,10 +1744,14 @@ "him or her a file.")) # Convert to GC - if self.contact.supports(NS_MUC): - self._convert_to_gc_button.set_sensitive(True) + if gajim.config.get_per('accounts', self.account, 'is_zeroconf'): + self._convert_to_gc_button.set_no_show_all(True) + self._convert_to_gc_button.hide() else: - self._convert_to_gc_button.set_sensitive(False) + if self.contact.supports(NS_MUC): + self._convert_to_gc_button.set_sensitive(True) + else: + self._convert_to_gc_button.set_sensitive(False) # Information if gajim.account_is_disconnected(self.account):

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 August 2012