Commits

commits@gajim.org

17632 discussions

gajim: split long lines
by Fomin Denis 16 Aug '12

16 Aug '12

changeset 6145dada9635 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6145dada9635 description: split long lines diffstat: src/common/gajim.py | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diffs (43 lines): diff -r 59d9ae148726 -r 6145dada9635 src/common/gajim.py --- a/src/common/gajim.py Sun Aug 12 22:04:20 2012 +0400 +++ b/src/common/gajim.py Thu Aug 16 20:22:29 2012 +0400 @@ -90,14 +90,19 @@ transport_type = {} # list the type of transport last_message_time = {} # list of time of the latest incomming message - # {acct1: {jid1: time1, jid2: time2}, } -encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..} + # {acct1: {jid1: time1, jid2: time2}, } +encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..} contacts = LegacyContactsAPI() -gc_connected = {} # tell if we are connected to the room or not {acct: {room_jid: True}} -gc_passwords = {} # list of the pass required to enter a room {room_jid: password} -automatic_rooms = {} # list of rooms that must be automaticaly configured and for which we have a list of invities {account: {room_jid: {'invities': []}}} -new_room_nick = None # if it's != None, use this nick instead of asking for a new nickname when there is a conflict. +gc_connected = {} # tell if we are connected to the room or not + # {acct: {room_jid: True}} +gc_passwords = {} # list of the pass required to enter a room + # {room_jid: password} +automatic_rooms = {} # list of rooms that must be automaticaly configured + # and for which we have a list of invities + #{account: {room_jid: {'invities': []}}} +new_room_nick = None # if it's != None, use this nick instead of asking for + # a new nickname when there is a conflict. groups = {} # list of groups newly_added = {} # list of contacts that has just signed in @@ -204,9 +209,10 @@ xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER, xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6', 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, - xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', - 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, - xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX, xmpp.NS_SECLABEL] + xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, + 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, + xmpp.NS_SSN, xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, + xmpp.NS_ROSTERX, xmpp.NS_SECLABEL] # Optional features gajim supports per account gajim_optional_features = {}

1 0

gajim: plugin system. add plugin icon support
by Fomin Denis 16 Aug '12

16 Aug '12

changeset b4aae367188b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b4aae367188b description: plugin system. add plugin icon support diffstat: src/plugins/gui.py | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diffs (89 lines): diff -r ee8ea17504e2 -r b4aae367188b src/plugins/gui.py --- a/src/plugins/gui.py Thu Aug 16 16:56:02 2012 +0400 +++ b/src/plugins/gui.py Thu Aug 16 17:58:00 2012 +0400 @@ -27,7 +27,7 @@ __all__ = ['PluginsWindow'] import pango -import gtk, gobject +import gtk, gobject, os import gtkgui_helpers from dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog @@ -69,12 +69,18 @@ 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_BOOLEAN) + gobject.TYPE_STRING, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN, + gtk.gdk.Pixbuf) 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=NAME) + col = gtk.TreeViewColumn(_('Plugin'))#, renderer, text=NAME) + cell = gtk.CellRendererPixbuf() + col.pack_start(cell, False) + col.add_attribute(cell, 'pixbuf', ICON) + col.pack_start(renderer, True) + col.add_attribute(renderer, 'text', NAME) self.installed_plugins_treeview.append_column(col) renderer = gtk.CellRendererToggle() @@ -83,6 +89,10 @@ activatable=ACTIVATABLE) self.installed_plugins_treeview.append_column(col) + icon = gtk.Image() + self.def_icon = icon.render_icon(gtk.STOCK_PREFERENCES, + gtk.ICON_SIZE_MENU) + # connect signal for selection change selection = self.installed_plugins_treeview.get_selection() selection.connect('changed', @@ -102,6 +112,7 @@ self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_plugins_notebook_switch_page(self, widget, page, page_num): gobject.idle_add(self.xml.get_object('close_button').grab_focus) @@ -162,8 +173,17 @@ self.installed_plugins_model.set_sort_column_id(1, gtk.SORT_ASCENDING) for plugin in pm.plugins: + icon = self.get_plugin_icon(plugin) self.installed_plugins_model.append([plugin, plugin.name, - plugin.active and plugin.activatable, plugin.activatable]) + plugin.active and plugin.activatable, plugin.activatable, icon]) + + def get_plugin_icon(self, plugin): + icon_file = os.path.join(plugin.__path__, os.path.split( + plugin.__path__)[1]) + '.png' + icon = self.def_icon + if os.path.isfile(icon_file): + icon = gtk.gdk.pixbuf_new_from_file_at_size(icon_file, 16, 16) + return icon @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): @@ -249,7 +269,7 @@ break iter_ = model.append([plugin, plugin.name, False, - plugin.activatable]) + plugin.activatable, self.get_plugin_icon(plugin)]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) @@ -272,7 +292,7 @@ return model = self.installed_plugins_model iter_ = model.append([plugin, plugin.name, False, - plugin.activatable]) + plugin.activatable], self.get_plugin_icon(plugin)) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_)

