Commits

commits@gajim.org

17632 discussions

gajim: compare rfilter string in unicode rather that in str. Fix...
by Yann Leboulanger 10 Mar '13

10 Mar '13

changeset b41ccab14a49 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b41ccab14a49 description: compare rfilter string in unicode rather that in str. Fixes #7300 diffstat: src/roster_window.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diffs (56 lines): diff -r a04b50b4ae09 -r b41ccab14a49 src/roster_window.py --- a/src/roster_window.py Tue Feb 19 13:22:49 2013 +0100 +++ b/src/roster_window.py Thu Feb 21 19:03:20 2013 +0100 @@ -1653,10 +1653,12 @@ if model.iter_has_child(titer): iter_c = model.iter_children(titer) while iter_c: - if self.rfilter_string in model[iter_c][C_NAME].lower(): + if self.rfilter_string in model[iter_c][C_NAME].decode( + 'utf-8').lower(): return True iter_c = model.iter_next(iter_c) - return self.rfilter_string in model[titer][C_NAME].lower() + return self.rfilter_string in model[titer][C_NAME].decode( + 'utf-8').lower() if gajim.config.get('showoffline'): return True bb_jid = None @@ -1681,7 +1683,8 @@ return self.contact_is_visible(contact, account) if type_ == 'agent': if self.rfilter_enabled: - return self.rfilter_string in model[titer][C_NAME].lower() + return self.rfilter_string in model[titer][C_NAME].decode( + 'utf-8').lower() contact = gajim.contacts.get_contact_with_highest_priority(account, jid) return self.contact_has_pending_roster_events(contact, account) or \ @@ -1689,7 +1692,8 @@ (gajim.account_is_connected(account) or \ gajim.config.get('showoffline'))) if type_ == 'groupchat' and self.rfilter_enabled: - return self.rfilter_string in model[titer][C_NAME].lower() + return self.rfilter_string in model[titer][C_NAME].decode('utf-8').\ + lower() return True def _compareIters(self, model, iter1, iter2, data=None): @@ -4383,7 +4387,7 @@ def on_rfilter_entry_changed(self, widget): """ When we update the content of the filter """ - self.rfilter_string = widget.get_text().lower() + self.rfilter_string = widget.get_text().decode('utf-8').lower() if self.rfilter_string == '': self.disable_rfilter() self.refilter_shown_roster_items() @@ -4391,7 +4395,7 @@ self.tree.get_selection().unselect_all() def _func(model, path, iter_): if model[iter_][C_TYPE] == 'contact' and self.rfilter_string in \ - model[iter_][C_NAME].lower(): + model[iter_][C_NAME].decode('utf-8').lower(): col = self.tree.get_column(0) self.tree.set_cursor_on_cell(path, col) return True

1 0

gajim: handle the case when user press cancell at gnome keyring ...
by Yann Leboulanger 10 Mar '13

10 Mar '13

changeset a04b50b4ae09 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a04b50b4ae09 description: handle the case when user press cancell at gnome keyring password dialog when saving a password. Fixes #7305 diffstat: src/common/passwords.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (22 lines): diff -r 35a555c4a107 -r a04b50b4ae09 src/common/passwords.py --- a/src/common/passwords.py Sun Feb 17 12:39:50 2013 +0100 +++ b/src/common/passwords.py Tue Feb 19 13:22:49 2013 +0100 @@ -126,14 +126,14 @@ password = str() try: auth_token = gnomekeyring.item_create_sync( - self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, - display_name, attributes1, password, update) - except gnomekeyring.DeniedError: + self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, display_name, + attributes1, password, update) + except (gnomekeyring.DeniedError, gnomekeyring.CancelledError): set_storage(SimplePasswordStorage()) storage.save_password(account_name, password) return gajim.config.set_per('accounts', account_name, 'password', - 'gnomekeyring:') + 'gnomekeyring:') if account_name in gajim.connections: gajim.connections[account_name].password = password

1 0

gajim: Fix roster size(gajim in one window mode) in fullscreen m...
by Denis Fomin 10 Mar '13

10 Mar '13

