Commits September 2010

commits@gajim.org

5 participants
70 discussions

gajim: [Dicson] remove plugin entry in global config when removi...
by Yann Leboulanger 17 Sep '10

17 Sep '10

changeset af670138408f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=af670138408f description: [Dicson] remove plugin entry in global config when removing the plugin. Fixes #5918 diffstat: src/plugins/pluginmanager.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (22 lines): diff -r 0a16c62abb11 -r af670138408f src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Sep 17 21:14:52 2010 +0200 +++ b/src/plugins/pluginmanager.py Fri Sep 17 21:16:17 2010 +0200 @@ -117,6 +117,9 @@ def _create_plugin_entry_in_global_config(self, plugin): gajim.config.add_per('plugins', plugin.short_name) + def _remove_plugin_entry_in_global_config(self, plugin): + gajim.config.del_per('plugins', plugin.short_name) + @log_calls('PluginManager') def add_plugin(self, plugin_class): ''' @@ -519,6 +522,8 @@ 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: [Dicson] Fix building Gajim. Fixes #5916
by Yann Leboulanger 17 Sep '10

17 Sep '10

changeset 0a16c62abb11 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a16c62abb11 description: [Dicson] Fix building Gajim. Fixes #5916 diffstat: plugins/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r c9a4e298e1e0 -r 0a16c62abb11 plugins/Makefile.am --- a/plugins/Makefile.am Fri Sep 17 14:13:48 2010 +0200 +++ b/plugins/Makefile.am Fri Sep 17 21:14:52 2010 +0200 @@ -3,7 +3,6 @@ gajimpluginsdir = $(gajim_pluginsdir) nobase_dist_gajimplugins_PYTHON = \ - $(srcdir)/*.py \ $(srcdir)/*/*.py \ $(srcdir)/*/*.ui

1 0

gajim: move acronyms expander plugin. see #5906
by Yann Leboulanger 17 Sep '10

17 Sep '10

