Commits

commits@gajim.org

17632 discussions

gajim: Ask for discovery information (and archive) after SM is e...
by Jefry Lagrange 09 Mar '13

09 Mar '13

changeset 28c7105d6176 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=28c7105d6176 description: Ask for discovery information (and archive) after SM is enabled. Fixes #7299 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 50084dd32a06 -r 28c7105d6176 src/common/connection.py --- a/src/common/connection.py Thu Feb 21 19:47:30 2013 +0100 +++ b/src/common/connection.py Sat Feb 23 11:41:36 2013 -0400 @@ -1660,7 +1660,7 @@ # If we are not resuming, we ask for discovery info # and archiving preferences - if not self.sm.resuming: + if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): self.request_message_archiving_preferences() self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='Gajim_')

1 0

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

09 Mar '13

changeset 76a5f583cfad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=76a5f583cfad description: handle the case when user press cancell at gnome keyring password dialog when saving a password. Fixes #7305 diffstat: src/common/passwords.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a82c19001268 -r 76a5f583cfad src/common/passwords.py --- a/src/common/passwords.py Sat Feb 16 23:49:39 2013 +0100 +++ b/src/common/passwords.py Tue Feb 19 13:22:49 2013 +0100 @@ -142,7 +142,8 @@ GnomeKeyring.ItemType.NETWORK_PASSWORD, display_name, attributes1, password, update) if err != GnomeKeyring.Result.OK: - if err == GnomeKeyring.Result.DENIED: + if err in (GnomeKeyring.Result.DENIED, + GnomeKeyring.Result.CANCELLED): set_storage(SimplePasswordStorage()) storage.save_password(account_name, password) return

1 0

gajim: ability to hide / show status changes in history window. ...
by Yann Leboulanger 09 Mar '13

09 Mar '13

changeset 50084dd32a06 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50084dd32a06 description: ability to hide / show status changes in history window. Fixes #7255 diffstat: data/gui/history_window.ui | 16 +++++++++++++++- src/history_window.py | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diffs (94 lines): diff -r 76a5f583cfad -r 50084dd32a06 data/gui/history_window.ui --- a/data/gui/history_window.ui Tue Feb 19 13:22:49 2013 +0100 +++ b/data/gui/history_window.ui Thu Feb 21 19:47:30 2013 +0100 @@ -210,7 +210,21 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkCheckButton" id="show_status_checkbutton"> + <property name="label" translatable="yes">_Show status changes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_status_checkbutton_toggled"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> <packing> diff -r 76a5f583cfad -r 50084dd32a06 src/history_window.py --- a/src/history_window.py Tue Feb 19 13:22:49 2013 +0100 +++ b/src/history_window.py Thu Feb 21 19:47:30 2013 +0100 @@ -77,6 +77,7 @@ self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) + self.show_status_checkbutton = xml.get_object('show_status_checkbutton') self.search_entry = xml.get_object('search_entry') self.query_liststore = xml.get_object('query_liststore') self.jid_entry = xml.get_object('query_entry') @@ -326,7 +327,7 @@ def on_calendar_day_selected(self, widget): if not self.jid: return - year, month, day = widget.get_date() # integers + year, month, day = self.calendar.get_date() # integers month = gtkgui_helpers.make_gtk_month_python_month(month) self._add_lines_for_date(year, month, day) @@ -379,6 +380,7 @@ """ self.history_buffer.set_text('') # clear the buffer first self.last_time_printout = 0 + show_status = self.show_status_checkbutton.get_active() lines = gajim.logger.get_conversation_for_date(self.jid, year, month, day, self.account) # lines holds list with tupples that have: @@ -386,6 +388,9 @@ for line in lines: # line[0] is contact_name, line[1] is time of message # line[2] is kind, line[3] is show, line[4] is message + if not show_status and line[2] in (constants.KIND_GCSTATUS, + constants.KIND_STATUS): + continue self._add_new_line(line[0], line[1], line[2], line[3], line[4], line[5]) @@ -520,6 +525,8 @@ year, month, day = self.calendar.get_date() # integers month = gtkgui_helpers.make_gtk_month_python_month(month) + show_status = self.show_status_checkbutton.get_active() + # contact_name, time, kind, show, message, subject results = gajim.logger.get_search_results_for_query( jid, text, account, year, month, day) @@ -527,6 +534,9 @@ # add "subject: | message: " in message column if kind is single # also do we need show at all? (we do not search on subject) for row in results: + if not show_status and row[2] in (constants.KIND_GCSTATUS, + constants.KIND_STATUS): + continue contact_name = row[0] if not contact_name: kind = row[2] @@ -613,6 +623,10 @@ gajim.config.set_per('accounts', self.account, 'no_log_for', ' '.join(no_log_for)) + def on_show_status_checkbutton_toggled(self, widget): + # reload logs + self.on_calendar_day_selected(None) + def open_history(self, jid, account): """ Load chat history of the specified jid