changeset b16aff279c02 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b16aff279c02 description: Fix roster size(gajim in one window mode) in fullscreen mode and in tiling wm. Fixes #7315 diffstat: src/common/config.py | 1 + src/message_window.py | 2 +- src/roster_window.py | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diffs (34 lines): diff -r 7d89886668bf -r b16aff279c02 src/common/config.py --- a/src/common/config.py Sun Mar 10 22:13:16 2013 +0400 +++ b/src/common/config.py Sun Mar 10 22:18:53 2013 +0400 @@ -162,6 +162,7 @@ 'roster_y-position': [ opt_int, 0 ], 'roster_width': [ opt_int, 200 ], 'roster_height': [ opt_int, 400 ], + 'roster_hpaned_position': [opt_int, 200], 'history_window_width': [ opt_int, 650 ], 'history_window_height': [ opt_int, 450 ], 'history_window_x-position': [ opt_int, 0 ], diff -r 7d89886668bf -r b16aff279c02 src/message_window.py --- a/src/message_window.py Sun Mar 10 22:13:16 2013 +0400 +++ b/src/message_window.py Sun Mar 10 22:18:53 2013 +0400 @@ -999,7 +999,7 @@ return win.resize(size[0], size[1]) if win.parent_paned: - win.parent_paned.set_position(parent_size[0]) + win.parent_paned.set_position(gajim.config.get('roster_hpaned_position')) def _position_window(self, win, acct, type_): """ diff -r 7d89886668bf -r b16aff279c02 src/roster_window.py --- a/src/roster_window.py Sun Mar 10 22:13:16 2013 +0400 +++ b/src/roster_window.py Sun Mar 10 22:18:53 2013 +0400 @@ -4491,6 +4491,7 @@ if gparamspec.name == 'position': roster_width = pane.get_child1().allocation.width gajim.config.set('roster_width', roster_width) + gajim.config.set('roster_hpaned_position', pane.get_position()) ################################################################################ ### Drag and Drop handling

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 10 Mar '13

10 Mar '13

changeset 7d89886668bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7d89886668bf description: [Darlan] Update Hebrew translation diffstat: po/he.po | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diffs (114 lines): diff -r cb0b33b22f7f -r 7d89886668bf po/he.po --- a/po/he.po Sat Mar 09 20:57:16 2013 +0100 +++ b/po/he.po Sun Mar 10 22:13:16 2013 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-11-15 14:27+0400\n" -"PO-Revision-Date: 2013-01-06 13:21+0200\n" +"PO-Revision-Date: 2013-02-22 00:22+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -2357,13 +2357,14 @@ msgid "Style" msgstr "סגנון" +# התקן #: ../data/gui/preferences_window.ui.h:107 msgid "Audio input device" -msgstr "תקן קלט שמע" +msgstr "מכשיר קלט שמע" #: ../data/gui/preferences_window.ui.h:108 msgid "Audio output device" -msgstr "תקן פלט שמע" +msgstr "מכשיר פלט שמע" #: ../data/gui/preferences_window.ui.h:109 msgid "Audio" @@ -2371,11 +2372,11 @@ #: ../data/gui/preferences_window.ui.h:110 msgid "Video input device" -msgstr "תקן קלט וידאו" +msgstr "מכשיר קלט וידאו" #: ../data/gui/preferences_window.ui.h:111 msgid "Video output device" -msgstr "תקן פלט וידאו" +msgstr "מכשיר פלט וידאו" #: ../data/gui/preferences_window.ui.h:112 msgid "Video framerate" @@ -3089,26 +3090,25 @@ msgid "Jabber Traffic" msgstr "תעבורת Jabber" -# החבאת #: ../data/gui/xml_console_window.ui.h:4 msgid "Hide IN stanzas" -msgstr "הסתרת סטנזות IN" +msgstr "הסתר סטנזות IN" #: ../data/gui/xml_console_window.ui.h:5 msgid "Hide OUT stanzas" -msgstr "הסתרת סטנזות OUT" +msgstr "הסתר סטנזות OUT" #: ../data/gui/xml_console_window.ui.h:6 msgid "Hide Presence stanzas" -msgstr "הסתרת סטנזות נוכחות" +msgstr "הסתר סטנזות נוכחות" #: ../data/gui/xml_console_window.ui.h:7 msgid "Hide IQ stanzas" -msgstr "הסתרת סטנזות IQ" +msgstr "הסתר סטנזות IQ" #: ../data/gui/xml_console_window.ui.h:8 msgid "Hide Message stanzas" -msgstr "הסתרת סטנזות הודעה" +msgstr "הסתר סטנזות הודעה" #: ../data/gui/xml_console_window.ui.h:9 msgid "Filter" @@ -5626,7 +5626,7 @@ # קיימת אי תיאום עם/ב #: ../src/common/connection.py:97 msgid "Subject issuer mismatch" -msgstr "" +msgstr "נושא מנפיק לא תואם" #: ../src/common/connection.py:98 msgid "Authority and subject key identifier mismatch" @@ -6423,7 +6423,7 @@ #: ../src/common/multimedia_helpers.py:39 msgid " Default device" -msgstr "תקן משתמט" +msgstr "מכשיר משתמט" #. Test src #: ../src/common/multimedia_helpers.py:60 @@ -7405,10 +7405,9 @@ msgid "Name" msgstr "שם" -# התחבר/י מחדש כעת? #: ../src/config.py:1654 msgid "Relogin now?" -msgstr "התחברות מחודשת?" +msgstr "להתחבר מחדש כעת?" #: ../src/config.py:1655 msgid "If you want all the changes to apply instantly, you must relogin." @@ -9053,7 +9052,7 @@ #: ../src/features_window.py:81 msgid "Requires nslookup to use SRV records." -msgstr "יש צורך בהתקנת nslookup גדי לעשות שימוש ברשומות SRV." +msgstr "יש צורך בהתקנת nslookup כדי לעשות שימוש ברשומות SRV." #: ../src/features_window.py:82 msgid "Spell Checker"