changeset c9a4e298e1e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c9a4e298e1e0 description: move acronyms expander plugin. see #5906 diffstat: plugins/acronyms_expander.py | 102 ------------------------- plugins/acronyms_expander/__init__.py | 1 + plugins/acronyms_expander/acronyms_expander.py | 102 +++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 102 deletions(-) diffs (217 lines): diff -r 8f32c19838fa -r c9a4e298e1e0 plugins/acronyms_expander.py --- a/plugins/acronyms_expander.py Fri Sep 17 12:41:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- - -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -''' -Acronyms expander plugin. - -:author: Mateusz Biliński <mateusz(a)bilinski.it> -:since: 9th June 2008 -:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> -:license: GPL -''' - -import sys - -import gtk -import gobject - -from plugins import GajimPlugin -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): - self.config_dialog = None - - self.gui_extension_points = { - 'chat_control_base': (self.connect_with_chat_control_base, - self.disconnect_from_chat_control_base) - } - - self.config_default_values = { - 'INVOKER': (' ', _('')), - 'ACRONYMS': ({'RTFM': 'Read The Friendly Manual', - '/slap': '/me slaps', - 'PS-': 'plug-in system', - 'G-': 'Gajim', - 'GNT-': 'http://trac.gajim.org/newticket', - 'GW-': 'http://trac.gajim.org/', - 'GTS-': 'http://trac.gajim.org/report', - }, - _('')), - } - - @log_calls('AcronymsExpanderPlugin') - def textbuffer_live_acronym_expander(self, tb): - """ - @param tb gtk.TextBuffer - """ - #assert isinstance(tb,gtk.TextBuffer) - ACRONYMS = self.config['ACRONYMS'] - INVOKER = self.config['INVOKER'] - t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) - #log.debug('%s %d'%(t, len(t))) - if t and t[-1] == INVOKER: - #log.debug('changing msg text') - base, sep, head=t[:-1].rpartition(INVOKER) - log.debug('%s | %s | %s'%(base, sep, head)) - if head in ACRONYMS: - head = ACRONYMS[head] - #log.debug('head: %s'%(head)) - t = ''.join((base, sep, head, INVOKER)) - #log.debug("setting text: '%s'"%(t)) - gobject.idle_add(tb.set_text, t) - - @log_calls('AcronymsExpanderPlugin') - def connect_with_chat_control_base(self, chat_control): - d = {} - tv = chat_control.msg_textview - tb = tv.get_buffer() - h_id = tb.connect('changed', self.textbuffer_live_acronym_expander) - d['h_id'] = h_id - - chat_control.acronyms_expander_plugin_data = d - - return True - - @log_calls('AcronymsExpanderPlugin') - def disconnect_from_chat_control_base(self, chat_control): - d = chat_control.acronyms_expander_plugin_data - tv = chat_control.msg_textview - tv.get_buffer().disconnect(d['h_id']) diff -r 8f32c19838fa -r c9a4e298e1e0 plugins/acronyms_expander/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/__init__.py Fri Sep 17 14:13:48 2010 +0200 @@ -0,0 +1,1 @@ +from acronyms_expander import AcronymsExpanderPlugin diff -r 8f32c19838fa -r c9a4e298e1e0 plugins/acronyms_expander/acronyms_expander.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/acronyms_expander.py Fri Sep 17 14:13:48 2010 +0200 @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- + +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +''' +Acronyms expander plugin. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 9th June 2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import sys + +import gtk +import gobject + +from plugins import GajimPlugin +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): + self.config_dialog = None + + self.gui_extension_points = { + 'chat_control_base': (self.connect_with_chat_control_base, + self.disconnect_from_chat_control_base) + } + + self.config_default_values = { + 'INVOKER': (' ', _('')), + 'ACRONYMS': ({'RTFM': 'Read The Friendly Manual', + '/slap': '/me slaps', + 'PS-': 'plug-in system', + 'G-': 'Gajim', + 'GNT-': 'http://trac.gajim.org/newticket', + 'GW-': 'http://trac.gajim.org/', + 'GTS-': 'http://trac.gajim.org/report', + }, + _('')), + } + + @log_calls('AcronymsExpanderPlugin') + def textbuffer_live_acronym_expander(self, tb): + """ + @param tb gtk.TextBuffer + """ + #assert isinstance(tb,gtk.TextBuffer) + ACRONYMS = self.config['ACRONYMS'] + INVOKER = self.config['INVOKER'] + t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) + #log.debug('%s %d'%(t, len(t))) + if t and t[-1] == INVOKER: + #log.debug('changing msg text') + base, sep, head=t[:-1].rpartition(INVOKER) + log.debug('%s | %s | %s'%(base, sep, head)) + if head in ACRONYMS: + head = ACRONYMS[head] + #log.debug('head: %s'%(head)) + t = ''.join((base, sep, head, INVOKER)) + #log.debug("setting text: '%s'"%(t)) + gobject.idle_add(tb.set_text, t) + + @log_calls('AcronymsExpanderPlugin') + def connect_with_chat_control_base(self, chat_control): + d = {} + tv = chat_control.msg_textview + tb = tv.get_buffer() + h_id = tb.connect('changed', self.textbuffer_live_acronym_expander) + d['h_id'] = h_id + + chat_control.acronyms_expander_plugin_data = d + + return True + + @log_calls('AcronymsExpanderPlugin') + def disconnect_from_chat_control_base(self, chat_control): + d = chat_control.acronyms_expander_plugin_data + tv = chat_control.msg_textview + tv.get_buffer().disconnect(d['h_id'])

1 0

gajim: fix a bug in ged that prevent callback to be called in th...
by Yann Leboulanger 17 Sep '10

17 Sep '10

changeset 8f32c19838fa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8f32c19838fa description: fix a bug in ged that prevent callback to be called in the correct order. diffstat: src/common/ged.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 8accbba869c0 -r 8f32c19838fa src/common/ged.py --- a/src/common/ged.py Fri Sep 17 10:00:25 2010 +0200 +++ b/src/common/ged.py Fri Sep 17 12:41:00 2010 +0200 @@ -46,6 +46,9 @@ for i, h in enumerate(handlers_list): if priority < h[0]: break + else: + # no event with smaller prio found, put it at the end + i += 1 handlers_list.insert(i, (priority, handler)) else:

1 0

gajim: dont' load plugin config file twice. Fixes #5914
by Yann Leboulanger 17 Sep '10

17 Sep '10

