Commits June 2017

commits@gajim.org

1 participants
45 discussions

[Git][gajim/gajim][master] show all previous corrected messages. Fixes #8669
by Yann Leboulanger 28 Jun '17

28 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6d9f82d8 by Yann Leboulanger at 2017-06-28T14:53:26+02:00 show all previous corrected messages. Fixes #8669 - - - - - 1 changed file: - src/conversation_textview.py Changes: ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -1126,9 +1126,15 @@ class ConversationTextview(GObject.GObject): try: index, insert_mark, old_txt = \ self.correct_message(correct_id, kind, name) - self.corrected_text_list[msg_stanza_id] = \ - '<b>Message corrected. Previous message:</b>\n{}' \ - .format(GLib.markup_escape_text(old_txt)) + if correct_id in self.corrected_text_list: + self.corrected_text_list[msg_stanza_id] = \ + self.corrected_text_list[correct_id] + '\n{}' \ + .format(GLib.markup_escape_text(old_txt)) + del self.corrected_text_list[correct_id] + else: + self.corrected_text_list[msg_stanza_id] = \ + '<b>Message corrected. Previous message:</b>\n{}' \ + .format(GLib.markup_escape_text(old_txt)) corrected = True except TypeError: log.debug('Message was not corrected !') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6d9f82d827bb3daed84bc5982fdca70d04…

1 0

[Git][gajim/gajim][master] Only use GStreamer when Farstream is available
by Philipp Hörist 27 Jun '17

27 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd3a0c8a by Philipp Hörist at 2017-06-28T00:43:44+02:00 Only use GStreamer when Farstream is available To use GStreamer we need to call Gst.Init(). We call Gst.Init() only when Farstream is available. - - - - - 1 changed file: - src/config.py Changes: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -439,7 +439,7 @@ class PreferencesWindow: if config == value: combobox.set_active(index) - if HAS_GST: + if HAS_GST and gajim.HAVE_FARSTREAM: create_av_combobox('audio_input', AudioInputManager().get_devices()) create_av_combobox('audio_output', AudioOutputManager().get_devices( )) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd3a0c8ac6a81ccfa6aaf8cabe711aa009…

1 0

[Git][gajim/gajim][master] Add LMC to common features
by Philipp Hörist 27 Jun '17

27 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 923bbc87 by Philipp Hörist at 2017-06-28T00:06:43+02:00 Add LMC to common features - - - - - 1 changed file: - src/common/gajim.py Changes: ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -255,7 +255,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] + nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT] # Optional features gajim supports per account gajim_optional_features = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/923bbc87a2d2f860e9b4e521d140880361…

1 0

[Git][gajim/gajim][master] Add new extension point method
by Philipp Hörist 27 Jun '17