1 0

gajim: remove some wrong decode()
by Yann Leboulanger 10 Mar '13

10 Mar '13

changeset 4eb460d81866 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4eb460d81866 description: remove some wrong decode() diffstat: src/config.py | 3 +-- src/disco.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diffs (27 lines): diff -r 0158c73bb94e -r 4eb460d81866 src/config.py --- a/src/config.py Sun Mar 10 15:05:31 2013 +0100 +++ b/src/config.py Sun Mar 10 16:59:16 2013 +0100 @@ -2996,8 +2996,7 @@ ['reason'] != model[iter_][1]): users_dict[jid] = {'affiliation': affiliation} if affiliation == 'outcast': - users_dict[jid]['reason'] = model[iter_][1].decode( - 'utf-8') + users_dict[jid]['reason'] = model[iter_][1] iter_ = model.iter_next(iter_) # remove removed one for jid in self.start_users_dict[affiliation]: diff -r 0158c73bb94e -r 4eb460d81866 src/disco.py --- a/src/disco.py Sun Mar 10 15:05:31 2013 +0100 +++ b/src/disco.py Sun Mar 10 16:59:16 2013 +0100 @@ -1649,8 +1649,8 @@ iter_ = None cat_iter = self.model.get_iter_first() while cat_iter and not iter_: - cjid = self.model.get_value(cat_iter, 0).decode('utf-8') - cnode = self.model.get_value(cat_iter, 1).decode('utf-8') + cjid = self.model.get_value(cat_iter, 0) + cnode = self.model.get_value(cat_iter, 1) if jid == cjid and node == cnode: iter_ = cat_iter break

1 0

python-nbxmpp: Ask for discovery information (and archive) after...
by Jefry Lagrange 10 Mar '13

10 Mar '13

