Commits September 2011

commits@gajim.org

2 participants
107 discussions

gajim: fix var name
by Fomin Denis 02 Sep '11

02 Sep '11

changeset ccf1c25a1a21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ccf1c25a1a21 description: fix var name diffstat: plugins/whiteboard/whiteboard_widget.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e2b267099d6e -r ccf1c25a1a21 plugins/whiteboard/whiteboard_widget.py --- a/plugins/whiteboard/whiteboard_widget.py Fri Sep 02 20:56:34 2011 +0300 +++ b/plugins/whiteboard/whiteboard_widget.py Fri Sep 02 21:12:01 2011 +0300 @@ -39,7 +39,7 @@ self.plugin = plugin file_path = plugin.local_file_path('whiteboard_widget.ui') xml = gtk.Builder() - self.xml.set_translation_domain('gajim_plugins') + xml.set_translation_domain('gajim_plugins') xml.add_from_file(file_path) self.hbox = xml.get_object('whiteboard_hbox') self.canevas = goocanvas.Canvas()

1 0

gajim: set new translation domain for triggers plugin and whiteb...
by Fomin Denis 02 Sep '11

02 Sep '11

changeset e2b267099d6e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e2b267099d6e description: set new translation domain for triggers plugin and whiteboard plugin diffstat: plugins/triggers/triggers.py | 2 +- plugins/whiteboard/whiteboard_widget.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diffs (39 lines): diff -r 4f1f3389054b -r e2b267099d6e plugins/triggers/triggers.py --- a/plugins/triggers/triggers.py Fri Sep 02 20:51:13 2011 +0300 +++ b/plugins/triggers/triggers.py Fri Sep 02 20:56:34 2011 +0300 @@ -26,7 +26,6 @@ from plugins import GajimPlugin from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog -from common import i18n from common import ged from common import helpers @@ -222,6 +221,7 @@ self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( 'config_dialog.ui') self.xml = gtk.Builder() + self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['vbox', 'liststore1', 'liststore2']) vbox = self.xml.get_object('vbox') diff -r 4f1f3389054b -r e2b267099d6e plugins/whiteboard/whiteboard_widget.py --- a/plugins/whiteboard/whiteboard_widget.py Fri Sep 02 20:51:13 2011 +0300 +++ b/plugins/whiteboard/whiteboard_widget.py Fri Sep 02 20:56:34 2011 +0300 @@ -27,7 +27,6 @@ HAS_GOOCANVAS = False from common.xmpp import Node from common import gajim -from common import i18n from dialogs import FileChooserDialog ''' @@ -40,7 +39,7 @@ self.plugin = plugin file_path = plugin.local_file_path('whiteboard_widget.ui') xml = gtk.Builder() - xml.set_translation_domain(i18n.APP) + self.xml.set_translation_domain('gajim_plugins') xml.add_from_file(file_path) self.hbox = xml.get_object('whiteboard_hbox') self.canevas = goocanvas.Canvas()

1 0

gajim: set new translation domaine for plugins
by Fomin Denis 02 Sep '11

02 Sep '11

changeset 4f1f3389054b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f1f3389054b description: set new translation domaine for plugins diffstat: plugins/banner_tweaks/plugin.py | 3 +-- plugins/length_notifier/length_notifier.py | 3 +-- plugins/roster_buttons/plugin.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diffs (60 lines): diff -r d276d3041dd4 -r 4f1f3389054b plugins/banner_tweaks/plugin.py --- a/plugins/banner_tweaks/plugin.py Fri Sep 02 19:41:09 2011 +0200 +++ b/plugins/banner_tweaks/plugin.py Fri Sep 02 20:51:13 2011 +0300 @@ -34,7 +34,6 @@ import gtk import gobject import message_control -from common import i18n from common import gajim from common import helpers @@ -159,7 +158,7 @@ self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( 'config_dialog.ui') self.xml = gtk.Builder() - self.xml.set_translation_domain(i18n.APP) + self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['banner_tweaks_config_vbox']) self.config_vbox = self.xml.get_object('banner_tweaks_config_vbox') diff -r d276d3041dd4 -r 4f1f3389054b plugins/length_notifier/length_notifier.py --- a/plugins/length_notifier/length_notifier.py Fri Sep 02 19:41:09 2011 +0200 +++ b/plugins/length_notifier/length_notifier.py Fri Sep 02 20:51:13 2011 +0300 @@ -27,7 +27,6 @@ import sys import gtk -from common import i18n from plugins import GajimPlugin from plugins.helpers import log, log_calls @@ -112,7 +111,7 @@ self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( 'config_dialog.ui') self.xml = gtk.Builder() - self.xml.set_translation_domain(i18n.APP) + self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['length_notifier_config_table']) self.config_table = self.xml.get_object('length_notifier_config_table') diff -r d276d3041dd4 -r 4f1f3389054b plugins/roster_buttons/plugin.py --- a/plugins/roster_buttons/plugin.py Fri Sep 02 19:41:09 2011 +0200 +++ b/plugins/roster_buttons/plugin.py Fri Sep 02 20:51:13 2011 +0300 @@ -27,7 +27,6 @@ import sys import gtk -from common import i18n from common import gajim from plugins import GajimPlugin @@ -46,7 +45,7 @@ @log_calls('RosterButtonsPlugin') def activate(self): self.xml = gtk.Builder() - self.xml.set_translation_domain(i18n.APP) + self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['roster_buttons_buttonbox']) self.buttonbox = self.xml.get_object('roster_buttons_buttonbox')

1 0

gajim: make plugins translation work under windows.
by Yann Leboulanger 02 Sep '11

02 Sep '11

changeset d276d3041dd4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d276d3041dd4 description: make plugins translation work under windows. diffstat: src/gajim.py | 5 +++++ src/plugins/plugins_i18n.py | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diffs (35 lines): diff -r 95b2a5bc8c6f -r d276d3041dd4 src/gajim.py --- a/src/gajim.py Fri Sep 02 07:23:31 2011 +0200 +++ b/src/gajim.py Fri Sep 02 19:41:09 2011 +0200 @@ -156,6 +156,11 @@ del profile if os.name == 'nt': + plugins_locale_dir = str(os.path.join(common.configpaths.gajimpaths[ + 'PLUGINS_USER'], 'locale')) + libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) + libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') + class MyStderr(object): _file = None _error = None diff -r 95b2a5bc8c6f -r d276d3041dd4 src/plugins/plugins_i18n.py --- a/src/plugins/plugins_i18n.py Fri Sep 02 07:23:31 2011 +0200 +++ b/src/plugins/plugins_i18n.py Fri Sep 02 19:41:09 2011 +0200 @@ -27,10 +27,12 @@ APP = 'gajim_plugins' plugins_locale_dir = os_path.join(gajim.PLUGINS_DIRS[1], 'locale') -locale.setlocale(locale.LC_ALL, '') -locale.bindtextdomain(APP, plugins_locale_dir) -gettext.bindtextdomain(APP, plugins_locale_dir) -gettext.textdomain(APP) +if os.name != 'nt': + locale.setlocale(locale.LC_ALL, '') + locale.bindtextdomain(APP, plugins_locale_dir) + gettext.bindtextdomain(APP, plugins_locale_dir) + gettext.textdomain(APP) + try: t = gettext.translation(APP, plugins_locale_dir) _ = t.gettext

1 0

gajim: set default value of autodetect_browser_mailer to True. F...
by Yann Leboulanger 02 Sep '11

02 Sep '11

changeset 95b2a5bc8c6f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95b2a5bc8c6f description: set default value of autodetect_browser_mailer to True. Force it to True for windows diffstat: src/common/config.py | 2 +- src/common/optparser.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diffs (30 lines): diff -r 75cb1cf6022c -r 95b2a5bc8c6f src/common/config.py --- a/src/common/config.py Fri Sep 02 07:06:20 2011 +0200 +++ b/src/common/config.py Fri Sep 02 07:23:31 2011 +0200 @@ -185,7 +185,7 @@ 'networkmanager_support': [opt_bool, True, _('If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection.'), True], 'outgoing_chat_state_notifications': [opt_str, 'all', _('Sent chat state notifications. Can be one of all, composing_only, disabled.')], 'displayed_chat_state_notifications': [opt_str, 'all', _('Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled.')], - 'autodetect_browser_mailer': [opt_bool, False, '', True], + 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')], diff -r 75cb1cf6022c -r 95b2a5bc8c6f src/common/optparser.py --- a/src/common/optparser.py Fri Sep 02 07:06:20 2011 +0200 +++ b/src/common/optparser.py Fri Sep 02 07:23:31 2011 +0200 @@ -901,7 +901,7 @@ def update_config_to_01401(self): if 'autodetect_browser_mailer' not in self.old_values or 'openwith' \ not in self.old_values or \ - (self.old_values['autodetect_browser_mailer'] == 'False' and \ + (self.old_values['autodetect_browser_mailer'] == False and \ self.old_values['openwith'] != 'custom'): gajim.config.set('autodetect_browser_mailer', True) gajim.config.set('openwith', gajim.config.DEFAULT_OPENWITH) @@ -911,3 +911,5 @@ if 'use_stun_server' in self.old_values and self.old_values[ 'use_stun_server'] and not self.old_values['stun_server']: gajim.config.set('use_stun_server', False) + if os.name == 'nt': + gajim.config.set('autodetect_browser_mailer', True)

1 0

gajim: prevent traceback
by Yann Leboulanger 02 Sep '11

02 Sep '11

changeset 75cb1cf6022c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=75cb1cf6022c description: prevent traceback diffstat: src/common/connection_handlers_events.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 49a1fa5acfe0 -r 75cb1cf6022c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Sep 01 21:17:43 2011 +0200 +++ b/src/common/connection_handlers_events.py Fri Sep 02 07:06:20 2011 +0200 @@ -1124,6 +1124,7 @@ self.session = self.msg_obj.session self.timestamp = self.msg_obj.timestamp self.encrypted = self.msg_obj.encrypted + self.popup = False self.receipt_request_tag = self.stanza.getTag('request', namespace=xmpp.NS_RECEIPTS)

1 0

gajim: don't allow to continue registering an account if we only...
by Yann Leboulanger 01 Sep '11

01 Sep '11

changeset 49a1fa5acfe0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=49a1fa5acfe0 description: don't allow to continue registering an account if we only get instructions. Fixes #6957 diffstat: src/config.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diffs (30 lines): diff -r 7af9e30219df -r 49a1fa5acfe0 src/config.py --- a/src/config.py Wed Aug 31 14:39:49 2011 +0200 +++ b/src/config.py Thu Sep 01 21:17:43 2011 +0200 @@ -3522,6 +3522,7 @@ def on_back_button_clicked(self, widget): cur_page = self.notebook.get_current_page() + self.forward_button.set_sensitive(True) if cur_page in (1, 2): self.notebook.set_current_page(0) self.back_button.set_sensitive(False) @@ -3763,6 +3764,18 @@ self.data_form_widget = dataforms_widget.DataFormWidget(dataform) else: self.data_form_widget = FakeDataForm(obj.config) + empty_config = True + for field in obj.config: + if field == 'instructions': + continue + if not obj.config[field]: + # ignore empty tag + continue + empty_config = False + break + if not obj.is_form and empty_config: + self.forward_button.set_sensitive(False) + self.notebook.set_current_page(4) # show form page self.data_form_widget.show_all() self.xml.get_object('form_vbox').pack_start(self.data_form_widget) self.ssl_fingerprint = obj.ssl_fingerprint

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 2011