1 0

gajim: improve RTL behaviour. See #7284
by Yann Leboulanger 09 Mar '13

09 Mar '13

changeset a82c19001268 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a82c19001268 description: improve RTL behaviour. See #7284 diffstat: src/conversation_textview.py | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diffs (66 lines): diff -r 2beb33f1103e -r a82c19001268 src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 16 12:27:28 2013 +0100 +++ b/src/conversation_textview.py Sat Feb 16 23:49:39 2013 +0100 @@ -1241,17 +1241,22 @@ # We don't have tim for outgoing messages... tim = time.localtime() current_print_time = gajim.config.get('print_time') + direction_mark = i18n.paragraph_direction_mark(text) + # don't apply direction mark if it's status message + if kind == 'status': + direction_mark = '' if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim) + timestamp = direction_mark + timestamp if other_tags_for_time: buffer_.insert_with_tags_by_name(end_iter, timestamp, - *other_tags_for_time) + *other_tags_for_time) else: buffer_.insert (end_iter, timestamp) elif current_print_time == 'sometimes' and kind != 'info' and not simple: every_foo_seconds = 60 * gajim.config.get( - 'print_ichat_every_foo_minutes') + 'print_ichat_every_foo_minutes') seconds_passed = time.mktime(tim) - self.last_time_printout if seconds_passed > every_foo_seconds: self.last_time_printout = time.mktime(tim) @@ -1277,12 +1282,14 @@ else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared: - self.print_name(name, kind, other_tags_for_name) + self.print_name(name, kind, other_tags_for_name, + direction_mark=direction_mark) else: self.print_real_text(gajim.config.get( - 'chat_merge_consecutive_nickname_indent')) + 'chat_merge_consecutive_nickname_indent')) else: - self.print_name(name, kind, other_tags_for_name) + self.print_name(name, kind, other_tags_for_name, + direction_mark=direction_mark) if kind == 'incoming': text_tags.append('incomingtxt') elif kind == 'outgoing': @@ -1347,7 +1354,7 @@ end_iter = buffer_.get_end_iter() buffer_.insert_with_tags(end_iter, ' ') - def print_name(self, name, kind, other_tags_for_name): + def print_name(self, name, kind, other_tags_for_name, direction_mark=''): if name: buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() @@ -1357,8 +1364,8 @@ before_str = helpers.from_one_line(before_str) after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format = before_str + name + after_str + ' ' - buffer_.insert_with_tags_by_name(end_iter, format, *name_tags) + format_ = direction_mark + before_str + name + after_str + ' ' + buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) def print_subject(self, subject): if subject: # if we have subject, show it too!

1 0

gajim: [OlegOAndreev] add Ctrl+K support to enable roster filter...
by Yann Leboulanger 09 Mar '13

09 Mar '13

changeset 2beb33f1103e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2beb33f1103e description: [OlegOAndreev] add Ctrl+K support to enable roster filter. Fixes #7302 diffstat: src/roster_window.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diffs (45 lines): diff -r 8885c892dfc9 -r 2beb33f1103e src/roster_window.py --- a/src/roster_window.py Tue Mar 05 15:58:20 2013 +0100 +++ b/src/roster_window.py Sat Feb 16 12:27:28 2013 +0100 @@ -3588,6 +3588,8 @@ self.send_pep(account, pep_dict) dialogs.ChangeStatusMessageDialog(on_response, status) return True + elif keyval == Gdk.KEY_k: # CTRL + k + self.enable_rfilter('') def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed @@ -4479,6 +4481,10 @@ self.tree.expand_all() self.rfilter_entry.set_position(-1) + # If roster is hidden, let's temporarily show it. This can happen if user + # enables rfilter via keyboard shortcut. + self.show_roster_vbox(True) + def disable_rfilter(self): self.rfilter_enabled = False self.rfilter_entry.set_text('') @@ -4488,6 +4494,9 @@ self.tree.grab_focus() self._readjust_expand_collapse_state() + # If roster was hidden before enable_rfilter was called, hide it back. + self.on_show_roster_menuitem_toggled(self.xml.get_object('show_roster_menuitem')) + def on_roster_hpaned_notify(self, pane, gparamspec): """ Keep changing the width of the roster @@ -6717,6 +6726,11 @@ keyval, mod = Gtk.accelerator_parse('<Control>s') accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE, self.accel_group_func) + + # Setting CTRL+k to focus rfilter_entry + keyval, mod = Gtk.accelerator_parse('<Control>k') + accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE,, + self.accel_group_func) self.window.add_accel_group(accel_group) # Setting the search stuff