27 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55889d04 by Philipp Hörist at 2017-06-27T20:51:55+02:00 Add new extension point method - - - - - 7 changed files: - src/chat_control.py - src/chat_control_base.py - src/common/connection.py - src/common/connection_handlers.py - src/conversation_textview.py - src/groupchat_control.py - src/plugins/pluginmanager.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -851,7 +851,7 @@ class ChatControl(ChatControlBase): 'authenticated': False} if self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_state' + self.encryption, self, encryption_state) self._show_lock_image(**encryption_state) @@ -877,7 +877,7 @@ class ChatControl(ChatControlBase): def _on_authentication_button_clicked(self, widget): if self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) def send_message(self, message, keyID='', chatstate=None, xhtml=None, @@ -888,7 +888,7 @@ class ChatControl(ChatControlBase): if self.encryption: self.sendmessage = True - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'send_message' + self.encryption, self) if not self.sendmessage: return @@ -1399,7 +1399,7 @@ class ChatControl(ChatControlBase): def _on_message_tv_buffer_changed(self, textbuffer): super()._on_message_tv_buffer_changed(textbuffer) if textbuffer.get_char_count() and self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'typing' + self.encryption, self) if (not self.session or not self.session.status) and \ gajim.connections[self.account].archiving_136_supported: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -527,8 +527,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self) gajim.plugin_manager.remove_gui_extension_point( 'chat_control_base_draw_banner', self) - gajim.plugin_manager.remove_gui_extension_point('print_special_text', - self) gajim.ged.remove_event_handler('our-show', ged.GUI1, self._nec_our_status) ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -2039,7 +2039,7 @@ class Connection(CommonConnection, ConnectionHandlers): config_key = '%s-%s' % (self.name, obj.jid) encryption = gajim.config.get_per('encryption', config_key, 'encryption') if encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encrypt' + encryption, self, obj, self.send_message) else: self.send_message(obj) @@ -2646,7 +2646,7 @@ class Connection(CommonConnection, ConnectionHandlers): config_key = '%s-%s' % (self.name, obj.jid) encryption = gajim.config.get_per('encryption', config_key, 'encryption') if encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'gc_encrypt' + encryption, self, obj, self.send_gc_message) else: self.send_gc_message(obj) ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1084,7 +1084,7 @@ class ConnectionHandlersBase: if obj.conn.name != self.name: return - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'decrypt', self, obj, self._on_message_received) if not obj.encrypted: self._on_message_received(obj) ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -822,7 +822,7 @@ class ConversationTextview(GObject.GObject): return True else: self.plugin_modified = False - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'hyperlink_handler', word, kind, self, self.tv.get_toplevel()) if self.plugin_modified: @@ -920,7 +920,7 @@ class ConversationTextview(GObject.GObject): # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False - gajim.plugin_manager.gui_extension_point('print_special_text', self, + gajim.plugin_manager.extension_point('print_special_text', self, special_text, other_tags, graphics, additional_data) if self.plugin_modified: return @@ -1397,7 +1397,7 @@ class ConversationTextview(GObject.GObject): # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False - gajim.plugin_manager.gui_extension_point('print_real_text', self, + gajim.plugin_manager.extension_point('print_real_text', self, text, text_tags, graphics, iter_, additional_data) if self.plugin_modified: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -776,7 +776,7 @@ class GroupchatControl(ChatControlBase): 'authenticated': False} if self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_state' + self.encryption, self, encryption_state) self._show_lock_image(**encryption_state) @@ -802,7 +802,7 @@ class GroupchatControl(ChatControlBase): self.lock_image.set_sensitive(visible) def _on_authentication_button_clicked(self, widget): - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) def _change_style(self, model, path, iter_, option): @@ -2022,7 +2022,7 @@ class GroupchatControl(ChatControlBase): if self.encryption: self.sendmessage = True - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'send_message' + self.encryption, self) if not self.sendmessage: return ===================================== src/plugins/pluginmanager.py ===================================== --- a/src/plugins/pluginmanager.py +++ b/src/plugins/pluginmanager.py @@ -158,6 +158,26 @@ class PluginManager(metaclass=Singleton): return None @log_calls('PluginManager') + def extension_point(self, gui_extpoint_name, *args): + ''' + Invokes all handlers (from plugins) for a particular extension point, but + doesnt add it to collection for further processing. + For example if you pass a message for encryption via extension point to a + plugin, its undesired that the call is stored and replayed on activating the + plugin. For example after an update. + + :param gui_extpoint_name: name of GUI extension point. + :type gui_extpoint_name: str + :param args: parameters to be passed to extension point handlers + (typically and object that invokes `gui_extension_point`; + however, this can be practically anything) + :type args: tuple + ''' + + self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, + *args) + + @log_calls('PluginManager') def gui_extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for particular GUI extension point View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/55889d045fb0fffebb8f9d4e2b60380be6…

1 0

[Git][gajim/gajim][master] Better error message why pgp is not working
by Philipp Hörist 26 Jun '17

26 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a2d32fc by Philipp Hörist at 2017-06-26T18:09:15+02:00 Better error message why pgp is not working - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2130,8 +2130,9 @@ class RosterWindow: keyid = gajim.config.get_per('accounts', account, 'keyid') if keyid and not gajim.connections[account].gpg: dialogs.WarningDialog(_('OpenPGP is not usable'), - _('You will be connected to %s without OpenPGP.') % \ - account) + _('Gajim needs python-gnupg >= 0.3.8\n' + 'Beware there is an incompatible python package called gnupg.\n' + 'You will be connected to %s without OpenPGP.') % account) self.send_status_continue(account, status, txt, auto, to) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a2d32fca522fc3eb43c2bdce07d15b70d…

1 0

[Git][gajim/gajim][master] Set password also on connection object on change
by Philipp Hörist 25 Jun '17

25 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7a6d7bae by Philipp Hörist at 2017-06-25T23:14:35+02:00 Set password also on connection object on change - - - - - 1 changed file: - src/common/passwords.py Changes: ===================================== src/common/passwords.py ===================================== --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -170,4 +170,6 @@ def get_password(account_name): return get_storage().get_password(account_name) def save_password(account_name, password): + if account_name in gajim.connections: + gajim.connections[account_name].set_password(password) return get_storage().save_password(account_name, password) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7a6d7baebc87bc690826151190eccfd2e9…

1 0

[Git][gajim/gajim][master] Fix plugin installation from zip
by Philipp Hörist 25 Jun '17