changeset 8accbba869c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8accbba869c0 description: dont' load plugin config file twice. Fixes #5914 diffstat: src/plugins/plugin.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r acbeadfa13f5 -r 8accbba869c0 src/plugins/plugin.py --- a/src/plugins/plugin.py Thu Sep 16 21:15:12 2010 +0200 +++ b/src/plugins/plugin.py Fri Sep 17 10:00:25 2010 +0200 @@ -203,7 +203,6 @@ locale.getpreferredencoding()) #log.debug('FILE_PATH = %s'%(self.FILE_PATH)) self.data = None - self.load() @log_calls('GajimPluginConfig') def __getitem__(self, key):

1 0

gajim: handle canceling of creating gnome keyring. Fixes #5909
by Yann Leboulanger 16 Sep '10

16 Sep '10

changeset acbeadfa13f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=acbeadfa13f5 description: handle canceling of creating gnome keyring. Fixes #5909 diffstat: src/common/passwords.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 11dda9b52325 -r acbeadfa13f5 src/common/passwords.py --- a/src/common/passwords.py Thu Sep 16 20:27:54 2010 +0200 +++ b/src/common/passwords.py Thu Sep 16 21:15:12 2010 +0200 @@ -197,7 +197,8 @@ if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() - except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError): + except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, + gnomekeyring.CancelledError): storage = None if storage is None: if gajim.config.get('use_kwalletcli'):

1 0

gajim: [Dicson] Ability to resize statusicon when statusbar chan...
by Yann Leboulanger 16 Sep '10

16 Sep '10

changeset 11dda9b52325 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=11dda9b52325 description: [Dicson] Ability to resize statusicon when statusbar changes. Fixes #5911 diffstat: src/statusicon.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diffs (47 lines): diff -r e7ddbf02894f -r 11dda9b52325 src/statusicon.py --- a/src/statusicon.py Tue Sep 14 19:31:35 2010 +0200 +++ b/src/statusicon.py Thu Sep 16 20:27:54 2010 +0200 @@ -86,12 +86,15 @@ def show_icon(self): if not self.status_icon: self.status_icon = gtk.StatusIcon() + self.statusicon_size = '16' self.status_icon.set_property('has-tooltip', True) self.status_icon.connect('activate', self.on_status_icon_left_clicked) self.status_icon.connect('popup-menu', self.on_status_icon_right_clicked) self.status_icon.connect('query-tooltip', self.on_status_icon_query_tooltip) + self.status_icon.connect('size-changed', + self.on_status_icon_size_changed) self.set_img() self.status_icon.set_visible(True) @@ -112,6 +115,16 @@ def on_status_icon_left_clicked(self, widget): self.on_left_click() + def on_status_icon_size_changed(self, statusicon, size): + if size > 31: + self.statusicon_size = '32' + else: + self.statusicon_size = '16' + if os.environ.get('KDE_FULL_SESSION') == 'true': + # detect KDE session. see #5476 + self.statusicon_size = '32' + self.set_img() + def set_img(self): """ Apart from image, we also update tooltip text here @@ -123,8 +136,8 @@ else: self.status_icon.set_blinking(False) - # FIXME: do not always use 16x16 (ask actually used size and use that) - image = gajim.interface.jabber_state_images['16'][self.status] + 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?

1 0

gajim: [Dicson] ability to install from zip / uninstall plugin. ...
by Yann Leboulanger 14 Sep '10

14 Sep '10

