Commits September 2010

commits@gajim.org

5 participants
70 discussions

gajim: [Dicson] some error dialogs improvements. Fixes #5930
by Yann Leboulanger 21 Sep '10

21 Sep '10

changeset ac3413a7823b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac3413a7823b description: [Dicson] some error dialogs improvements. Fixes #5930 diffstat: src/plugins/gui.py | 4 ++-- src/plugins/pluginmanager.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 52f59cbaa4fb -r ac3413a7823b src/plugins/gui.py --- a/src/plugins/gui.py Mon Sep 20 11:14:08 2010 +0200 +++ b/src/plugins/gui.py Tue Sep 21 21:44:04 2010 +0200 @@ -195,7 +195,7 @@ gajim.plugin_manager.remove_plugin(plugin) except PluginsystemError, e: WarningDialog(_('Unable to properly remove the plugin'), - str(e)) + str(e), self.window) return model.remove(iter) @@ -237,7 +237,7 @@ _on_plugin_exists(zip_filename) return - WarningDialog(error_text, '"%s"' % zip_filename) + WarningDialog(error_text, '"%s"' % zip_filename, self.window) return if not plugin: show_warn_dialog() diff -r 52f59cbaa4fb -r ac3413a7823b src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Sep 20 11:14:08 2010 +0200 +++ b/src/plugins/pluginmanager.py Tue Sep 21 21:44:04 2010 +0200 @@ -530,7 +530,7 @@ os.unlink(path) return # access is denied or other - raise PluginsystemError(error[1]) + raise PluginsystemError(error[1][1]) if plugin: if plugin.active:

1 0

gajim: [Dicson] install manifest.ini files. Fixes #5927
by Yann Leboulanger 20 Sep '10

20 Sep '10

changeset 52f59cbaa4fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=52f59cbaa4fb description: [Dicson] install manifest.ini files. Fixes #5927 diffstat: plugins/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 2bf18a964b3d -r 52f59cbaa4fb plugins/Makefile.am --- a/plugins/Makefile.am Mon Sep 20 07:08:47 2010 +0200 +++ b/plugins/Makefile.am Mon Sep 20 11:14:08 2010 +0200 @@ -4,6 +4,7 @@ gajimpluginsdir = $(gajim_pluginsdir) nobase_dist_gajimplugins_PYTHON = \ $(srcdir)/*/*.py \ + $(srcdir)/*/manifest.ini \ $(srcdir)/*/*.ui MAINTAINERCLEANFILES = Makefile.in

1 0

gajim: [Dicson] check for manifest file when installing a plugin...
by Yann Leboulanger 20 Sep '10

20 Sep '10

