Commits

commits@gajim.org

17632 discussions

gajim: reopen saved opened chat controls only once.
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset 4c87beb0324c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c87beb0324c description: reopen saved opened chat controls only once. diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r ca60dd525823 -r 4c87beb0324c src/roster_window.py --- a/src/roster_window.py Fri Aug 10 08:06:41 2012 +0200 +++ b/src/roster_window.py Fri Aug 10 10:21:01 2012 +0200 @@ -2620,6 +2620,8 @@ account, jid) gajim.interface.on_open_chat_window(None, contact, account) + gajim.config.set_per('accounts', acct, 'opened_chat_controls', + '') gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj):

1 0

gajim: use a "gajim" logger name for gnupg.py. see #7149
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset ca60dd525823 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca60dd525823 description: use a "gajim" logger name for gnupg.py. see #7149 diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 321ef21af2e5 -r ca60dd525823 src/common/gnupg.py --- a/src/common/gnupg.py Thu Aug 09 21:55:35 2012 +0400 +++ b/src/common/gnupg.py Fri Aug 10 08:06:41 2012 +0200 @@ -64,7 +64,7 @@ except NameError: _py3k = True -logger = logging.getLogger(__name__) +logger = logging.getLogger('gajim.c.gnupg') if not logger.handlers: logger.addHandler(NullHandler())

1 0

gajim: typo
by Fomin Denis 09 Aug '12

09 Aug '12

changeset 321ef21af2e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=321ef21af2e5 description: typo diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cb7602bb9c5c -r 321ef21af2e5 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:55:35 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' - for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): + for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]]: pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config()

1 0

gajim: first load the plugins of the user directory. does not l...
by Fomin Denis 09 Aug '12

09 Aug '12

changeset cb7602bb9c5c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb7602bb9c5c description: first load the plugins of the user directory. does not load the module twice. diffstat: src/plugins/pluginmanager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 27b33dd6fe25 -r cb7602bb9c5c src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Aug 05 13:34:35 2012 +0200 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' - for path in gajim.PLUGINS_DIRS: + for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() @@ -433,6 +433,9 @@ elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name + if module_name in sys.modules: + # do not load the module twice + continue file_path += os.path.sep try: module = __import__(module_name)

1 0

gajim: add option to enable / disable the remember opened chats ...
by Yann Leboulanger 05 Aug '12

05 Aug '12

changeset 27b33dd6fe25 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=27b33dd6fe25 description: add option to enable / disable the remember opened chats option. Fixes #7193 diffstat: src/common/config.py | 1 + src/message_window.py | 2 ++ src/roster_window.py | 19 +++++++++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diffs (52 lines): diff -r 7ed0b34c4945 -r 27b33dd6fe25 src/common/config.py --- a/src/common/config.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/common/config.py Sun Aug 05 13:34:35 2012 +0200 @@ -311,6 +311,7 @@ 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')], 'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')], + 'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], }, {}) __options_per_key = { diff -r 7ed0b34c4945 -r 27b33dd6fe25 src/message_window.py --- a/src/message_window.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/message_window.py Sun Aug 05 13:34:35 2012 +0200 @@ -1246,6 +1246,8 @@ mw.new_tab(ctrl) def save_opened_controls(self): + if not gajim.config.get('remember_opened_chat_controls'): + return chat_controls = {} for acct in gajim.connections: chat_controls[acct] = [] diff -r 7ed0b34c4945 -r 27b33dd6fe25 src/roster_window.py --- a/src/roster_window.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/roster_window.py Sun Aug 05 13:34:35 2012 +0200 @@ -2609,14 +2609,17 @@ self.add_account_contacts(obj.conn.name) self.fire_up_unread_messages_events(obj.conn.name) else: - account = obj.conn.name - controls = gajim.config.get_per('accounts', account, - 'opened_chat_controls') - if controls: - for jid in controls.split(','): - contact = gajim.contacts.get_contact_with_highest_priority( - account, jid) - gajim.interface.on_open_chat_window(None, contact, account) + if gajim.config.get('remember_opened_chat_controls'): + account = obj.conn.name + controls = gajim.config.get_per('accounts', account, + 'opened_chat_controls') + if controls: + for jid in controls.split(','): + contact = \ + gajim.contacts.get_contact_with_highest_priority( + account, jid) + gajim.interface.on_open_chat_window(None, contact, + account) gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj):

1 0

gajim: hide invite contacts buttons in zeroconf chat controls. F...
by Yann Leboulanger 04 Aug '12

04 Aug '12

changeset 7ed0b34c4945 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7ed0b34c4945 description: hide invite contacts buttons in zeroconf chat controls. Fixes #7188 diffstat: src/chat_control.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (21 lines): diff -r a6ff4ecd0114 -r 7ed0b34c4945 src/chat_control.py --- a/src/chat_control.py Sat Aug 04 10:51:02 2012 +0200 +++ b/src/chat_control.py Sat Aug 04 17:14:34 2012 +0200 @@ -1744,10 +1744,14 @@ "him or her a file.")) # Convert to GC - if self.contact.supports(NS_MUC): - self._convert_to_gc_button.set_sensitive(True) + if gajim.config.get_per('accounts', self.account, 'is_zeroconf'): + self._convert_to_gc_button.set_no_show_all(True) + self._convert_to_gc_button.hide() else: - self._convert_to_gc_button.set_sensitive(False) + if self.contact.supports(NS_MUC): + self._convert_to_gc_button.set_sensitive(True) + else: + self._convert_to_gc_button.set_sensitive(False) # Information if gajim.account_is_disconnected(self.account):