changeset e7ddbf02894f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e7ddbf02894f description: [Dicson] ability to install from zip / uninstall plugin. Fixes #5906 diffstat: data/gui/plugins_window.ui | 45 +++++++++++++++++++- src/common/connection_handlers.py | 2 +- src/common/exceptions.py | 12 +++++ src/dialogs.py | 65 ++++++++++++++++++++++++---- src/plugins/gui.py | 86 ++++++++++++++++++++++++++++++-------- src/plugins/pluginmanager.py | 74 ++++++++++++++++++++++++++++++++- 6 files changed, 249 insertions(+), 35 deletions(-) diffs (truncated from 467 to 300 lines): diff -r 07b08ca7f9d9 -r e7ddbf02894f data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Mon Sep 13 12:23:49 2010 +0200 +++ b/data/gui/plugins_window.ui Tue Sep 14 19:31:35 2010 +0200 @@ -246,9 +246,46 @@ <property name="spacing">5</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="install_plugin_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_install_plugin_button_clicked"/> + <child> + <object class="GtkHBox" id="hbox13"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="install_plugin_button_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Install</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="uninstall_plugin_button"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="receives_default">True</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked"/> <child> @@ -266,6 +303,7 @@ <child> <object class="GtkLabel" id="uninstall_plugin_button_label"> <property name="visible">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Uninstall</property> </object> <packing> @@ -278,7 +316,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -302,6 +340,7 @@ <child> <object class="GtkLabel" id="configure_plugin_button_label"> <property name="visible">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Configure</property> </object> <packing> @@ -314,7 +353,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> diff -r 07b08ca7f9d9 -r e7ddbf02894f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Sep 13 12:23:49 2010 +0200 +++ b/src/common/connection_handlers.py Tue Sep 14 19:31:35 2010 +0200 @@ -61,7 +61,7 @@ from common import ged from common import nec from common.nec import NetworkEvent -from plugins import GajimPlugin + if gajim.HAVE_FARSIGHT: from common.jingle import ConnectionJingle else: diff -r 07b08ca7f9d9 -r e7ddbf02894f src/common/exceptions.py --- a/src/common/exceptions.py Mon Sep 13 12:23:49 2010 +0200 +++ b/src/common/exceptions.py Tue Sep 14 19:31:35 2010 +0200 @@ -131,3 +131,15 @@ def __str__(self): return self.text + +class PluginsystemError(Exception): + """ + Error in the pluginsystem + """ + + def __init__(self, text=''): + Exception.__init__(self) + self.text = text + + def __str__(self): + return self.text diff -r 07b08ca7f9d9 -r e7ddbf02894f src/dialogs.py --- a/src/dialogs.py Mon Sep 13 12:23:49 2010 +0200 +++ b/src/dialogs.py Tue Sep 14 19:31:35 2010 +0200 @@ -1349,11 +1349,11 @@ Non-blocking FileChooser Dialog around gtk.FileChooserDialog """ def __init__(self, title_text, action, buttons, default_response, - select_multiple = False, current_folder = None, on_response_ok = None, - on_response_cancel = None): + select_multiple=False, current_folder=None, on_response_ok=None, + on_response_cancel=None): gtk.FileChooserDialog.__init__(self, title=title_text, action=action, - buttons=buttons) + buttons=buttons) self.set_default_response(default_response) self.set_select_multiple(select_multiple) @@ -1468,8 +1468,8 @@ """ def __init__(self, pritext, sectext=''): - HigDialog.__init__( self, None, - gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, pritext, sectext) + 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) @@ -1505,13 +1505,12 @@ """ def __init__(self, pritext, sectext='', checktext='', on_response_yes=None, - on_response_no=None): + on_response_no=None): self.user_response_yes = on_response_yes self.user_response_no = on_response_no - HigDialog.__init__( self, None, - gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, pritext, sectext, - on_response_yes=self.on_response_yes, - on_response_no=self.on_response_no) + HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, + pritext, sectext, on_response_yes=self.on_response_yes, + on_response_no=self.on_response_no) if checktext: self.checkbutton = gtk.CheckButton(checktext) @@ -4442,6 +4441,52 @@ else: self.response_clear(widget) + +class ArchiveChooserDialog(FileChooserDialog): + def __init__(self, on_response_ok=None, on_response_cancel=None): + + def on_ok(widget, callback): + '''check if file exists and call callback''' + path_to_file = self.get_filename() + if not path_to_file: + return + path_to_file = gtkgui_helpers.decode_filechooser_file_paths( + (path_to_file,))[0] + if os.path.exists(path_to_file): + if isinstance(callback, tuple): + callback[0](path_to_file, *callback[1:]) + else: + callback(path_to_file) + self.destroy() + + path = helpers.get_documents_path() + + FileChooserDialog.__init__(self, + title_text=_('Choose Archive'), + action=gtk.FILE_CHOOSER_ACTION_OPEN, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN, gtk.RESPONSE_OK), + default_response=gtk.RESPONSE_OK, + current_folder=path, + on_response_ok=(on_ok, on_response_ok), + on_response_cancel=on_response_cancel) + + if on_response_cancel: + self.connect('destroy', on_response_cancel) + + filter_ = gtk.FileFilter() + filter_.set_name(_('All files')) + filter_.add_pattern('*') + self.add_filter(filter_) + + filter_ = gtk.FileFilter() + filter_.set_name(_('Zip files')) + filter_.add_pattern('*.zip') + + self.add_filter(filter_) + self.set_filter(filter_) + + class AddSpecialNotificationDialog: def __init__(self, jid): """ diff -r 07b08ca7f9d9 -r e7ddbf02894f src/plugins/gui.py --- a/src/plugins/gui.py Mon Sep 13 12:23:49 2010 +0200 +++ b/src/plugins/gui.py Tue Sep 14 19:31:35 2010 +0200 @@ -30,9 +30,10 @@ import gtk, gobject import gtkgui_helpers +import dialogs from common import gajim - from plugins.helpers import log_calls, log +from common.exceptions import PluginsystemError class PluginsWindow(object): '''Class for Plugins window''' @@ -44,15 +45,11 @@ self.window = self.xml.get_object('plugins_window') self.window.set_transient_for(gajim.interface.roster.window) - widgets_to_extract = ('plugins_notebook', - 'plugin_name_label', - 'plugin_version_label', - 'plugin_authors_label', - 'plugin_homepage_linkbutton', - 'plugin_description_textview', - 'uninstall_plugin_button', - 'configure_plugin_button', - 'installed_plugins_treeview') + widgets_to_extract = ('plugins_notebook', 'plugin_name_label', + 'plugin_version_label', 'plugin_authors_label', + 'plugin_homepage_linkbutton', 'plugin_description_textview', + 'uninstall_plugin_button', 'configure_plugin_button', + 'installed_plugins_treeview') for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) @@ -62,8 +59,7 @@ self.plugin_name_label.set_attributes(attr_list) self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT, - gobject.TYPE_STRING, - gobject.TYPE_BOOLEAN) + gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) self.installed_plugins_treeview.set_model(self.installed_plugins_model) renderer = gtk.CellRendererText() @@ -79,7 +75,7 @@ # connect signal for selection change selection = self.installed_plugins_treeview.get_selection() selection.connect('changed', - self.installed_plugins_treeview_selection_changed) + self.installed_plugins_treeview_selection_changed) selection.set_mode(gtk.SELECTION_SINGLE) self._clear_installed_plugin_info() @@ -116,7 +112,8 @@ desc_textbuffer = self.plugin_description_textview.get_buffer() desc_textbuffer.set_text(plugin.description) self.plugin_description_textview.set_property('sensitive', True) - self.uninstall_plugin_button.set_property('sensitive', True) + self.uninstall_plugin_button.set_property('sensitive', + gajim.PLUGINS_DIRS[1] in plugin.__path__) if plugin.config_dialog is None: self.configure_plugin_button.set_property('sensitive', False) else: @@ -143,9 +140,8 @@ self.installed_plugins_model.set_sort_column_id(1, gtk.SORT_ASCENDING) for plugin in pm.plugins: - self.installed_plugins_model.append([plugin, - plugin.name, - plugin.active]) + self.installed_plugins_model.append([plugin, plugin.name, + plugin.active]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): @@ -189,14 +185,66 @@ @log_calls('PluginsWindow') def on_uninstall_plugin_button_clicked(self, widget): - pass + selection = self.installed_plugins_treeview.get_selection() + model, iter = selection.get_selected()