25 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6a49e2d8 by Philipp Hörist at 2017-06-25T22:34:14+02:00 Fix plugin installation from zip - - - - - 2 changed files: - src/plugins/gui.py - src/plugins/pluginmanager.py Changes: ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -281,7 +281,7 @@ class PluginsWindow(object): for i, row in enumerate(model): if plugin == row[Column.PLUGIN]: - model.remove(model.get_iter((i, Column.PLUGIN))) + model.remove(row.iter) break iter_ = model.append([plugin, plugin.name, False, @@ -308,7 +308,7 @@ class PluginsWindow(object): return model = self.installed_plugins_model iter_ = model.append([plugin, plugin.name, False, - plugin.activatable], self.get_plugin_icon(plugin)) + plugin.activatable, self.get_plugin_icon(plugin)]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) ===================================== src/plugins/pluginmanager.py ===================================== --- a/src/plugins/pluginmanager.py +++ b/src/plugins/pluginmanager.py @@ -573,7 +573,7 @@ class PluginManager(metaclass=Singleton): def install_from_zip(self, zip_filename, owerwrite=None): ''' - Install plagin from zip and return plugin + Install plugin from zip and return plugin ''' try: zip_file = zipfile.ZipFile(zip_filename) @@ -595,7 +595,7 @@ class PluginManager(metaclass=Singleton): # members not safe raise PluginsystemError(_('Archive is malformed')) if filename.endswith('/') and filename.find('/', 0, -1) < 0: - dirs.append(filename) + dirs.append(filename.strip('/')) if 'manifest.ini' in filename.split('/')[1]: manifest = True if not manifest: @@ -614,8 +614,8 @@ class PluginManager(metaclass=Singleton): zip_file.extractall(user_dir) zip_file.close() - path = os.path.join(user_dir, dirs[0]) - plugins = self.scan_dir_for_plugins(plugin_dir, False) + + plugins = self.scan_dir_for_plugins(plugin_dir, package=True) if not plugins: return self.add_plugin(plugins[0]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a49e2d869d4e04b7fac56465182fac65b…

1 0

[Git][gajim/gajim][master] Add tooltip for encryption button
by Philipp Hörist 25 Jun '17

25 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5d3578e by Philipp Hörist at 2017-06-25T18:06:46+02:00 Add tooltip for encryption button Fixes #8663 - - - - - 2 changed files: - data/gui/chat_control.ui - data/gui/groupchat_control.ui Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -944,6 +944,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== data/gui/groupchat_control.ui ===================================== --- a/data/gui/groupchat_control.ui +++ b/data/gui/groupchat_control.ui @@ -438,6 +438,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="relief">none</property> <child> <object class="GtkImage"> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5d3578e39b94e4f87c5a933557766d269…

1 0

[Git][gajim/python-nbxmpp][master] Update ChangeLog
by Philipp Hörist 18 Jun '17

18 Jun '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4ce30160 by Philipp Hörist at 2017-06-18T13:44:47+02:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +python-nbxmpp 0.x.x (tbd) + + * Add new XEP Namespaces for Jingle and Hashes + python-nbxmpp 0.5.6 (03 June 2017) * Support XEP-0198 Version 1.5.2 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4ce3016001112f7cc2c579bc2f…

1 0

[Git][gajim/gajim][master] Support IPV6 and IPV4 domainparts
by Philipp Hörist 16 Jun '17

16 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49a78ae8 by Philipp Hörist at 2017-06-16T23:40:42+02:00 Support IPV6 and IPV4 domainparts https://tools.ietf.org/html/rfc7622#section-3.2 - - - - - 1 changed file: - src/common/helpers.py Changes: ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -173,6 +173,35 @@ def prep(user, server, resource): """ # This function comes from #http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py + + ip_address = False + + try: + socket.inet_aton(server) + ip_address = True + except socket.error: + pass + + if not ip_address and hasattr(socket, 'inet_pton'): + try: + socket.inet_pton(socket.AF_INET6, server.strip('[]')) + server = '[%s]' % server.strip('[]') + ip_address = True + except (socket.error, ValueError): + pass + + if not ip_address: + if server is not None: + if len(server) < 1 or len(server) > 1023: + raise InvalidFormat(_('Server must be between 1 and 1023 chars')) + try: + from nbxmpp.stringprepare import nameprep + server = nameprep.prepare(server) + except UnicodeError: + raise InvalidFormat(_('Invalid character in hostname.')) + else: + raise InvalidFormat(_('Server address required.')) + if user is not None: if len(user) < 1 or len(user) > 1023: raise InvalidFormat(_('Username must be between 1 and 1023 chars')) @@ -184,17 +213,6 @@ def prep(user, server, resource): else: user = None - if server is not None: - if len(server) < 1 or len(server) > 1023: - raise InvalidFormat(_('Server must be between 1 and 1023 chars')) - try: - from nbxmpp.stringprepare import nameprep - server = nameprep.prepare(server) - except UnicodeError: - raise InvalidFormat(_('Invalid character in hostname.')) - else: - raise InvalidFormat(_('Server address required.')) - if resource is not None: if len(resource) < 1 or len(resource) > 1023: raise InvalidFormat(_('Resource must be between 1 and 1023 chars')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/49a78ae8ed999ee8866ea570746b9c1b61…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2017