1 0

gajim: fix some typo
by Yann Leboulanger 04 Aug '12

04 Aug '12

changeset a6ff4ecd0114 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a6ff4ecd0114 description: fix some typo diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 227a2aec93bd -r a6ff4ecd0114 src/roster_window.py --- a/src/roster_window.py Thu Aug 02 21:52:20 2012 +0400 +++ b/src/roster_window.py Sat Aug 04 10:51:02 2012 +0200 @@ -3752,7 +3752,7 @@ send_it() return pritext = _('You are about to send a custom status. Are you sure you ' - 'want to continue?') + 'want to continue?') sectext = _('This contact will temporarily see you as %(status)s, ' 'but only until you change your status. Then he or she will see ' 'your global status.') % {'status': show} @@ -4469,7 +4469,7 @@ dialogs.WarningDialog(_('Metacontacts storage not supported by ' 'your server'), _('Your server does not support storing metacontacts ' - 'information. So those information will not be saved on next ' + 'information. So this information will not be saved on next ' 'reconnection.')) def merge_contacts(is_checked=None):

1 0

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

02 Aug '12

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

1 0

gajim: [Darlan]. typo
by Fomin Denis 28 Jul '12

28 Jul '12

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

1 0

gajim: [Isratine Citizen]. Update Hebrew translation.
by Fomin Denis 26 Jul '12

26 Jul '12

changeset aa53d9665e2a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aa53d9665e2a description: [Isratine Citizen]. Update Hebrew translation. diffstat: po/he.po | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diffs (107 lines): diff -r 360664e64a5b -r aa53d9665e2a po/he.po --- a/po/he.po Tue Jul 24 21:56:39 2012 +0400 +++ b/po/he.po Thu Jul 26 16:06:08 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-04 22:54+0400\n" -"PO-Revision-Date: 2012-07-24 11:05+0200\n" +"PO-Revision-Date: 2012-07-26 14:47+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -5133,7 +5133,7 @@ # Is deode different from decrypt? #: ../src/common/connection.py:74 msgid "Unable to decode issuer public key" -msgstr "לא ניתן לפענח את המפתח הציבורי של המנפיק" +msgstr "לא ניתן לפענח מפתח ציבורי של מנפיק" # תעודת חתימה נכשל #: ../src/common/connection.py:75 @@ -5185,29 +5185,25 @@ msgstr "" #: ../src/common/connection.py:86 -#, fuzzy msgid "Self signed certificate" -msgstr "תעודה" +msgstr "תעודה חתומה עצמית" #: ../src/common/connection.py:87 -#, fuzzy msgid "Self signed certificate in certificate chain" -msgstr "תעודה" +msgstr "תעודה חתומה עצמית בשרשרת התעודה" #: ../src/common/connection.py:88 -#, fuzzy msgid "Unable to get local issuer certificate" -msgstr "לא ניתן לקבל תעודת מנפיק מקומי" +msgstr "לא ניתן לקבל תעודת מנפיק מקומית" #: ../src/common/connection.py:89 msgid "Unable to verify the first certificate" msgstr "לא ניתן לאמת את התעודה הראשונה" -# מחרוזת? +# מחרוזת #: ../src/common/connection.py:90 -#, fuzzy msgid "Certificate chain too long" -msgstr "שרשרת התעודה ארוכה מידי" +msgstr "שרשרת תעודה ארוכה מידי" # נפסלה #: ../src/common/connection.py:91 @@ -5243,15 +5239,13 @@ msgstr "" #: ../src/common/connection.py:98 -#, fuzzy msgid "Authority and subject key identifier mismatch" -msgstr "רשות ומזהה מפתח נושא לא תואמים" - -# ומספר סידורי של מנפיק +msgstr "רשות ונושא מזהה מפתח לא תואמים" + +# ומספר מנפיק סידורי #: ../src/common/connection.py:99 -#, fuzzy msgid "Authority and issuer serial number mismatch" -msgstr "רשות ומספר מנפיק סידורי לא תואמים" +msgstr "רשות ומספר סידורי של מנפיק לא תואמים" #: ../src/common/connection.py:100 msgid "Key usage does not include certificate signing" @@ -9841,10 +9835,10 @@ "בחרת להחריב את חדר זה.\n" "באפשרותך לציין סיבה למטה:" +# מקום מפגש #: ../src/groupchat_control.py:2104 -#, fuzzy msgid "You may also enter an alternate venue:" -msgstr "באפשרותך להזין גם venue אלטרנטיבי/ת:" +msgstr "באפשרותך להזין זירה אלטרנטיבית:" #. ask for reason #: ../src/groupchat_control.py:2299 @@ -10648,7 +10642,7 @@ #: ../src/roster_window.py:2042 msgid "Authorization has been sent" -msgstr "ההרשאה נשלחה" +msgstr "הרשאה נשלחה" #: ../src/roster_window.py:2043 #, python-format @@ -10668,7 +10662,7 @@ #: ../src/roster_window.py:2081 msgid "Authorization has been removed" -msgstr "ההרשאה הוסרה" +msgstr "הרשאה הוסרה" #: ../src/roster_window.py:2082 #, python-format

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