1 0

gajim: coding style
by Fomin Denis 16 Aug '12

16 Aug '12

changeset ee8ea17504e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ee8ea17504e2 description: coding style diffstat: src/plugins/gui.py | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diffs (105 lines): diff -r fe49adb8ec1c -r ee8ea17504e2 src/plugins/gui.py --- a/src/plugins/gui.py Tue Aug 14 22:36:16 2012 +0400 +++ b/src/plugins/gui.py Thu Aug 16 16:56:02 2012 +0400 @@ -36,6 +36,15 @@ from plugins.helpers import GajimPluginActivateException from common.exceptions import PluginsystemError +( +PLUGIN, +NAME, +ACTIVE, +ACTIVATABLE, +ICON, +) = range(5) + + class PluginsWindow(object): '''Class for Plugins window''' @@ -65,12 +74,13 @@ self.installed_plugins_treeview.set_rules_hint(True) renderer = gtk.CellRendererText() - col = gtk.TreeViewColumn(_('Plugin'), renderer, text=1) + col = gtk.TreeViewColumn(_('Plugin'), renderer, text=NAME) self.installed_plugins_treeview.append_column(col) renderer = gtk.CellRendererToggle() renderer.connect('toggled', self.installed_plugins_toggled_cb) - col = gtk.TreeViewColumn(_('Active'), renderer, active=2, activatable=3) + col = gtk.TreeViewColumn(_('Active'), renderer, active=ACTIVE, + activatable=ACTIVATABLE) self.installed_plugins_treeview.append_column(col) # connect signal for selection change @@ -99,9 +109,9 @@ def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected() if iter: - plugin = model.get_value(iter, 0) - plugin_name = model.get_value(iter, 1) - is_active = model.get_value(iter, 2) + plugin = model.get_value(iter, PLUGIN) + plugin_name = model.get_value(iter, NAME) + is_active = model.get_value(iter, ACTIVE) self._display_installed_plugin_info(plugin) else: @@ -157,8 +167,8 @@ @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): - is_active = self.installed_plugins_model[path][2] - plugin = self.installed_plugins_model[path][0] + is_active = self.installed_plugins_model[path][ACTIVE] + plugin = self.installed_plugins_model[path][PLUGIN] if is_active: gajim.plugin_manager.deactivate_plugin(plugin) @@ -170,7 +180,7 @@ transient_for=self.window) return - self.installed_plugins_model[path][2] = not is_active + self.installed_plugins_model[path][ACTIVE] = not is_active @log_calls('PluginsWindow') def on_plugins_window_destroy(self, widget): @@ -187,9 +197,9 @@ selection = self.installed_plugins_treeview.get_selection() model, iter = selection.get_selected() if iter: - plugin = model.get_value(iter, 0) - plugin_name = model.get_value(iter, 1) - is_active = model.get_value(iter, 2) + plugin = model.get_value(iter, PLUGIN) + plugin_name = model.get_value(iter, NAME) + is_active = model.get_value(iter, ACTIVE) result = plugin.config_dialog.run(self.window) @@ -205,9 +215,9 @@ selection = self.installed_plugins_treeview.get_selection() model, iter = selection.get_selected() if iter: - plugin = model.get_value(iter, 0) - plugin_name = model.get_value(iter, 1).decode('utf-8') - is_active = model.get_value(iter, 2) + plugin = model.get_value(iter, PLUGIN) + plugin_name = model.get_value(iter, NAME).decode('utf-8') + is_active = model.get_value(iter, ACTIVE) try: gajim.plugin_manager.remove_plugin(plugin) except PluginsystemError, e: @@ -234,8 +244,8 @@ model = self.installed_plugins_model for row in xrange(len(model)): - if plugin == model[row][0]: - model.remove(model.get_iter((row, 0))) + if plugin == model[row][PLUGIN]: + model.remove(model.get_iter((row, PLUGIN))) break iter_ = model.append([plugin, plugin.name, False,

1 0