1 0

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

09 Mar '13

changeset cb0b33b22f7f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb0b33b22f7f description: add service line in ToplevelAgentBrowser diffstat: src/disco.py | 115 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 70 insertions(+), 45 deletions(-) diffs (173 lines): diff -r 849a8f79bdf9 -r cb0b33b22f7f 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 @@ -70,57 +70,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), } @@ -1085,11 +1085,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() @@ -1180,6 +1184,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_): """ Callback for setting the pixbuf renderer's properties @@ -1624,6 +1644,11 @@ iter_ = None cat_iter = self.model.get_iter_root() 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).decode('utf-8') @@ -1698,8 +1723,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).decode('utf-8') - 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 @@ -1708,6 +1732,7 @@ # Not in the right category, move it. self.model.remove(iter_) + old_cat = self.model.get_value(old_cat_iter, 3).decode('utf-8') # 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 849a8f79bdf9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=849a8f79bdf9 description: fix typo diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e4087fc4503a -r 849a8f79bdf9 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 @@ -1653,7 +1653,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 e4087fc4503a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e4087fc4503a 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 6540fc19fc76 -r e4087fc4503a src/chat_control.py --- a/src/chat_control.py Thu Feb 28 12:05:07 2013 +0400 +++ b/src/chat_control.py Sat Mar 09 17:49:22 2013 +0100 @@ -1644,7 +1644,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) @@ -1652,8 +1652,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 @@ -2186,9 +2187,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: @@ -2196,9 +2197,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 @@ -2206,12 +2207,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 @@ -2232,7 +2233,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 6540fc19fc76 -r e4087fc4503a src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Feb 28 12:05:07 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 6540fc19fc76 -r e4087fc4503a src/dialogs.py --- a/src/dialogs.py Thu Feb 28 12:05:07 2013 +0400 +++ b/src/dialogs.py Sat Mar 09 17:49:22 2013 +0100 @@ -5087,26 +5087,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 6540fc19fc76 -r e4087fc4503a src/features_window.py --- a/src/features_window.py Thu Feb 28 12:05:07 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 6540fc19fc76 -r e4087fc4503a src/gui_interface.py --- a/src/gui_interface.py Thu Feb 28 12:05:07 2013 +0400 +++ b/src/gui_interface.py Sat Mar 09 17:49:22 2013 +0100 @@ -654,8 +654,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) @@ -663,7 +664,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) @@ -699,9 +700,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): @@ -3006,7 +3007,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(): @@ -3020,9 +3021,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) @@ -3031,7 +3032,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 6540fc19fc76 -r e4087fc4503a src/roster_window.py --- a/src/roster_window.py Thu Feb 28 12:05:07 2013 +0400 +++ b/src/roster_window.py Sat Mar 09 17:49:22 2013 +0100 @@ -2117,7 +2117,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

python-nbxmpp: fix initilizing errnum list
by Yann Leboulanger 05 Mar '13

05 Mar '13

changeset 1d2549cf39c8 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=1d2549cf39c8 description: fix initilizing errnum list diffstat: nbxmpp/tls_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r af74094962c7 -r 1d2549cf39c8 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Tue Feb 12 20:48:40 2013 +0400 +++ b/nbxmpp/tls_nb.py Tue Mar 05 17:26:57 2013 +0100 @@ -397,7 +397,7 @@ flags |= 16384 tcpsock._sslContext.set_options(flags) - tcpsock.ssl_errnum = [0] + tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) store = tcpsock._sslContext.get_cert_store()

1 0

gajim: Fix Jingle XTLS certificate creation.
by Emmanuel Gil Peyrot 05 Mar '13

05 Mar '13

changeset 8885c892dfc9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8885c892dfc9 description: Fix Jingle XTLS certificate creation. diffstat: src/common/jingle_xtls.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (18 lines): diff -r a4a874736cfd -r 8885c892dfc9 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Thu Feb 28 12:05:07 2013 +0400 +++ b/src/common/jingle_xtls.py Tue Mar 05 15:58:20 2013 +0100 @@ -236,10 +236,10 @@ key = createKeyPair(TYPE_RSA, 1024) req = createCertRequest(key, CN=CN) cert = createCertificate(req, req, key, 0, 0, 60*60*24*365*5) # five years - open(filepath + '.pkey', 'w').write(crypto.dump_privatekey( - crypto.FILETYPE_PEM, key)) - open(filepath + '.cert', 'w').write(crypto.dump_certificate( - crypto.FILETYPE_PEM, cert)) + with open(filepath + '.pkey', 'wb') as f: + f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) + with open(filepath + '.cert', 'wb') as f: + f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) if __name__ == '__main__':

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