1 0

gajim: handle milliseconds in time result stanza. Fixes #5905
by Yann Leboulanger 13 Sep '10

13 Sep '10

changeset 07b08ca7f9d9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=07b08ca7f9d9 description: handle milliseconds in time result stanza. Fixes #5905 diffstat: src/common/connection_handlers_events.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diffs (24 lines): diff -r 6132de77f21c -r 07b08ca7f9d9 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Sep 12 17:14:44 2010 +0200 +++ b/src/common/connection_handlers_events.py Mon Sep 13 12:23:49 2010 +0200 @@ -152,12 +152,16 @@ try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - t = t.replace(tzinfo=UTC()) - self.time_info = t.astimezone(contact_tz()).strftime('%c') except ValueError, e: - log.info('Wrong time format: %s' % str(e)) - return + try: + t = datetime.datetime.strptime(utc_time, + '%Y-%m-%dT%H:%M:%S.%fZ') + except ValueError, e: + log.info('Wrong time format: %s' % str(e)) + return + t = t.replace(tzinfo=UTC()) + self.time_info = t.astimezone(contact_tz()).strftime('%c') return True class GMailQueryReceivedEvent(nec.NetworkIncomingEvent):

1 0

gajim: [Dicson] Handle non-Latin text and errors in google trans...
by Yann Leboulanger 12 Sep '10