changeset 3ad52b1e1b93 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3ad52b1e1b93 description: Ask for discovery information (and archive) after SM is enabled. Fixes #7299 diffstat: nbxmpp/auth_nb.py | 1 + nbxmpp/smacks.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (52 lines): diff -r 1d2549cf39c8 -r 3ad52b1e1b93 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Tue Mar 05 17:26:57 2013 +0100 +++ b/nbxmpp/auth_nb.py Sat Feb 23 11:42:07 2013 -0400 @@ -703,6 +703,7 @@ sm = self._owner._caller.sm if self.supports_sm: # starts negociation + sm.supports_sm = True sm.set_owner(self._owner) sm.negociate() self._owner.Dispatcher.sm = sm diff -r 1d2549cf39c8 -r 3ad52b1e1b93 nbxmpp/smacks.py --- a/nbxmpp/smacks.py Tue Mar 05 17:26:57 2013 +0100 +++ b/nbxmpp/smacks.py Sat Feb 23 11:42:07 2013 -0400 @@ -25,10 +25,11 @@ self.resuming = False self.enabled = False # If SM is enabled self.location = None + self.failed_resume = False # If last resuming attempt failed + self.supports_sm = False # If server supports sm def set_owner(self, owner): self._owner = owner - # Register handlers owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('enabled', self._neg_response, @@ -47,13 +48,14 @@ if r == 'true' or r == 'True' or r == '1': self.resumption = True self.session_id = stanza.getAttr('id') - if r == 'false' or r == 'False' or r == '0': self.negociate(False) - l = stanza.getAttr('location') if l: self.location = l + if self.failed_resume: + self.con._discover_server_at_connection(self.con.connection) + self.failed_resume = False def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info @@ -119,6 +121,7 @@ # we need to bind a resource self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None) + self.failed_resume = True return # Doesn't support resumption

1 0

gajim: fix typo
by Yann Leboulanger 10 Mar '13

10 Mar '13

changeset 0158c73bb94e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0158c73bb94e description: fix typo diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ac128c027be1 -r 0158c73bb94e src/roster_window.py --- a/src/roster_window.py Sat Mar 09 20:57:16 2013 +0100 +++ b/src/roster_window.py Sun Mar 10 15:05:31 2013 +0100 @@ -6729,7 +6729,7 @@ # Setting CTRL+k to focus rfilter_entry keyval, mod = Gtk.accelerator_parse('<Control>k') - accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE,, + accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE, self.accel_group_func) self.window.add_accel_group(accel_group)

1 0

gajim: add service line in ToplevelAgentBrowser
by Yann Leboulanger 09 Mar '13

09 Mar '13