changeset 2bf18a964b3d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2bf18a964b3d description: [Dicson] check for manifest file when installing a plugin. Fixes #5925 diffstat: src/dialogs.py | 9 ++++++--- src/plugins/gui.py | 25 ++++++++++++++++++------- src/plugins/pluginmanager.py | 37 +++++++++++++++++++++++-------------- 3 files changed, 47 insertions(+), 24 deletions(-) diffs (184 lines): diff -r dd8080184b40 -r 2bf18a964b3d src/dialogs.py --- a/src/dialogs.py Sun Sep 19 22:14:43 2010 +0200 +++ b/src/dialogs.py Mon Sep 20 07:08:47 2010 +0200 @@ -1467,12 +1467,15 @@ HIG compliant warning dialog """ - def __init__(self, pritext, sectext=''): + def __init__(self, pritext, sectext='', transient_for=None): HigDialog.__init__(self, None, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, pritext, sectext) self.set_modal(False) - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: - self.set_transient_for(gajim.interface.roster.window) + if transient_for is None and hasattr(gajim.interface, 'roster') and \ + gajim.interface.roster: + transient_for = gajim.interface.roster.window + if transient_for: + self.set_transient_for(transient_for) self.popup() class InformationDialog(HigDialog): diff -r dd8080184b40 -r 2bf18a964b3d src/plugins/gui.py --- a/src/plugins/gui.py Sun Sep 19 22:14:43 2010 +0200 +++ b/src/plugins/gui.py Mon Sep 20 07:08:47 2010 +0200 @@ -30,7 +30,7 @@ import gtk, gobject import gtkgui_helpers -import dialogs +from dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog from common import gajim from plugins.helpers import log_calls, log from common.exceptions import PluginsystemError @@ -194,17 +194,26 @@ try: gajim.plugin_manager.remove_plugin(plugin) except PluginsystemError, e: - dialogs.WarningDialog(_('Unable to properly remove the plugin'), + WarningDialog(_('Unable to properly remove the plugin'), str(e)) return model.remove(iter) @log_calls('PluginsWindow') def on_install_plugin_button_clicked(self, widget): + def show_warn_dialog(): + text = _('Archive is malformed') + dialog = WarningDialog(text, '', transient_for=self.window) + dialog.set_modal(False) + dialog.popup() + def _on_plugin_exists(zip_filename): def on_yes(is_checked): plugin = gajim.plugin_manager.install_from_zip(zip_filename, True) + if not plugin: + show_warn_dialog() + return model = self.installed_plugins_model for row in xrange(len(model)): @@ -216,8 +225,8 @@ sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) - dialogs.YesNoDialog(_('Plugin already exists'), - sectext=_('Overwrite?'), on_response_yes=on_yes) + YesNoDialog(_('Plugin already exists'), sectext=_('Overwrite?'), + on_response_yes=on_yes) def _try_install(zip_filename): try: @@ -228,15 +237,17 @@ _on_plugin_exists(zip_filename) return - dialogs.WarningDialog(error_text, '"%s"' % zip_filename) + WarningDialog(error_text, '"%s"' % zip_filename) return - + if not plugin: + show_warn_dialog() + return model = self.installed_plugins_model iter_ = model.append([plugin, plugin.name, False]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) - self.dialog = dialogs.ArchiveChooserDialog(on_response_ok=_try_install) + self.dialog = ArchiveChooserDialog(on_response_ok=_try_install) class GajimPluginConfigDialog(gtk.Dialog): diff -r dd8080184b40 -r 2bf18a964b3d src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Sep 19 22:14:43 2010 +0200 +++ b/src/plugins/pluginmanager.py Mon Sep 20 07:08:47 2010 +0200 @@ -431,6 +431,12 @@ if module is None: continue + + manifest_path = os.path.join(os.path.dirname(file_path), + 'manifest.ini') + if scan_dirs and (not os.path.isfile(manifest_path)): + continue + log.debug('Attributes processing started') for module_attr_name in [attr_name for attr_name in dir(module) if not (attr_name.startswith('__') or attr_name.endswith('__'))]: @@ -445,11 +451,7 @@ module_attr.__path__ = os.path.abspath( os.path.dirname(file_path)) - manifest_path = os.path.join(module_attr.__path__, - 'manifest.ini') # read metadata from manifest.ini - if not os.path.isfile(manifest_path): - continue conf.readfp(open(manifest_path, 'r')) for option in fields: if conf.get('info', option) is '': @@ -484,6 +486,7 @@ raise PluginsystemError(_('Archive corrupted')) dirs = [] + manifest = None for filename in zip_file.namelist(): if filename.startswith('.') or filename.startswith('/') or \ ('/' not in filename): @@ -491,16 +494,18 @@ raise PluginsystemError(_('Archive is malformed')) if filename.endswith('/') and filename.find('/', 0, -1) < 0: dirs.append(filename) - + if 'manifest.ini' in filename.split('/')[1]: + manifest = True + if not manifest: + return if len(dirs) > 1: - # several directories in the root of the archive raise PluginsystemError(_('Archive is malformed')) base_dir, user_dir = gajim.PLUGINS_DIRS plugin_dir = os.path.join(user_dir, dirs[0]) if os.path.isdir(plugin_dir): - # Plugin already exists + # Plugin dir already exists if not owerwrite: raise PluginsystemError(_('Plugin already exists')) self.remove_plugin(self.get_plugin_by_path(plugin_dir)) @@ -508,7 +513,10 @@ zip_file.extractall(user_dir) zip_file.close() path = os.path.join(user_dir, dirs[0]) - self.add_plugin(self.scan_dir_for_plugins(plugin_dir, False)[0]) + plugins = self.scan_dir_for_plugins(plugin_dir, False) + if not plugins: + return + self.add_plugin(plugins[0]) plugin = self.plugins[-1] return plugin @@ -524,12 +532,13 @@ # access is denied or other raise PluginsystemError(error[1]) - if plugin.active: - self.deactivate_plugin(plugin) - rmtree(plugin.__path__, False, on_error) - self.plugins.remove(plugin) - if self._plugin_has_entry_in_global_config(plugin): - self._remove_plugin_entry_in_global_config(plugin) + if plugin: + if plugin.active: + self.deactivate_plugin(plugin) + rmtree(plugin.__path__, False, on_error) + self.plugins.remove(plugin) + if self._plugin_has_entry_in_global_config(plugin): + self._remove_plugin_entry_in_global_config(plugin) def get_plugin_by_path(self, plugin_dir): for plugin in self.plugins:

1 0

gajim: don't request vcard to full JID but to barr JID
by Yann Leboulanger 19 Sep '10

19 Sep '10

changeset dd8080184b40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd8080184b40 description: don't request vcard to full JID but to barr JID diffstat: src/groupchat_control.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r af5d657d31ec -r dd8080184b40 src/groupchat_control.py --- a/src/groupchat_control.py Sun Sep 19 11:03:25 2010 +0300 +++ b/src/groupchat_control.py Sun Sep 19 22:14:43 2010 +0200 @@ -1444,8 +1444,6 @@ con = gajim.connections[self.account] if gc_c and gc_c.jid: real_jid = gc_c.jid - if gc_c.resource: - real_jid += '/' + gc_c.resource else: real_jid = fake_jid if fake_jid in con.vcard_shas:

1 0

gajim: A better fix for nonexistent plugins directories.
by Alexander Cherniuk 19 Sep '10

19 Sep '10

changeset af5d657d31ec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=af5d657d31ec description: A better fix for nonexistent plugins directories. diffstat: src/plugins/pluginmanager.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (23 lines): diff -r 6f52ce08ca65 -r af5d657d31ec src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Sep 19 10:59:44 2010 +0300 +++ b/src/plugins/pluginmanager.py Sun Sep 19 11:03:25 2010 +0300 @@ -101,9 +101,7 @@ ''' for path in gajim.PLUGINS_DIRS: pc = PluginManager.scan_dir_for_plugins(path) - if pc: - self.add_plugins(pc) - + self.add_plugins(pc) self._activate_all_plugins_from_global_config() @log_calls('PluginManager') @@ -400,7 +398,7 @@ fields = ('name', 'short_name', 'version', 'description', 'authors', 'homepage') if not os.path.isdir(path): - return + return plugins_found dir_list = os.listdir(path)

1 0

gajim: Ignore nonexistent plugins directories
by Alexander Cherniuk 19 Sep '10

19 Sep '10

changeset 6f52ce08ca65 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f52ce08ca65 description: Ignore nonexistent plugins directories diffstat: src/plugins/pluginmanager.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 31eeabc4e14f -r 6f52ce08ca65 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Sep 19 10:41:19 2010 +0300 +++ b/src/plugins/pluginmanager.py Sun Sep 19 10:59:44 2010 +0300 @@ -99,9 +99,10 @@ ''' Registered handlers of GUI extension points. ''' - for path in gajim.PLUGINS_DIRS: - self.add_plugins(PluginManager.scan_dir_for_plugins(path)) + pc = PluginManager.scan_dir_for_plugins(path) + if pc: + self.add_plugins(pc) self._activate_all_plugins_from_global_config()

1 0

gajim: Add missing tooltips. Thanks to Dicson. Fixes #5924.
by Alexander Cherniuk 19 Sep '10

19 Sep '10

changeset 31eeabc4e14f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31eeabc4e14f description: Add missing tooltips. Thanks to Dicson. Fixes #5924. diffstat: data/gui/chat_control.ui | 18 ++++++++++++++++++ data/gui/groupchat_control.ui | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diffs (150 lines): diff -r bc8ab0d09af6 -r 31eeabc4e14f data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sun Sep 19 10:37:40 2010 +0300 +++ b/data/gui/chat_control.ui Sun Sep 19 10:41:19 2010 +0300 @@ -270,6 +270,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -292,6 +294,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -324,6 +328,8 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image9"> @@ -365,6 +371,8 @@ <object class="GtkToggleButton" id="audio_togglebutton"> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Toggle audio session</property> <property name="relief">none</property> <child> <object class="GtkImage" id="audio_image"> @@ -383,6 +391,8 @@ <object class="GtkToggleButton" id="video_togglebutton"> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Toggle video session</property> <property name="relief">none</property> <child> <object class="GtkImage" id="video_image"> @@ -403,6 +413,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -425,6 +437,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show the contact's profile (Ctrl+I)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -447,6 +461,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -480,6 +496,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> diff -r bc8ab0d09af6 -r 31eeabc4e14f data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sun Sep 19 10:37:40 2010 +0300 +++ b/data/gui/groupchat_control.ui Sun Sep 19 10:41:19 2010 +0300 @@ -166,6 +166,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <child> <object class="GtkImage" id="emoticons_button_image"> @@ -193,6 +195,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -224,6 +228,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Change your nickname (Ctrl+N)</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image4"> @@ -246,6 +252,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Change the room's subject (Alt+T)</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image6"> @@ -269,6 +277,8 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Bookmark this room (Ctrl+B)</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image7"> @@ -291,6 +301,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image8"> @@ -323,6 +335,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child>

1 0

gajim: Can not break a string like that.
by Alexander Cherniuk 19 Sep '10

19 Sep '10

changeset bc8ab0d09af6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc8ab0d09af6 description: Can not break a string like that. diffstat: src/plugins/pluginmanager.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r c63e16d05a79 -r bc8ab0d09af6 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Sep 18 23:06:36 2010 +0200 +++ b/src/plugins/pluginmanager.py Sun Sep 19 10:37:40 2010 +0300 @@ -134,8 +134,8 @@ self.plugins.append(plugin) plugin.active = False else: - log.info('Not loading plugin %s v%s from module %s (identified by - short name: %s). Plugin already loaded.' % (plugin.name, + log.info('Not loading plugin %s v%s from module %s (identified by' + ' short name: %s). Plugin already loaded.' % (plugin.name, plugin.version, plugin.__module__, plugin.short_name)) @log_calls('PluginManager')

1 0

gajim: [Dicson] Don't always show Tray icon if "only when pendin...
by Yann Leboulanger 18 Sep '10

18 Sep '10

changeset c63e16d05a79 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c63e16d05a79 description: [Dicson] Don't always show Tray icon if "only when pending events" option is used. Fixes #5921 diffstat: src/config.py | 2 -- src/statusicon.py | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (42 lines): diff -r 1392e6406655 -r c63e16d05a79 src/config.py --- a/src/config.py Sat Sep 18 23:00:43 2010 +0200 +++ b/src/config.py Sat Sep 18 23:06:36 2010 +0200 @@ -847,12 +847,10 @@ gajim.config.set('trayicon', 'on_event') gajim.interface.systray_enabled = True gajim.interface.systray.show_icon() - gajim.interface.systray.set_img() else: gajim.config.set('trayicon', 'always') gajim.interface.systray_enabled = True gajim.interface.systray.show_icon() - gajim.interface.systray.set_img() def on_advanced_notifications_button_clicked(self, widget): dialogs.AdvancedNotificationsWindow() diff -r 1392e6406655 -r c63e16d05a79 src/statusicon.py --- a/src/statusicon.py Sat Sep 18 23:00:43 2010 +0200 +++ b/src/statusicon.py Sat Sep 18 23:06:36 2010 +0200 @@ -97,7 +97,6 @@ self.on_status_icon_size_changed) self.set_img() - self.status_icon.set_visible(True) self.subscribe_events() def on_status_icon_right_clicked(self, widget, event_button, event_time): @@ -131,9 +130,14 @@ """ 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) else: + if gajim.config.get('trayicon') == 'on_event': + self.status_icon.set_visible(False) self.status_icon.set_blinking(False) image = gajim.interface.jabber_state_images[self.statusicon_size][

1 0

gajim: [Dicson] use manifest.ini files in plugins to have a sepa...
by Yann Leboulanger 18 Sep '10

18 Sep '10

changeset 1392e6406655 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1392e6406655 description: [Dicson] use manifest.ini files in plugins to have a separate file for plugin's information. Fixes #5920 diffstat: plugins/acronyms_expander/acronyms_expander.py | 6 - plugins/acronyms_expander/manifest.ini | 9 + plugins/banner_tweaks/manifest.ini | 10 + plugins/banner_tweaks/plugin.py | 9 - plugins/dbus_plugin/manifest.ini | 10 + plugins/dbus_plugin/plugin.py | 7 - plugins/events_dump/manifest.ini | 8 + plugins/events_dump/plugin.py | 6 - plugins/google_translation/manifest.ini | 8 + plugins/google_translation/plugin.py | 6 - plugins/length_notifier/length_notifier.py | 6 - plugins/length_notifier/manifest.ini | 9 + plugins/new_events_example/manifest.ini | 11 + plugins/new_events_example/plugin.py | 6 - plugins/roster_buttons/manifest.ini | 10 + plugins/roster_buttons/plugin.py | 6 - plugins/snarl_notifications/manifest.ini | 11 + plugins/snarl_notifications/plugin.py | 7 - src/plugins/gui.py | 2 +- src/plugins/pluginmanager.py | 215 ++++++++++++------------ 20 files changed, 198 insertions(+), 164 deletions(-) diffs (truncated from 648 to 300 lines): diff -r af670138408f -r 1392e6406655 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/acronyms_expander/acronyms_expander.py Sat Sep 18 23:00:43 2010 +0200 @@ -33,12 +33,6 @@ from plugins.helpers import log, log_calls class AcronymsExpanderPlugin(GajimPlugin): - name = u'Acronyms Expander' - short_name = u'acronyms_expander' - version = u'0.1' - description = u'''Replaces acronyms (or other strings) with given expansions/substitutes.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('AcronymsExpanderPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/acronyms_expander/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,9 @@ +[info] +name: Acronyms Expander +short_name: acronyms_expander +version: 0.1 +description: Replaces acronyms (or other strings) with given expansions/substitutes. +authors: Mateusz Biliński <mateusz(a)bilinski.it> +homepage: http://blog.bilinski.it + + diff -r af670138408f -r 1392e6406655 plugins/banner_tweaks/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/banner_tweaks/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,10 @@ +[info] +name: Banner Tweaks +short_name: banner_tweaks +version: 0.1 +description: Allows user to tweak chat window banner appearance (eg. make it compact). + Based on patch by pb in ticket #4133: + http://trac.gajim.org/attachment/ticket/4133. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + diff -r af670138408f -r 1392e6406655 plugins/banner_tweaks/plugin.py --- a/plugins/banner_tweaks/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/banner_tweaks/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -43,15 +43,6 @@ from plugins.gui import GajimPluginConfigDialog class BannerTweaksPlugin(GajimPlugin): - name = u'Banner Tweaks' - short_name = u'banner_tweaks' - version = u'0.1' - description = u'''Allows user to tweak chat window banner appearance (eg. make it compact). - -Based on patch by pb in ticket #4133: -http://trac.gajim.org/attachment/ticket/4133''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('BannerTweaksPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/dbus_plugin/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/dbus_plugin/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,10 @@ +[info] +name: D-Bus Support +short_name: dbus +version: 0.1 +description: D-Bus support. Based on remote_control module from + Gajim core but uses new events handling system. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + + diff -r af670138408f -r 1392e6406655 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/dbus_plugin/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -680,13 +680,6 @@ from common import ged class DBusPlugin(GajimPlugin): - name = u'D-Bus Support' - short_name = u'dbus' - version = u'0.1' - description = u'''D-Bus support. Based on remote_control module from -Gajim core but uses new events handling system.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('DBusPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/events_dump/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/events_dump/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,8 @@ +[info] +name: Events Dump +short_name: events_dump +version: 0.1 +description: Dumps info about selected events to console. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + diff -r af670138408f -r 1392e6406655 plugins/events_dump/plugin.py --- a/plugins/events_dump/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/events_dump/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -33,12 +33,6 @@ from common import ged class EventsDumpPlugin(GajimPlugin): - name = u'Events Dump' - short_name = u'events_dump' - version = u'0.1' - description = u'''Dumps info about selected events to console.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('EventsDumpPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/google_translation/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/google_translation/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,8 @@ +[info] +name: Google Translation +short_name: google_translation +version: 0.1 +description: Translates (currently only incoming) messages using Google Translate. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + diff -r af670138408f -r 1392e6406655 plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/google_translation/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -41,12 +41,6 @@ from common import nec class GoogleTranslationPlugin(GajimPlugin): - name = u'Google Translation' - short_name = u'google_translation' - version = u'0.1' - description = u'''Translates (currently only incoming) messages using Google Translate.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('GoogleTranslationPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/length_notifier/length_notifier.py --- a/plugins/length_notifier/length_notifier.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/length_notifier/length_notifier.py Sat Sep 18 23:00:43 2010 +0200 @@ -34,12 +34,6 @@ from plugins.gui import GajimPluginConfigDialog class LengthNotifierPlugin(GajimPlugin): - name = u'Message Length Notifier' - short_name = u'length_notifier' - version = u'0.1' - description = u'''Highlights message entry field in chat window when given length of message is exceeded.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('LengthNotifierPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/length_notifier/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/length_notifier/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,9 @@ +[info] +name: Message Length Notifier +short_name: length_notifier +version: 0.1 +description: Highlights message entry field in chat window when given length of message is exceeded. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + + diff -r af670138408f -r 1392e6406655 plugins/new_events_example/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/new_events_example/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,11 @@ +[info] +name: New Events Example +short_name: new_events_example +version: 0.1 +description: Shows how to generate new network events based on existing one using Network Events Controller. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + + + + diff -r af670138408f -r 1392e6406655 plugins/new_events_example/plugin.py --- a/plugins/new_events_example/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/new_events_example/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -38,12 +38,6 @@ from common import nec class NewEventsExamplePlugin(GajimPlugin): - name = u'New Events Example' - short_name = u'new_events_example' - version = u'0.1' - description = u'''Shows how to generate new network events based on existing one using Network Events Controller.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('NewEventsExamplePlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/roster_buttons/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/roster_buttons/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,10 @@ +[info] +name: Roster Buttons +short_name: roster_buttons +version: 0.1 +description: Adds quick action buttons to roster window. +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + + + diff -r af670138408f -r 1392e6406655 plugins/roster_buttons/plugin.py --- a/plugins/roster_buttons/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/roster_buttons/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -34,12 +34,6 @@ from plugins.helpers import log, log_calls class RosterButtonsPlugin(GajimPlugin): - name = u'Roster Buttons' - short_name = u'roster_buttons' - version = u'0.1' - description = u'''Adds quick action buttons to roster window.''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('RosterButtonsPlugin') def init(self): diff -r af670138408f -r 1392e6406655 plugins/snarl_notifications/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/snarl_notifications/manifest.ini Sat Sep 18 23:00:43 2010 +0200 @@ -0,0 +1,11 @@ +[info] +name: Snarl Notifications +short_name: snarl_notifications +version: 0.1 +description: Shows events notification using Snarl (http://www.fullphat.net/) under Windows. Snarl needs to be installed in system. + PySnarl bindings are used (http://code.google.com/p/pysnarl/). +authors = Mateusz Biliński <mateusz(a)bilinski.it> +homepage = http://blog.bilinski.it + + + diff -r af670138408f -r 1392e6406655 plugins/snarl_notifications/plugin.py --- a/plugins/snarl_notifications/plugin.py Fri Sep 17 21:16:17 2010 +0200 +++ b/plugins/snarl_notifications/plugin.py Sat Sep 18 23:00:43 2010 +0200 @@ -38,13 +38,6 @@ from common import ged class SnarlNotificationsPlugin(GajimPlugin): - name = u'Snarl Notifications' - short_name = u'snarl_notifications' - version = u'0.1' - description = u'''Shows events notification using Snarl (http://www.fullphat.net/) under Windows. Snarl needs to be installed in system. -PySnarl bindings are used (http://code.google.com/p/pysnarl/).''' - authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] - homepage = u'http://blog.bilinski.it' @log_calls('SnarlNotificationsPlugin') def init(self): diff -r af670138408f -r 1392e6406655 src/plugins/gui.py --- a/src/plugins/gui.py Fri Sep 17 21:16:17 2010 +0200 +++ b/src/plugins/gui.py Sat Sep 18 23:00:43 2010 +0200 @@ -104,7 +104,7 @@ def _display_installed_plugin_info(self, plugin): self.plugin_name_label.set_text(plugin.name) self.plugin_version_label.set_text(plugin.version) - self.plugin_authors_label.set_text(", ".join(plugin.authors)) + self.plugin_authors_label.set_text(plugin.authors) self.plugin_homepage_linkbutton.set_uri(plugin.homepage) self.plugin_homepage_linkbutton.set_label(plugin.homepage) self.plugin_homepage_linkbutton.set_property('sensitive', True) diff -r af670138408f -r 1392e6406655 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Sep 17 21:16:17 2010 +0200 +++ b/src/plugins/pluginmanager.py Sat Sep 18 23:00:43 2010 +0200 @@ -31,6 +31,7 @@ import fnmatch import zipfile from shutil import rmtree +import ConfigParser from common import gajim from common import nec @@ -46,8 +47,9 @@ Currently: - scans for plugins - activates them - - handles GUI extension points, when called by GUI objects after plugin - is activated (by dispatching info about call to handlers in plugins)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2010