12 Sep '10

changeset 6132de77f21c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6132de77f21c description: [Dicson] Handle non-Latin text and errors in google translate plugin. Fixes #5904 diffstat: plugins/google_translation/plugin.py | 64 +++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 29 deletions(-) diffs (99 lines): diff -r db8ada40b491 -r 6132de77f21c plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Sat Sep 11 15:32:44 2010 +0200 +++ b/plugins/google_translation/plugin.py Sun Sep 12 17:14:44 2010 +0200 @@ -30,6 +30,7 @@ import urllib2 import new from pprint import pformat +from sys import getfilesystemencoding from common import helpers from common import gajim @@ -51,45 +52,49 @@ def init(self): self.config_dialog = None #self.gui_extension_points = {} - self.config_default_values = {'from_lang' : (u'en', _(u'Language of text to be translated')), - 'to_lang' : (u'fr', _(u'Language to which translation will be made')), - 'user_agent' : (u'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.12) Gecko/20080213 Firefox/2.0.0.11', - _(u'User Agent data to be used with urllib2 when connecting to Google Translate service'))} + self.config_default_values = { + 'from_lang' : + (u'en', _(u'Language of text to be translated')), + 'to_lang' : + (u'fr', _(u'Language to which translation will be made')), + 'user_agent' : + (u'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.12) ' + 'Gecko/20080213 Firefox/2.0.0.11', + _(u'User Agent data to be used with urllib2 ' + 'when connecting to Google Translate service'))} #self.events_handlers = {} self.events = [GoogleTranslateMessageReceivedEvent] - self.translated_text_re = \ - re.compile(r'google.language.callbacks.id100$\'22\',{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200$') + self.translated_text_re = re.compile( + r'google.language.callbacks.id100$\'22\',' + '{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200$') @log_calls('GoogleTranslationPlugin') def translate_text(self, text, from_lang, to_lang): - text = self.prepare_text_for_url(text) + # Converts text so it can be used within URL as query to Google + # Translate. + quoted_text = urllib2.quote(text.encode(getfilesystemencoding())) + # prepare url headers = { 'User-Agent' : self.config['user_agent'] } - translation_url = u'http://www.google.com/uds/Gtranslate?callback=google.language.callbacks.id1…'%locals() + translation_url = u'http://www.google.com/uds/Gtranslate?callback='\ + 'google.language.callbacks.id100&context=22&q=%(quoted_text)s&'\ + 'langpair=%(from_lang)s%%7C%(to_lang)s&key=notsupplied&v=1.0' % \ + locals() + request = urllib2.Request(translation_url, headers=headers) - request = urllib2.Request(translation_url, headers=headers) - response = urllib2.urlopen(request) + try: + response = urllib2.urlopen(request) + except urllib2.URLError, e: + # print e + return text + results = response.read() - translated_text = self.translated_text_re.search(results).group('text') - return translated_text - - @log_calls('GoogleTranslationPlugin') - def prepare_text_for_url(self, text): - ''' - Converts text so it can be used within URL as query to Google Translate. - ''' - - # There should be more replacements for plugin to work in any case: - char_replacements = { ' ' : '%20', - '+' : '%2B'} - - for char, replacement in char_replacements.iteritems(): - text = text.replace(char, replacement) - + if translated_text: + return translated_text return text @log_calls('GoogleTranslationPlugin') @@ -112,7 +117,8 @@ from_lang = self.plugin.config['from_lang'] to_lang = self.plugin.config['to_lang'] self.base_event.xmpp_msg.kids[0].setData( - self.plugin.translate_text(msg_text, from_lang, to_lang)) + self.plugin.translate_text(msg_text, from_lang, to_lang)) - return False # We only want to modify old event, not emit another, - # so we return False here. + # We only want to modify old event, not emit another, so we return False + # here. + return False

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