Commits August 2012

commits@gajim.org

3 participants
152 discussions

gajim: remove dbus.glib from demandimport.ignore
by Fomin Denis 14 Aug '12

14 Aug '12

changeset a93e2a768a9f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a93e2a768a9f description: remove dbus.glib from demandimport.ignore diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d5d67440d14b -r a93e2a768a9f src/gajim.py --- a/src/gajim.py Sat Aug 11 22:46:39 2012 +0200 +++ b/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 @@ -65,7 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', - 'logging.NullHandler', 'dbus.glib', 'dbus.service', + 'logging.NullHandler', 'dbus.service', 'command_system.implementation.standard', 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',

1 0

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

14 Aug '12

changeset f0700c90c1dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0700c90c1dd 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 5b62751d4930 -r f0700c90c1dd 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 5b62751d4930 -r f0700c90c1dd 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 @@ -347,6 +347,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 5b62751d4930 -r f0700c90c1dd 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: remove imort dbus.glib to remove a warning
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset d5d67440d14b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5d67440d14b description: remove imort dbus.glib to remove a warning diffstat: 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 +-- 8 files changed, 3 insertions(+), 9 deletions(-) diffs (97 lines): diff -r f0700c90c1dd -r d5d67440d14b src/common/dbus_support.py --- a/src/common/dbus_support.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/common/location_listener.py --- a/src/common/location_listener.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/music_track_listener.py --- a/src/music_track_listener.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/network_manager_listener.py --- a/src/network_manager_listener.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/notify.py --- a/src/notify.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/remote_control.py --- a/src/remote_control.py Sat Aug 11 14:59:05 2012 +0400 +++ 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 f0700c90c1dd -r d5d67440d14b src/upower_listener.py --- a/src/upower_listener.py Sat Aug 11 14:59:05 2012 +0400 +++ 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: handle see-other-host at different state of connection (a...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 5b62751d4930 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5b62751d4930 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 09a2941b3132 -r 5b62751d4930 src/common/connection.py --- a/src/common/connection.py Fri Aug 10 08:06:41 2012 +0200 +++ b/src/common/connection.py Fri Aug 10 10:43:02 2012 +0200 @@ -855,7 +855,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: use a "gajim" logger name for gnupg.py. see #7149
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 09a2941b3132 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=09a2941b3132 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 29cea7237598 -r 09a2941b3132 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: first load the plugins of the user directory. does not l...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 2b9665a0d5ed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b9665a0d5ed 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 1ec7b818e2c8 -r 2b9665a0d5ed src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Aug 04 17:14:34 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: typo
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 29cea7237598 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=29cea7237598 description: typo diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2b9665a0d5ed -r 29cea7237598 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: hide invite contacts buttons in zeroconf chat controls. F...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 1ec7b818e2c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ec7b818e2c8 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 0ec91ae95834 -r 1ec7b818e2c8 src/chat_control.py --- a/src/chat_control.py Thu Aug 02 21:52:20 2012 +0400 +++ b/src/chat_control.py Sat Aug 04 17:14:34 2012 +0200 @@ -1735,10 +1735,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

gajim: [Darlan]. fix typo
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 0ec91ae95834 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec91ae95834 description: [Darlan]. fix typo diffstat: src/common/zeroconf/client_zeroconf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4eb2a1c69e3f -r 0ec91ae95834 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sat Jul 28 22:46:11 2012 +0400 +++ b/src/common/zeroconf/client_zeroconf.py Thu Aug 02 21:52:20 2012 +0400 @@ -447,7 +447,7 @@ self._owner.Dispatcher.Event('', DATA_ERROR, ( self.client.to, thread_id)) else: - self._owner.on_not_ok('conenction timeout') + self._owner.on_not_ok('connection timeout') ids[self.fd] = [] self.pollend()

1 0

gajim: [Darlan]. typo
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 4eb2a1c69e3f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4eb2a1c69e3f description: [Darlan]. typo diffstat: src/command_system/implementation/standard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1f8e1c86b81e -r 4eb2a1c69e3f src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Jul 19 22:47:47 2012 +0400 +++ b/src/command_system/implementation/standard.py Sat Jul 28 22:46:11 2012 +0400 @@ -127,7 +127,7 @@ @command(raw=True, empty=True) @doc(_(""" - Set current the status + Set the current status Status can be given as one of the following values: online, away, chat, xa, dnd.

1 0

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

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