changeset ac128c027be1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac128c027be1 description: add service line in ToplevelAgentBrowser diffstat: src/disco.py | 115 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 70 insertions(+), 45 deletions(-) diffs (173 lines): diff -r 57fa869129b7 -r ac128c027be1 src/disco.py --- a/src/disco.py Sat Mar 09 18:16:14 2013 +0100 +++ b/src/disco.py Sat Mar 09 20:57:16 2013 +0100 @@ -72,57 +72,57 @@ # when it advertises disco as it's feature, False means it's never browsable. def _gen_agent_type_info(): return { - # Defaults - (0, 0): (None, None), + # Defaults + (0, 0): (None, None), - # Jabber server - ('server', 'im'): (ToplevelAgentBrowser, 'jabber'), - ('services', 'jabber'): (ToplevelAgentBrowser, 'jabber'), - ('hierarchy', 'branch'): (AgentBrowser, 'jabber'), + # Jabber server + ('server', 'im'): (ToplevelAgentBrowser, 'jabber'), + ('services', 'jabber'): (ToplevelAgentBrowser, 'jabber'), + ('hierarchy', 'branch'): (AgentBrowser, 'jabber'), - # Services - ('conference', 'text'): (MucBrowser, 'conference'), - ('headline', 'rss'): (AgentBrowser, 'rss'), - ('headline', 'weather'): (False, 'weather'), - ('gateway', 'weather'): (False, 'weather'), - ('_jid', 'weather'): (False, 'weather'), - ('gateway', 'sip'): (False, 'sip'), - ('directory', 'user'): (None, 'jud'), - ('pubsub', 'generic'): (PubSubBrowser, 'pubsub'), - ('pubsub', 'service'): (PubSubBrowser, 'pubsub'), - ('proxy', 'bytestreams'): (None, 'bytestreams'), # Socks5 FT proxy - ('headline', 'newmail'): (ToplevelAgentBrowser, 'mail'), + # Services + ('conference', 'text'): (MucBrowser, 'conference'), + ('headline', 'rss'): (AgentBrowser, 'rss'), + ('headline', 'weather'): (False, 'weather'), + ('gateway', 'weather'): (False, 'weather'), + ('_jid', 'weather'): (False, 'weather'), + ('gateway', 'sip'): (False, 'sip'), + ('directory', 'user'): (None, 'jud'), + ('pubsub', 'generic'): (PubSubBrowser, 'pubsub'), + ('pubsub', 'service'): (PubSubBrowser, 'pubsub'), + ('proxy', 'bytestreams'): (None, 'bytestreams'), # Socks5 FT proxy + ('headline', 'newmail'): (ToplevelAgentBrowser, 'mail'), - # Transports - ('conference', 'irc'): (ToplevelAgentBrowser, 'irc'), - ('_jid', 'irc'): (False, 'irc'), - ('gateway', 'aim'): (False, 'aim'), - ('_jid', 'aim'): (False, 'aim'), - ('gateway', 'gadu-gadu'): (False, 'gadu-gadu'), - ('_jid', 'gadugadu'): (False, 'gadu-gadu'), - ('gateway', 'http-ws'): (False, 'http-ws'), - ('gateway', 'icq'): (False, 'icq'), - ('_jid', 'icq'): (False, 'icq'), - ('gateway', 'msn'): (False, 'msn'), - ('_jid', 'msn'): (False, 'msn'), - ('gateway', 'sms'): (False, 'sms'), - ('_jid', 'sms'): (False, 'sms'), - ('gateway', 'smtp'): (False, 'mail'), - ('gateway', 'yahoo'): (False, 'yahoo'), - ('_jid', 'yahoo'): (False, 'yahoo'), - ('gateway', 'mrim'): (False, 'mrim'), - ('_jid', 'mrim'): (False, 'mrim'), - ('gateway', 'facebook'): (False, 'facebook'), - ('_jid', 'facebook'): (False, 'facebook'), + # Transports + ('conference', 'irc'): (ToplevelAgentBrowser, 'irc'), + ('_jid', 'irc'): (False, 'irc'), + ('gateway', 'aim'): (False, 'aim'), + ('_jid', 'aim'): (False, 'aim'), + ('gateway', 'gadu-gadu'): (False, 'gadu-gadu'), + ('_jid', 'gadugadu'): (False, 'gadu-gadu'), + ('gateway', 'http-ws'): (False, 'http-ws'), + ('gateway', 'icq'): (False, 'icq'), + ('_jid', 'icq'): (False, 'icq'), + ('gateway', 'msn'): (False, 'msn'), + ('_jid', 'msn'): (False, 'msn'), + ('gateway', 'sms'): (False, 'sms'), + ('_jid', 'sms'): (False, 'sms'), + ('gateway', 'smtp'): (False, 'mail'), + ('gateway', 'yahoo'): (False, 'yahoo'), + ('_jid', 'yahoo'): (False, 'yahoo'), + ('gateway', 'mrim'): (False, 'mrim'), + ('_jid', 'mrim'): (False, 'mrim'), + ('gateway', 'facebook'): (False, 'facebook'), + ('_jid', 'facebook'): (False, 'facebook'), } # Category type to "human-readable" description string, and sort priority _cat_to_descr = { - 'other': (_('Others'), 2), - 'gateway': (_('Transports'), 0), - '_jid': (_('Transports'), 0), + 'other': (_('Others'), 2), + 'gateway': (_('Transports'), 0), + '_jid': (_('Transports'), 0), #conference is a category for listing mostly groupchats in service discovery - 'conference': (_('Conference'), 1), + 'conference': (_('Conference'), 1), } @@ -1088,11 +1088,15 @@ return iter_ return None + def add_self_line(self): + pass + def _agent_items(self, jid, node, items, force): """ Callback for when we receive a list of agent items """ self.model.clear() + self.add_self_line() self._total_items = 0 GObject.source_remove(self._pulse_timeout) self.window.progressbar.hide() @@ -1183,6 +1187,22 @@ self._view_signals = [] self._scroll_signal = None + def add_self_line(self): + addr = get_agent_address(self.jid, self.node) + descr = "%s" % addr + # Guess which kind of service this is + identities = [] + type_ = gajim.get_transport_name_from_jid(self.jid, + use_config_setting=False) + if type_: + identity = {'category': '_jid', 'type': type_} + identities.append(identity) + # Set the pixmap for the row + pix = self.cache.get_icon(identities) + self.model.append(None, (self.jid, self.node, pix, descr, 1)) + # Grab info on the service + self.cache.get_info(self.jid, self.node, self._agent_info, force=False) + def _pixbuf_renderer_data_func(self, col, cell, model, iter_, data=None): """ Callback for setting the pixbuf renderer's properties @@ -1629,6 +1649,11 @@ iter_ = None cat_iter = self.model.get_iter_first() while cat_iter and not iter_: + cjid = self.model.get_value(cat_iter, 0).decode('utf-8') + cnode = self.model.get_value(cat_iter, 1).decode('utf-8') + if jid == cjid and node == cnode: + iter_ = cat_iter + break iter_ = self.model.iter_children(cat_iter) while iter_: cjid = self.model.get_value(iter_, 0) @@ -1703,8 +1728,7 @@ # Check if we have to move categories old_cat_iter = self.model.iter_parent(iter_) - old_cat = self.model.get_value(old_cat_iter, 3) - if self.model.get_value(old_cat_iter, 3) == cat: + if not old_cat_iter or self.model.get_value(old_cat_iter, 3) == cat: # Already in the right category, just update self.model[iter_][2] = pix self.model[iter_][3] = descr @@ -1713,6 +1737,7 @@ # Not in the right category, move it. self.model.remove(iter_) + old_cat = self.model.get_value(old_cat_iter, 3) # Check if the old category is empty if not self.model.iter_is_valid(old_cat_iter): old_cat_iter = self._find_category(old_cat)