gajim: [Darlan and I].added the ability to restore the old tray ...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset fe49adb8ec1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fe49adb8ec1c description: [Darlan and I].added the ability to restore the old tray icon (envelope).'trayicon_blink' in the ACE. Fixes #7176 diffstat: src/common/config.py | 1 + src/statusicon.py | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diffs (60 lines): diff -r d0cfa7938e57 -r fe49adb8ec1c src/common/config.py --- a/src/common/config.py Sun Aug 12 22:04:20 2012 +0400 +++ b/src/common/config.py Tue Aug 14 22:36:16 2012 +0400 @@ -207,6 +207,7 @@ 'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.')], 'notify_on_all_muc_messages': [opt_bool, False], 'trayicon_notification_on_events': [opt_bool, True, _('Notify of events in the notification area.')], + 'trayicon_blink': [opt_bool, True, _('If False, Gajim will display a static event icon instead of the blinking status icon in the notification area when notifying on event.')], 'last_save_dir': [opt_str, ''], 'last_send_dir': [opt_str, ''], 'last_emoticons_dir': [opt_str, ''], diff -r d0cfa7938e57 -r fe49adb8ec1c src/statusicon.py --- a/src/statusicon.py Sun Aug 12 22:04:20 2012 +0400 +++ b/src/statusicon.py Tue Aug 14 22:36:16 2012 +0400 @@ -129,13 +129,28 @@ """ Apart from image, we also update tooltip text here """ + def really_set_img(): + if image.get_storage_type() == gtk.IMAGE_PIXBUF: + self.status_icon.set_from_pixbuf(image.get_pixbuf()) + # FIXME: oops they forgot to support GIF animation? + # or they were lazy to get it to work under Windows! WTF! + elif image.get_storage_type() == gtk.IMAGE_ANIMATION: + self.status_icon.set_from_pixbuf( + image.get_animation().get_static_image()) + # self.status_icon.set_from_animation(image.get_animation()) + if not gajim.interface.systray_enabled: return if gajim.config.get('trayicon') == 'always': self.status_icon.set_visible(True) if gajim.events.get_nb_systray_events(): self.status_icon.set_visible(True) - self.status_icon.set_blinking(True) + if gajim.config.get('trayicon_blink'): + self.status_icon.set_blinking(True) + else: + image = gtkgui_helpers.load_icon('event') + really_set_img() + return else: if gajim.config.get('trayicon') == 'on_event': self.status_icon.set_visible(False) @@ -143,14 +158,7 @@ image = gajim.interface.jabber_state_images[self.statusicon_size][ self.status] - if image.get_storage_type() == gtk.IMAGE_PIXBUF: - self.status_icon.set_from_pixbuf(image.get_pixbuf()) - # FIXME: oops they forgot to support GIF animation? - # or they were lazy to get it to work under Windows! WTF! - elif image.get_storage_type() == gtk.IMAGE_ANIMATION: - self.status_icon.set_from_pixbuf( - image.get_animation().get_static_image()) - # self.img_tray.set_from_animation(image.get_animation()) + really_set_img() def change_status(self, global_status): """

1 0

gajim: Fix russian translation
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 59d9ae148726 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59d9ae148726 description: Fix russian translation diffstat: po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 68114c3db74e -r 59d9ae148726 po/ru.po --- a/po/ru.po Sun Aug 12 11:24:22 2012 +0400 +++ b/po/ru.po Sun Aug 12 22:04:20 2012 +0400 @@ -9983,7 +9983,7 @@ #: ../src/plugins/gui.py:162 msgid "Plugin failed" -msgstr "Неудачный модуль" +msgstr "Ошибка в модуле" #: ../src/plugins/gui.py:206 msgid "Unable to properly remove the plugin"

1 0

gajim: remove command_system modules from demandimport.ignore
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 68114c3db74e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=68114c3db74e description: remove command_system modules from demandimport.ignore diffstat: src/chat_control.py | 19 ++++++++++++++----- src/gajim.py | 4 +--- 2 files changed, 15 insertions(+), 8 deletions(-) diffs (64 lines): diff -r a93e2a768a9f -r 68114c3db74e src/chat_control.py --- a/src/chat_control.py Sun Aug 12 10:33:41 2012 +0400 +++ b/src/chat_control.py Sun Aug 12 11:24:22 2012 +0400 @@ -62,8 +62,8 @@ # Here we load the module with the standard commands, so they are being detected # and dispatched. -import command_system.implementation.standard -import command_system.implementation.execute +from command_system.implementation.standard import StandardChatCommands +from command_system.implementation.execute import Execute, Show try: import gtkspell @@ -81,7 +81,15 @@ ##!/bin/sh #LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) #echo "{_('en'):'en'",$LANG"}" -langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} +langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', + _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', + _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', + _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', + _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', + _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', + _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', + _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', + _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} if gajim.config.get('use_speller') and HAS_GTK_SPELL: # loop removing non-existent dictionaries @@ -2311,7 +2319,7 @@ else: displaymarking = None self.print_conversation(message, self.contact.jid, encrypted=encrypted, - xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) + xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, composing_xep=composing_xep, @@ -2926,7 +2934,8 @@ except exceptions.DatabaseMalformed: import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or \ + remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message diff -r a93e2a768a9f -r 68114c3db74e src/gajim.py --- a/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 +++ b/src/gajim.py Sun Aug 12 11:24:22 2012 +0400 @@ -65,9 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', - 'logging.NullHandler', 'dbus.service', - 'command_system.implementation.standard', - 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', + 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', 'Crypto.PublicKey']

1 0

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

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