1 0

gajim: fix typo
by Yann Leboulanger 09 Mar '13

09 Mar '13

changeset 57fa869129b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=57fa869129b7 description: fix typo diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c7d57abcb562 -r 57fa869129b7 src/chat_control.py --- a/src/chat_control.py Sat Mar 09 17:49:22 2013 +0100 +++ b/src/chat_control.py Sat Mar 09 18:16:14 2013 +0100 @@ -1692,7 +1692,7 @@ self.account, 'log_encrypted_sessions') # GPG is always authenticated as we use GPG's WoT self._show_lock_image(self.gpg_is_active, 'OpenPGP', - self.gpg_is_active, self.session and self.session.is_loggable() + self.gpg_is_active, self.session and self.session.is_loggable(), True) self.update_ui()

1 0

gajim: GPG -> OpenPGP. Fixes #7312
by Yann Leboulanger 09 Mar '13

09 Mar '13

changeset c7d57abcb562 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7d57abcb562 description: GPG -> OpenPGP. Fixes #7312 diffstat: src/chat_control.py | 29 +++++++++++++------------- src/command_system/implementation/standard.py | 2 +- src/dialogs.py | 18 ++++++++-------- src/features_window.py | 4 +- src/gui_interface.py | 23 +++++++++++---------- src/roster_window.py | 2 +- 6 files changed, 40 insertions(+), 38 deletions(-) diffs (221 lines): diff -r 28c7105d6176 -r c7d57abcb562 src/chat_control.py --- a/src/chat_control.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/chat_control.py Sat Mar 09 17:49:22 2013 +0100 @@ -1683,7 +1683,7 @@ gajim.connections[self.account].USE_GPG: self.gpg_is_active = True gajim.encrypted_chats[self.account].append(contact.jid) - msg = _('GPG encryption enabled') + msg = _('OpenPGP encryption enabled') ChatControlBase.print_conversation_line(self, msg, 'status', '', None) @@ -1691,8 +1691,9 @@ self.session.loggable = gajim.config.get_per('accounts', self.account, 'log_encrypted_sessions') # GPG is always authenticated as we use GPG's WoT - self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, - self.session and self.session.is_loggable(), True) + self._show_lock_image(self.gpg_is_active, 'OpenPGP', + self.gpg_is_active, self.session and self.session.is_loggable() + True) self.update_ui() # restore previous conversation @@ -2226,9 +2227,9 @@ def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: - dialogs.ErrorDialog(_('No GPG key assigned'), - _('No GPG key is assigned to this contact. So you cannot ' - 'encrypt messages with GPG.')) + dialogs.ErrorDialog(_('No OpenPGP key assigned'), + _('No OpenPGP key is assigned to this contact. So you cannot ' + 'encrypt messages with OpenPGP.')) return ec = gajim.encrypted_chats[self.account] if self.gpg_is_active: @@ -2236,9 +2237,9 @@ ec.remove(self.contact.jid) self.gpg_is_active = False loggable = False - msg = _('GPG encryption disabled') - ChatControlBase.print_conversation_line(self, msg, - 'status', '', None) + msg = _('OpenPGP encryption disabled') + ChatControlBase.print_conversation_line(self, msg, 'status', '', + None) if self.session: self.session.loggable = True @@ -2246,12 +2247,12 @@ # Enable encryption ec.append(self.contact.jid) self.gpg_is_active = True - msg = _('GPG encryption enabled') - ChatControlBase.print_conversation_line(self, msg, - 'status', '', None) + msg = _('OpenPGP encryption enabled') + ChatControlBase.print_conversation_line(self, msg, 'status', '', + None) loggable = gajim.config.get_per('accounts', self.account, - 'log_encrypted_sessions') + 'log_encrypted_sessions') if self.session: self.session.loggable = loggable @@ -2272,7 +2273,7 @@ gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', self.gpg_is_active) - self._show_lock_image(self.gpg_is_active, 'GPG', + self._show_lock_image(self.gpg_is_active, 'OpenPGP', self.gpg_is_active, loggable, True) def _show_lock_image(self, visible, enc_type='', enc_enabled=False, diff -r 28c7105d6176 -r c7d57abcb562 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/command_system/implementation/standard.py Sat Mar 09 17:49:22 2013 +0100 @@ -186,7 +186,7 @@ self.conv_textview.clear() @command - @doc(_("Toggle the GPG encryption")) + @doc(_("Toggle the OpenPGP encryption")) def gpg(self): self._toggle_gpg() diff -r 28c7105d6176 -r c7d57abcb562 src/dialogs.py --- a/src/dialogs.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/dialogs.py Sat Mar 09 17:49:22 2013 +0100 @@ -5127,26 +5127,26 @@ if keyID.endswith('MISMATCH'): verification_status = _('''Contact's identity NOT verified''') info = _('The contact\'s key (%s) does not match the key ' - 'assigned in Gajim.') % keyID[:8] + 'assigned in Gajim.') % keyID[:8] image = 'gajim-security_low' elif not keyID: # No key assigned nor a key is used by remote contact - verification_status = _('No GPG key assigned') - info = _('No GPG key is assigned to this contact. So you cannot ' - 'encrypt messages.') + verification_status = _('No OpenPGP key assigned') + info = _('No OpenPGP key is assigned to this contact. So you cannot' + ' encrypt messages.') image = 'gajim-security_low' else: error = gajim.connections[account].gpg.encrypt('test', [keyID])[1] if error: verification_status = _('''Contact's identity NOT verified''') - info = _('GPG key is assigned to this contact, but you do not ' - 'trust his key, so message cannot be encrypted. Use ' - 'your GPG client to trust this key.') + info = _('OpenPGP key is assigned to this contact, but you ' + 'do not trust his key, so message cannot be ' + 'encrypted. Use your OpenPGP client to trust this key.') image = 'gajim-security_low' else: verification_status = _('''Contact's identity verified''') - info = _('GPG Key is assigned to this contact, and you trust his ' - 'key, so messages will be encrypted.') + info = _('OpenPGP Key is assigned to this contact, and you ' + 'trust his key, so messages will be encrypted.') image = 'gajim-security_high' status_label.set_markup('%s' % \ diff -r 28c7105d6176 -r c7d57abcb562 src/features_window.py --- a/src/features_window.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/features_window.py Sat Mar 09 17:49:22 2013 +0100 @@ -59,8 +59,8 @@ _('A script to control Gajim via commandline.'), _('Requires python-dbus.'), _('Feature not available under Windows.')), - _('OpenGPG message encryption'): (self.gpg_available, - _('Encrypting chat messages with gpg keys.'), + _('OpenPGP message encryption'): (self.gpg_available, + _('Encrypting chat messages with OpenPGP keys.'), _('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'), _('Requires gpg.exe in PATH.')), _('Network-manager'): (self.network_manager_available, diff -r 28c7105d6176 -r c7d57abcb562 src/gui_interface.py --- a/src/gui_interface.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/gui_interface.py Sat Mar 09 17:49:22 2013 +0100 @@ -655,8 +655,9 @@ def handle_event_bad_gpg_passphrase(self, obj): #('BAD_PASSPHRASE', account, ()) if obj.use_gpg_agent: - sectext = _('You configured Gajim to use GPG agent, but there is no' - ' GPG agent running or it returned a wrong passphrase.\n') + sectext = _('You configured Gajim to use OpenPGP agent, but there ' + 'is no OpenPGP agent running or it returned a wrong passphrase.' + '\n') sectext += _('You are currently connected without your OpenPGP ' 'key.') dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) @@ -664,7 +665,7 @@ path = gtkgui_helpers.get_icon_path('gajim-warning', 48) account = obj.conn.name notify.popup('warning', account, account, 'warning', path, - _('OpenGPG Passphrase Incorrect'), + _('OpenPGP Passphrase Incorrect'), _('You are currently connected without your OpenPGP key.')) self.forget_gpg_passphrase(obj.keyID) @@ -700,9 +701,9 @@ def on_no(): obj.callback(False) - dialogs.YesNoDialog(_('GPG key not trusted'), _('The GPG key used to ' - 'encrypt this chat is not trusted. Do you really want to encrypt ' - 'this message?'), checktext=_('_Do not ask me again'), + dialogs.YesNoDialog(_('OpenPGP key not trusted'), _('The OpenPGP key ' + 'used to encrypt this chat is not trusted. Do you really want to ' + 'encrypt this message?'), checktext=_('_Do not ask me again'), on_response_yes=on_yes, on_response_no=on_no) def handle_event_password_required(self, obj): @@ -2978,7 +2979,7 @@ def create_dialog(self, account): title = _('Passphrase Required') - second = _('Enter GPG key passphrase for key %(keyid)s (account ' + second = _('Enter OpenPGP key passphrase for key %(keyid)s (account ' '%(account)s).') % {'keyid': self.keyid, 'account': account} def _cancel(): @@ -2992,9 +2993,9 @@ self.complete(passphrase) return elif result == 'expired': - dialogs.ErrorDialog(_('GPG key expired'), - _('Your GPG key has expired, you will be connected to %s ' - 'without OpenPGP.') % account) + dialogs.ErrorDialog(_('OpenPGP key expired'), + _('Your OpenPGP key has expired, you will be connected to ' + '%s without OpenPGP.') % account) # Don't try to connect with GPG gajim.connections[account].continue_connect_info[2] = False self.complete(None) @@ -3003,7 +3004,7 @@ if count < 3: # ask again dialogs.PassphraseDialog(_('Wrong Passphrase'), - _('Please retype your GPG passphrase or press Cancel.'), + _('Please retype your OpenPGP passphrase or press Cancel.'), ok_handler=(_ok, count + 1), cancel_handler=_cancel) else: # user failed 3 times, continue without GPG diff -r 28c7105d6176 -r c7d57abcb562 src/roster_window.py --- a/src/roster_window.py Sat Feb 23 11:41:36 2013 -0400 +++ b/src/roster_window.py Sat Mar 09 17:49:22 2013 +0100 @@ -2129,7 +2129,7 @@ keyid = gajim.config.get_per('accounts', account, 'keyid') if keyid and not gajim.connections[account].gpg: - dialogs.WarningDialog(_('GPG is not usable'), + dialogs.WarningDialog(_('OpenPGP is not usable'), _('You will be connected to %s without OpenPGP.') % \ account)

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