Commits April 2018

commits@gajim.org

1 participants
95 discussions

[Git][gajim/gajim][master] Dont allow plain BOSH by default
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 56a5d016 by Philipp Hörist at 2018-04-29T23:34:46+02:00 Dont allow plain BOSH by default - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1191,15 +1191,18 @@ class Connection(CommonConnection, ConnectionHandlers): if scheme == 'https': connection_types = ['ssl'] else: - connection_types = ['plain'] + if allow_plaintext_connection: + connection_types = ['plain'] + else: + connection_types = [] host = self._select_next_host(self._hosts) self._hosts.remove(host) # Skip record if connection type is not supported. if host['type'] not in connection_types: - log.debug("Skipping connection record with unsupported type: %s" % - host['type']) + log.info("Skipping connection record with unsupported type: %s", + host['type']) self._connect_to_next_host(retry) return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/56a5d0160985d76999896cf7e4fc9f7220… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/56a5d0160985d76999896cf7e4fc9f7220… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Check first if we have a content
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8554e3e by Philipp Hörist at 2018-04-29T23:30:08+02:00 Jingle: Check first if we have a content Fixes #9094 - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== --- a/gajim/common/jingle_session.py +++ b/gajim/common/jingle_session.py @@ -523,6 +523,16 @@ class JingleSession: # error. # Lets check what kind of jingle session does the peer want contents, contents_rejected, reason_txt = self.__parse_contents(jingle) + + # If there's no content we understand... + if not contents: + # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate + reason = nbxmpp.Node('reason') + reason.setTag(reason_txt) + self.__ack(stanza, jingle, error, action) + self._session_terminate(reason) + raise nbxmpp.NodeProcessed + # If we are not receivin a file # Check if there's already a session with this user: if contents[0].media != 'file': @@ -553,14 +563,7 @@ class JingleSession: 'it is not allowed to request', pjid) self.decline_session() raise nbxmpp.NodeProcessed - # If there's no content we understand... - if not contents: - # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate - reason = nbxmpp.Node('reason') - reason.setTag(reason_txt) - self.__ack(stanza, jingle, error, action) - self._session_terminate(reason) - raise nbxmpp.NodeProcessed + self.state = JingleStates.PENDING # Send event about starting a session app.nec.push_incoming_event(JingleRequestReceivedEvent(None, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8554e3e223c8e48c900521faa30a3d483… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8554e3e223c8e48c900521faa30a3d483… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update Namespaces
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4725e752 by Philipp Hörist at 2018-04-29T21:42:58+02:00 Update Namespaces - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -88,6 +88,7 @@ NS_MSG_HINTS = 'urn:xmpp:hints' # XEP-0280 NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 +NS_HTTPUPLOAD_0 = 'urn:xmpp:http:upload:0' # XEP-0363 NS_IBB = 'http://jabber.org/protocol/ibb' NS_IDLE = 'urn:xmpp:idle:1' # XEP-0319 NS_INVISIBLE = 'presence-invisible' # Jabberd2 @@ -186,6 +187,7 @@ NS_HASHES_SHA3_256 = 'urn:xmpp:hash-function-text-names:sha3-256' NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' +NS_OPENPGP = 'urn:xmpp:openpgp:0' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4725e752099cd5c3b91fa2ed2e… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4725e752099cd5c3b91fa2ed2e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix missing argument
by Philipp Hörist 29 Apr '18

29 Apr '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1ace62cd by Philipp Hörist at 2018-04-29T21:38:16+02:00 Fix missing argument with HTTP Transports like BOSH we dont need ALPN, so it should always be False - - - - - 1 changed file: - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -704,7 +704,7 @@ class NonBlockingHTTP(NonBlockingTCP): :param http_dict: dictionary with data for HTTP request and headers """ NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs, tls_version, cipher_list, proxy_dict) + estabilish_tls, certs, tls_version, cipher_list, False, proxy_dict) self.http_protocol, self.http_host, self.http_port, self.http_path = \ urisplit(http_dict['http_uri']) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1ace62cd0747e51c35e8059168… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1ace62cd0747e51c35e8059168… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Catch UnicodeError when decoding certs
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 83e1028b by Philipp Hörist at 2018-04-28T19:07:49+02:00 Catch UnicodeError when decoding certs - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -342,7 +342,7 @@ class NonBlockingTLS(PlugIn): f = open(cert_path, encoding='utf-8') else: f = io.open(cert_path, encoding='utf-8') - except IOError as e: + except (IOError, UnicodeError) as e: log.warning('Unable to open certificate file %s: %s' % \ (cert_path, str(e))) return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/83e1028b7693a7a2fe3076e3fa… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/83e1028b7693a7a2fe3076e3fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 2 commits: Add support for dynamic reloading of plugins
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: dfd0e96f by Markus Wintermann at 2018-04-28T13:48:56+02:00 Add support for dynamic reloading of plugins - - - - - 75b3412a by Philipp Hörist at 2018-04-28T13:49:53+02:00 Update Flatpak - - - - - 3 changed files: - gajim/plugins/gui.py - gajim/plugins/pluginmanager.py - org.gajim.Gajim.json Changes: ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -251,7 +251,7 @@ class PluginsWindow(object): if iter: plugin = model.get_value(iter, Column.PLUGIN) try: - app.plugin_manager.remove_plugin(plugin) + app.plugin_manager.uninstall_plugin(plugin) except PluginsystemError as e: WarningDialog(_('Unable to properly remove the plugin'), str(e), self.window) ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -36,6 +36,7 @@ from pkg_resources import parse_version from gajim.common import app from gajim.common import nec +from gajim.common import configpaths from gajim.common.exceptions import PluginsystemError from gajim.plugins.helpers import log, log_calls, Singleton @@ -149,6 +150,32 @@ class PluginManager(metaclass=Singleton): plugin.version, plugin.__module__, plugin.short_name)) @log_calls('PluginManager') + def remove_plugin(self, plugin): + ''' + removes the plugin from the plugin list and deletes all loaded modules + from sys. This way we will have a fresh start when the plugin gets added + agin. + ''' + if plugin.active: + self.deactivate_plugin(plugin) + + self.plugins.remove(plugin) + + # remove modules from cache + base_package = plugin.__module__.split('.')[0] + # get the subpackages/-modules of the base_package. Add a dot to the + # name to avoid name problems (removing module_abc if base_package is + # module_ab) + modules_to_remove = [module for module in sys.modules + if module.startswith('{}.'.format(base_package))] + # remove the base_package itself + if base_package in sys.modules: + modules_to_remove.append(base_package) + + for module_to_remove in modules_to_remove: + del sys.modules[module_to_remove] + + @log_calls('PluginManager') def add_plugins(self, plugin_classes): for plugin_class in plugin_classes: self.add_plugin(plugin_class) @@ -531,20 +558,9 @@ class PluginManager(metaclass=Singleton): continue module = None - try: - if module_name in sys.modules: - if path == app.PLUGINS_DIRS[0]: - # Only reload plugins from Gajim base dir when they - # dont exist. This means plugins in the user path are - # always preferred. - continue - from imp import reload - log.info('Reloading %s', module_name) - module = reload(sys.modules[module_name]) - else: - log.info('Loading %s', module_name) - module = __import__(module_name) + log.info('Loading %s', module_name) + module = __import__(module_name) except Exception as error: log.warning( "While trying to load {plugin}, exception occurred".format(plugin=elem_name), @@ -632,14 +648,14 @@ class PluginManager(metaclass=Singleton): if len(dirs) > 1: raise PluginsystemError(_('Archive is malformed')) - base_dir, user_dir = app.PLUGINS_DIRS + user_dir = configpaths.get('PLUGINS_USER') plugin_dir = os.path.join(user_dir, dirs[0]) if os.path.isdir(plugin_dir): # Plugin dir already exists if not owerwrite: raise PluginsystemError(_('Plugin already exists')) - self.remove_plugin(self.get_plugin_by_path(plugin_dir)) + self.uninstall_plugin(self.get_plugin_by_path(plugin_dir)) zip_file.extractall(user_dir) zip_file.close() @@ -651,7 +667,7 @@ class PluginManager(metaclass=Singleton): plugin = self.plugins[-1] return plugin - def remove_plugin(self, plugin): + def uninstall_plugin(self, plugin): ''' Deactivate and remove plugin from `plugins` list ''' @@ -664,15 +680,10 @@ class PluginManager(metaclass=Singleton): raise PluginsystemError(error[1][1]) if plugin: - if plugin.active: - self.deactivate_plugin(plugin) + self.remove_plugin(plugin) rmtree(plugin.__path__, False, on_error) - self.plugins.remove(plugin) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) - del sys.modules[plugin.__module__.split('.')[0]] - del plugin.__module__.split('.')[-1] - del plugin def get_plugin_by_path(self, plugin_dir): for plugin in self.plugins: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -359,8 +359,8 @@ }, { "type": "archive", - "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", - "sha256": "3b0c40b22596da54c0eea7f7571c83b61619996ebe6c00b304d7fa5278aaefbb", + "url": "https://ftp.gajim.org/plugins_releases/plugin_installer_0.20.4.zip", + "sha256": "02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9", "dest": "gajim/data/plugins/plugin_installer" } ] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1786bb496aa423ae3845a4a37de55aa26… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1786bb496aa423ae3845a4a37de55aa26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Flatpak
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf8dcb5a by Philipp Hörist at 2018-04-28T13:42:08+02:00 Update Flatpak - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -360,8 +360,8 @@ }, { "type": "archive", - "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", - "sha256": "3b0c40b22596da54c0eea7f7571c83b61619996ebe6c00b304d7fa5278aaefbb", + "url": "https://ftp.gajim.org/plugins_releases/plugin_installer_0.20.4.zip", + "sha256": "02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9", "dest": "gajim/data/plugins/plugin_installer" } ] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf8dcb5a3eb30b90a3480b9e24ef540c27… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf8dcb5a3eb30b90a3480b9e24ef540c27… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add support for dynamic reloading of plugins
by Philipp Hörist 28 Apr '18

28 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49bfc1f2 by Markus Wintermann at 2018-04-28T13:31:19+02:00 Add support for dynamic reloading of plugins ‎* rename the remove_plugin function to uninstall_plugin because it deletes files on the disc and uninstall is the label of the button which triggers this function * added a new remove_plugin function, which deactivates the plugin (if needed), removes it from the list of managed plugins and deletes the contents of sys.modules - - - - - 2 changed files: - gajim/plugins/gui.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -252,7 +252,7 @@ class PluginsWindow(object): if iter: plugin = model.get_value(iter, Column.PLUGIN) try: - app.plugin_manager.remove_plugin(plugin) + app.plugin_manager.uninstall_plugin(plugin) except PluginsystemError as e: WarningDialog(_('Unable to properly remove the plugin'), str(e), self.window) ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -150,6 +150,32 @@ class PluginManager(metaclass=Singleton): plugin.version, plugin.__module__, plugin.short_name)) @log_calls('PluginManager') + def remove_plugin(self, plugin): + ''' + removes the plugin from the plugin list and deletes all loaded modules + from sys. This way we will have a fresh start when the plugin gets added + agin. + ''' + if plugin.active: + self.deactivate_plugin(plugin) + + self.plugins.remove(plugin) + + # remove modules from cache + base_package = plugin.__module__.split('.')[0] + # get the subpackages/-modules of the base_package. Add a dot to the + # name to avoid name problems (removing module_abc if base_package is + # module_ab) + modules_to_remove = [module for module in sys.modules + if module.startswith('{}.'.format(base_package))] + # remove the base_package itself + if base_package in sys.modules: + modules_to_remove.append(base_package) + + for module_to_remove in modules_to_remove: + del sys.modules[module_to_remove] + + @log_calls('PluginManager') def add_plugins(self, plugin_classes): for plugin_class in plugin_classes: self.add_plugin(plugin_class) @@ -532,20 +558,9 @@ class PluginManager(metaclass=Singleton): continue module = None - try: - if module_name in sys.modules: - if path == configpaths.get('PLUGINS_BASE'): - # Only reload plugins from Gajim base dir when they - # dont exist. This means plugins in the user path are - # always preferred. - continue - from imp import reload - log.info('Reloading %s', module_name) - module = reload(sys.modules[module_name]) - else: - log.info('Loading %s', module_name) - module = __import__(module_name) + log.info('Loading %s', module_name) + module = __import__(module_name) except Exception as error: log.warning( "While trying to load {plugin}, exception occurred".format(plugin=elem_name), @@ -633,14 +648,14 @@ class PluginManager(metaclass=Singleton): if len(dirs) > 1: raise PluginsystemError(_('Archive is malformed')) - base_dir, user_dir = configpaths.get('PLUGINS_DIRS') + user_dir = configpaths.get('PLUGINS_USER') plugin_dir = os.path.join(user_dir, dirs[0]) if os.path.isdir(plugin_dir): # Plugin dir already exists if not owerwrite: raise PluginsystemError(_('Plugin already exists')) - self.remove_plugin(self.get_plugin_by_path(plugin_dir)) + self.uninstall_plugin(self.get_plugin_by_path(plugin_dir)) zip_file.extractall(user_dir) zip_file.close() @@ -652,7 +667,7 @@ class PluginManager(metaclass=Singleton): plugin = self.plugins[-1] return plugin - def remove_plugin(self, plugin): + def uninstall_plugin(self, plugin): ''' Deactivate and remove plugin from `plugins` list ''' @@ -665,15 +680,10 @@ class PluginManager(metaclass=Singleton): raise PluginsystemError(error[1][1]) if plugin: - if plugin.active: - self.deactivate_plugin(plugin) + self.remove_plugin(plugin) rmtree(plugin.__path__, False, on_error) - self.plugins.remove(plugin) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) - del sys.modules[plugin.__module__.split('.')[0]] - del plugin.__module__.split('.')[-1] - del plugin def get_plugin_by_path(self, plugin_dir): for plugin in self.plugins: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/49bfc1f226e0b5e8fcceef5802140a9f2c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/49bfc1f226e0b5e8fcceef5802140a9f2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 28 commits: Fix password storage in plain text issue
by Philipp Hörist 26 Apr '18

26 Apr '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 11914e09 by André Apitzsch at 2018-04-26T21:06:58+02:00 Fix password storage in plain text issue - - - - - 7a8d188e by André Apitzsch at 2018-04-26T21:06:58+02:00 setup.py: install all files if build is skipped - - - - - aaab40f0 by Philipp Hörist at 2018-04-26T21:06:58+02:00 Dont call show_all() on AboutDialog Fixes #9038 - - - - - f40e843e by Philipp Hörist at 2018-04-26T21:06:58+02:00 Catch invalid IQ stanzas and log them Fixes #9044 - - - - - 4c970928 by Philipp Hörist at 2018-04-26T21:06:59+02:00 Remove event handler on ChatControl Shutdown - - - - - 9f224a97 by Yann Leboulanger at 2018-04-26T21:08:23+02:00 mark string as translatable. Fixes #9050 - - - - - 4073a9a2 by Yann Leboulanger at 2018-04-26T21:08:23+02:00 Use XMPP logo in add contact dialog for XMPP protocol. Fixes #9049 - - - - - e3355ed1 by Yann Leboulanger at 2018-04-26T21:08:24+02:00 Hide protocol combobox when adding contacts if only XMPP is available - - - - - 99f62658 by Yann Leboulanger at 2018-04-26T21:08:24+02:00 when adding bookmark, check server validity on focus out only. Fixes #7879 - - - - - 9ba0e00f by Philipp Hörist at 2018-04-26T21:08:24+02:00 Add missing return statement - - - - - f1be4cce by Philipp Hörist at 2018-04-26T21:08:24+02:00 Some status codes should only be in our presence Some Servers broadcast these status codes in every presence which is wrong accoring to the XEP - - - - - e9f18365 by Philipp Hörist at 2018-04-26T21:08:24+02:00 Encode filenames before sending Fixes #9039 - - - - - 1f52d90f by Yann Leboulanger at 2018-04-26T21:09:18+02:00 prevent a traceback with wrong bookmarks. Fixes #9055 - - - - - 2fffc794 by Yann Leboulanger at 2018-04-26T21:09:18+02:00 prevent traceback. Fixes #9054 - - - - - fe5d4738 by Yann Leboulanger at 2018-04-26T21:09:18+02:00 update action when creating groupchat window. Fixes #9042 - - - - - 0054ac90 by Bronko at 2018-04-26T21:10:03+02:00 save encoded avatar when receiving vCard from server - - - - - 3c4713f8 by Bronko at 2018-04-26T21:10:13+02:00 save hash and mime_type of avatar when receiving vCard from server in case the avatar is not changed by the user we must resend the still valid hash. if we do not save the hash here, gajim advertises an empty photo element after publishing the vCard, which removes the avatar for all receiving clients of the photo element update - - - - - 09315502 by Philipp Hörist at 2018-04-26T21:10:27+02:00 Delete account from config if registration fails - - - - - 257b4133 by Daniel at 2018-04-26T21:11:03+02:00 Fix placeholder not being removed when inserting nick in MUC via context menu - - - - - 1afe5b77 by Philipp Hörist at 2018-04-26T21:11:03+02:00 Dont show error when receiving invalid avatars Fixes #9022 - - - - - e25cdaad by Markus Wintermann at 2018-04-26T21:11:03+02:00 Update proxy comobobox in accounts/connections After a new proxy was added/removed by ManageProxies the combobox in accounts/connections gets updated - - - - - 00b1d70a by Daniel at 2018-04-26T21:11:03+02:00 Fix History Manager search - - - - - a5db628f by André Apitzsch at 2018-04-26T21:12:10+02:00 Flatpak: add audio support - - - - - b63c2b03 by Philipp Hörist at 2018-04-26T21:12:10+02:00 Save history export with utf8 encoding - - - - - 7e1ffe13 by André Apitzsch at 2018-04-26T21:12:10+02:00 Flatpak: update runtime version - - - - - 00ce3e94 by Daniel at 2018-04-26T21:12:11+02:00 Update flatpak README.md - - - - - e1829474 by Philipp Hörist at 2018-04-26T21:12:11+02:00 Dont be lenient with namespace - - - - - 1786bb49 by Philipp Hörist at 2018-04-26T21:13:49+02:00 Fix Windows build - - - - - 19 changed files: - flatpak/README.md - gajim/accounts_window.py - gajim/chat_control.py - gajim/common/connection_handlers_events.py - gajim/common/httpupload.py - gajim/common/multimedia_helpers.py - gajim/common/pep.py - gajim/common/protocol/bytestream.py - gajim/common/socks5.py - gajim/config.py - gajim/data/gui/contact_context_menu.ui - + gajim/data/icons/hicolor/scalable/status/xmpp.svg - gajim/dialogs.py - gajim/groupchat_control.py - gajim/history_manager.py - gajim/profile_window.py - org.gajim.Gajim.json - setup.py - win/_base.sh Changes: ===================================== flatpak/README.md ===================================== --- a/flatpak/README.md +++ b/flatpak/README.md @@ -1,22 +1,58 @@ -Run the following steps from a directory containing the gajim source dir. - -Install gajim flatpak repo --------------------------- - -1. `flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo` -1. `flatpak --user install gnome org.gnome.Platform//3.26` -1. `flatpak --user install gnome org.gnome.Sdk//3.26` -1. `flatpak-builder --repo=repo directory gajim/org.gajim.Gajim.json` -1. `flatpak --user remote-add --no-gpg-verify repo repo` -1. `flatpak --user install repo org.gajim.Gajim` -1. `flatpak run org.gajim.Gajim` - -Update gajim flatpak repo -------------------------- - -1. update your gajim source repository -1. `rm -r directory` -1. `flatpak-builder --repo=repo directory gajim/org.gajim.Gajim.json` -1. `flatpak --user update` - -Note: remove `--user` if you want a system-wide installation +# Install Gajim via Flatpak + +**Prerequisites:** + +You need to have `flatpak` and `flatpak-builder` installed. For this example, we use `git` for downloading/updating Gajim's sources. + + +### Download Gajim's sources + +In this example, we do a `git clone` of the repository, so you need to have `git` installed. Alternatively, you can also download the sources from our Gitlab via webbrowser. + +`git clone https://dev.gajim.org/gajim/gajim.git ~/Gajim` + +`cd ~/Gajim` + +*Note: Source tarballs and snapshots do _not_ include 'org.gajim.Gajim.json', which is necessary for installation via Flatpak.* + + +### Install Gajim and dependencies + +Replace install path `~/Gajim/gajim_flatpak` with an install path of your choice. + +*Note: Remove `--user` if you want a system-wide installation.* + +1. `flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo` +2. `flatpak --user install gnome org.gnome.Platform//3.28` +3. `flatpak --user install gnome org.gnome.Sdk//3.28` +4. `flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/org.gajim.Gajim.json` +5. `flatpak --user remote-add --no-gpg-verify gajim_flatpak_repo ~/Gajim/gajim_flatpak_repo` +6. `flatpak --user install gajim_flatpak_repo org.gajim.Gajim` +7. `flatpak run org.gajim.Gajim` + +Thats it, you are now running Gajim via Flatpak! + + +## How to update + +### Update Gajim's sources + +In this example, we use `git` to update the repository. You can also download the sources from our Gitlab via webbrowser. + +`cd ~/Gajim` + +`git pull --rebase` + + +### Remove previous Flatpak directory + +`rm -r ~/Gajim/gajim_flatpak` + + +### Install and update Gajim + +1. `flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/org.gajim.Gajim.json` +2. `flatpak --user update` +3. `flatpak run org.gajim.Gajim` + +Gajim is now updated. ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -113,10 +113,10 @@ class AccountsWindow(Gtk.ApplicationWindow): self.stack.set_visible_child(page) def update_proxy_list(self): - page = self.stack.get_child_by_name('connetion') + page = self.stack.get_child_by_name('connection') if page is None: return - page.options['proxy'].update_values() + page.listbox.get_option('proxy').update_values() def check_relogin(self): for account in self.need_relogin: @@ -686,7 +686,7 @@ class LoginDialog(OptionsDialog): self.connect('destroy', self.on_destroy) def on_password_change(self, new_password, data): - self.get_option('password').entry.set_text(new_password) + passwords.save_password(self.account, new_password) def on_destroy(self, *args): savepass = app.config.get_per('accounts', self.account, 'savepass') ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1173,6 +1173,9 @@ class ChatControl(ChatControlBase): self._nec_caps_received) app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) + app.ged.remove_event_handler( + 'mam-decrypted-message-received', + ged.GUI1, self._nec_mam_decrypted_message_received) self.unsubscribe_events() ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -801,7 +801,7 @@ PresenceHelperEvent): xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() - if namespace.startswith(nbxmpp.NS_MUC): + if namespace == nbxmpp.NS_MUC_USER: self.is_gc = True elif namespace == nbxmpp.NS_SIGNED: sig_tag = x ===================================== gajim/common/httpupload.py ===================================== --- a/gajim/common/httpupload.py +++ b/gajim/common/httpupload.py @@ -19,7 +19,7 @@ import threading import ssl import urllib from urllib.request import Request, urlopen -from urllib.parse import urlparse +from urllib.parse import urlparse, quote import io import mimetypes import logging @@ -187,7 +187,7 @@ class ConnectionHTTPUpload: id_ = app.get_an_id() iq.setID(id_) request = iq.setTag(name="request", namespace=NS_HTTPUPLOAD) - request.addChild('filename', payload=os.path.basename(file.path)) + request.addChild('filename', payload=quote(os.path.basename(file.path))) request.addChild('size', payload=file.size) request.addChild('content-type', payload=file.mime) ===================================== gajim/common/multimedia_helpers.py ===================================== --- a/gajim/common/multimedia_helpers.py +++ b/gajim/common/multimedia_helpers.py @@ -38,6 +38,7 @@ class DeviceManager(object): element = Gst.ElementFactory.make(name, '%spresencetest' % name) if element is None: log.warning('could not create %spresencetest', name) + return if hasattr(element.props, 'device'): element.set_state(Gst.State.READY) devices = element.get_properties('device') ===================================== gajim/common/pep.py ===================================== --- a/gajim/common/pep.py +++ b/gajim/common/pep.py @@ -483,6 +483,10 @@ class AvatarNotificationPEP(AbstractPEP): def _extract_info(self, items): self.avatar = None for item in items.getTags('item'): + metadata = item.getTag('metadata') + if metadata is None: + app.log('avatar').warning('Invalid avatar stanza:\n%s', items) + break info = item.getTag('metadata').getTag('info') if info is not None: self.avatar = info.getAttrs() @@ -494,7 +498,7 @@ class AvatarNotificationPEP(AbstractPEP): con = app.connections[account] if self.avatar is None: # Remove avatar - app.log('avatar').debug('Remove (Pubsub): %s', jid) + app.log('avatar').info('Remove (Pubsub): %s', jid) app.contacts.set_avatar(account, jid, None) own_jid = con.get_own_jid().getStripped() app.logger.set_avatar_sha(own_jid, jid, None) ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -673,7 +673,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): # if we want to respect xep-0065 we have to check for proxy # activation result in any result iq real_id = iq_obj.getAttr('id') - if not real_id.startswith('au_'): + if real_id is None: + log.warning('Invalid IQ without id attribute:\n%s', iq_obj) + raise nbxmpp.NodeProcessed + if real_id is None or not real_id.startswith('au_'): return frm = self._ft_get_from(iq_obj) id_ = real_id[3:] ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -319,7 +319,7 @@ class SocksQueue: self.process_result(result, sender) def send_file(self, file_props, account, mode): - for key in self.senders.keys(): + for key in list(self.senders.keys()): if file_props.name in key and file_props.transport_sid in key \ and self.senders[key].mode == mode: log.info('socks5: sending file') ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1966,7 +1966,8 @@ class ManageBookmarksWindow: self.nick_entry = self.xml.get_object('nick_entry') self.nick_entry.connect('changed', self.on_nick_entry_changed) self.server_entry = self.xml.get_object('server_entry') - self.server_entry.connect('changed', self.on_server_entry_changed) + self.server_entry.connect('focus-out-event', + self.on_server_entry_focus_out) self.room_entry = self.xml.get_object('room_entry') self.room_entry_changed_id = self.room_entry.connect('changed', self.on_room_entry_changed) @@ -2118,7 +2119,12 @@ class ManageBookmarksWindow: # Fill in the data for childs self.title_entry.set_text(model[iter_][1]) room_jid = model[iter_][2] - (room, server) = room_jid.split('@') + room_jid_s = room_jid.split('@') + if len(room_jid_s) == 1: + room = '' + server = room_jid + else: + (room, server) = room_jid_s self.room_entry.handler_block(self.room_entry_changed_id) self.room_entry.set_text(room) self.room_entry.handler_unblock(self.room_entry_changed_id) @@ -2172,7 +2178,7 @@ class ManageBookmarksWindow: return True model[iter_][6] = nick - def on_server_entry_changed(self, widget): + def on_server_entry_focus_out(self, widget, event): if self.ignore_events: return (model, iter_) = self.selection.get_selected() @@ -2364,6 +2370,8 @@ class AccountCreationWizardWindow: elif cur_page == 4: if self.account in app.connections: del app.connections[self.account] + if self.account in app.config.get_per('accounts'): + app.config.del_per('accounts', self.account) self.notebook.set_current_page(2) self.xml.get_object('form_vbox').remove(self.data_form_widget) elif cur_page == 6: # finish page ===================================== gajim/data/gui/contact_context_menu.ui ===================================== --- a/gajim/data/gui/contact_context_menu.ui +++ b/gajim/data/gui/contact_context_menu.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -218,7 +218,7 @@ <child> <object class="GtkMenuItem" id="information_menuitem"> <property name="can_focus">False</property> - <property name="label">_Information</property> + <property name="label" translatable="yes">_Information</property> <property name="use_underline">True</property> </object> </child> ===================================== gajim/data/icons/hicolor/scalable/status/xmpp.svg ===================================== --- /dev/null +++ b/gajim/data/icons/hicolor/scalable/status/xmpp.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> +<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="181.44px" viewBox="0 0 176.486 181.437" width="176.49px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 176.486 181.437"> +<linearGradient id="SVGID_1_" y2=".00048828" gradientUnits="userSpaceOnUse" x2="-1807.2" gradientTransform="translate(1916)" y1="125.86" x1="-1807.2"> + <stop stop-color="#1b3967" offset=".011"/> + <stop stop-color="#13b5ea" offset=".467"/> + <stop stop-color="#002b5c" offset=".9945"/> +</linearGradient> +<path d="m136.29 14.189c0.077 1.313-1.786 0.968-1.786 2.293 0 38.551-44.72 96.831-89.847 108.19v1.182c59.957-5.51 126.73-66.8 128.24-125.85l-36.6 14.189z" fill="url(#SVGID_1_)"/> +<path d="m120.23 17.96c0.077 1.313 0.121 2.633 0.121 3.958 0 38.551-30.7 90.497-75.827 101.86v1.637c59.065-3.823 105.81-63.023 105.81-109.2 0-2.375-0.125-4.729-0.371-7.056l-29.73 8.796z" fill="#E96D1F"/> +<linearGradient id="SVGID_2_" y2="1.279e-13" gradientUnits="userSpaceOnUse" x2="-1073.2" gradientTransform="matrix(-1 0 0 1 -1008.2 0)" y1="126.85" x1="-1073.2"> + <stop stop-color="#1b3967" offset=".011"/> + <stop stop-color="#13b5ea" offset=".467"/> + <stop stop-color="#002b5c" offset=".9945"/> +</linearGradient> +<path d="m150.34 8.76l-7.833 2.625c0.041 0.963 0.191 2.203 0.191 3.173 0 41.219-37.272 98.205-87.274 107.12-3.243 1.089-7.538 2.077-10.93 2.932v1.639c68.344-8.66 111.18-71.719 105.84-117.49z" fill="#D9541E"/> +<path d="m36.599 14.189c-0.077 1.313 1.787 0.968 1.787 2.293 0 38.551 46.558 97.366 91.688 108.73v1.639c-59.953-5.52-128.56-67.8-130.07-126.85l36.599 14.189z" fill="url(#SVGID_2_)"/> +<path d="m54.731 18.932c-0.076 1.313-0.12 2.63-0.12 3.957 0 38.551 30.699 90.497 75.827 101.86v1.639c-59.044-2.79-105.81-63.024-105.81-109.2 0-2.375 0.128-4.729 0.371-7.056l29.73 8.798z" fill="#A0CE67"/> +<path d="m24.713 9.583l7.617 2.722c-0.041 0.962-0.066 2.254-0.066 3.225 0 41.219 37.271 98.204 87.272 107.12 3.245 1.088 7.538 2.077 10.932 2.931v1.638c-65.254-5.56-111.1-71.866-105.76-117.64z" fill="#439639"/> + <path d="m14.576 166.71l-13.388-14.65h11.643l9.127 10.268 9.129-10.268h11.643l-13.387 14.646 14.401 14.728h-12.09l-9.697-10.67-9.693 10.67h-12.092l14.404-14.73z"/> + <path d="m47.096 152.06h13.836l10.183 18.905 10.183-18.905h13.832v29.374h-8.762v-21.096h-0.08l-11.807 21.096h-6.733l-11.807-21.096h-0.082v21.096h-8.764v-29.37z"/> + <path d="m101.25 152.06h24.546c8.559 0 10.628 4.302 10.628 10.063v2.516c0 4.381-1.908 9.41-8.275 9.41h-17.894v7.385h-9.005v-29.38zm9 14.69h13.997c2.109 0 2.924-1.377 2.924-3.123v-1.135c0-1.99-0.976-3.127-3.694-3.127h-13.227v7.38z"/> + <path d="m141.31 152.06h24.546c8.561 0 10.63 4.302 10.63 10.063v2.516c0 4.381-1.907 9.41-8.275 9.41h-17.893v7.385h-9.008v-29.38zm9.01 14.69h13.996c2.11 0 2.922-1.377 2.922-3.123v-1.135c0-1.99-0.974-3.127-3.693-3.127h-13.225v7.38z"/> +</svg> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -937,8 +937,7 @@ class AddNewContactWindow: uf_type = {'jabber': 'XMPP', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'} # Jabber as first - online_icon = gtkgui_helpers.get_iconset_name_for('online') - liststore.append(['XMPP', online_icon, 'jabber']) + liststore.append(['XMPP', 'xmpp', 'jabber']) for type_ in self.agents: if type_ == 'jabber': continue @@ -1018,6 +1017,9 @@ class AddNewContactWindow: self.account_combobox.set_model(liststore) self.account_combobox.set_active(0) + if len(self.agents) == 1: + self.protocol_hbox.hide() + if self.account: message_buffer = self.message_textview.get_buffer() msg = helpers.from_one_line(helpers.get_subscription_request_msg( @@ -1321,12 +1323,7 @@ class AboutDialog(Gtk.AboutDialog): self.connect( 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) - self.show_all() - - # GTK Bug, We have to manually hide the License Button - # Bug exists only on Windows - if os.name == 'nt': - self.get_action_area().get_children()[1].hide() + self.show() class Dialog(Gtk.Dialog): ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -335,6 +335,7 @@ class GroupchatControl(ChatControlBase): # Tooltip Window and Actions have to be created with parent self.set_tooltip() self.add_actions() + GLib.idle_add(self.update_actions) self.scale_factor = parent_win.window.get_scale_factor() self._connect_window_state_change(parent_win) else: @@ -1752,7 +1753,7 @@ class GroupchatControl(ChatControlBase): # status_code # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-\ # init - if obj.status_code: + if obj.status_code and obj.nick == self.nick: if '110' in obj.status_code: # We just join the room if self.room_jid in app.automatic_rooms[self.account] and \ @@ -2789,6 +2790,7 @@ class GroupchatControl(ChatControlBase): return True def append_nick_in_msg_textview(self, widget, nick): + self.msg_textview.remove_placeholder() message_buffer = self.msg_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -515,7 +515,7 @@ class HistoryManager: # AT THIS TIME FIRST EXECUTE IS LOST! WTH!!!!! results = self.cur.fetchall() #print results[0] - file_ = open(path_to_file, 'w') + file_ = open(path_to_file, 'w', encoding='utf-8') for row in results: # in store: time, kind, message, contact_name FROM logs # in text: JID or You or nickname (if it's gc_msg), time, message @@ -640,7 +640,7 @@ class HistoryManager: def on_search_results_listview_row_activated(self, widget, path, column): # get log_line_id, jid_id from row we double clicked - log_line_id = self.search_results_liststore[path][0] + log_line_id = str(self.search_results_liststore[path][0]) jid = self.search_results_liststore[path][1] # make it string as in gtk liststores I have them all as strings # as this is what db returns so I don't have to fight with types @@ -661,13 +661,14 @@ class HistoryManager: iter_ = self.logs_liststore.get_iter_first() while iter_: - # self.logs_liststore[iter_][0] holds lon_line_ids + # self.logs_liststore[iter_][0] holds log_line_ids if self.logs_liststore[iter_][0] == log_line_id: break iter_ = self.logs_liststore.iter_next(iter_) path = self.logs_liststore.get_path(iter_) self.logs_listview.scroll_to_cell(path) + self.logs_listview.get_selection().select_path(path) def main(): ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -29,6 +29,7 @@ from gi.repository import GdkPixbuf import base64 import time import logging +import hashlib from gajim import gtkgui_helpers from gajim import dialogs @@ -227,7 +228,11 @@ class ProfileWindow: photo_encoded = vcard_[i]['BINVAL'] if photo_encoded == '': continue + self.avatar_encoded = photo_encoded photo_decoded = base64.b64decode(photo_encoded.encode('utf-8')) + self.avatar_sha = hashlib.sha1(photo_decoded).hexdigest() + if 'TYPE' in vcard_[i]: + self.avatar_mime_type = vcard_[i]['TYPE'] pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded) if pixbuf is None: continue ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -1,7 +1,7 @@ { "app-id": "org.gajim.Gajim", "runtime": "org.gnome.Platform", - "runtime-version": "3.26", + "runtime-version": "3.28", "sdk": "org.gnome.Sdk", "command": "gajim", "finish-args": [ @@ -13,6 +13,7 @@ /* Needs to talk to the network: */ "--share=network", "--filesystem=home", + "--socket=pulseaudio", "--socket=system-bus" ], "build-options": { ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ if sys.version_info < (3, 5): from setuptools import setup, find_packages from setuptools import Command from setuptools.command.build_py import build_py as _build +from setuptools.command.install import install as _install from distutils import log from distutils.util import convert_path, newer @@ -18,6 +19,9 @@ import gajim pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) +MAN_FILES = ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1'] +META_FILES = [('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), + ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')] cwd = os.path.dirname(os.path.realpath(__file__)) build_dir = os.path.join(cwd, "build") @@ -53,7 +57,6 @@ def build_trans(build_cmd): ''' Translate the language files into gajim.mo ''' - data_files = build_cmd.distribution.data_files for lang in ALL_LINGUAS: po_file = os.path.join('po', lang + '.po') mo_file = os.path.join(build_dir, 'mo', lang, 'LC_MESSAGES', 'gajim.mo') @@ -72,7 +75,11 @@ def build_trans(build_cmd): raise SystemExit(msg) log.info('Compiling %s >> %s', po_file, mo_file) - # linux specific piece: + +def install_trans(install_cmd): + data_files = install_cmd.distribution.data_files + for lang in ALL_LINGUAS: + mo_file = os.path.join(build_dir, 'mo', lang, 'LC_MESSAGES', 'gajim.mo') target = 'share/locale/' + lang + '/LC_MESSAGES' data_files.append((target, [mo_file])) @@ -81,14 +88,12 @@ def build_man(build_cmd): ''' Compress Gajim manual files ''' - data_files = build_cmd.distribution.data_files - for man in ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1']: - filename = os.path.join('data', man) - newdir = os.path.join(build_dir, 'man') - if not (os.path.isdir(newdir) or os.path.islink(newdir)): - os.makedirs(newdir) + newdir = os.path.join(build_dir, 'man') + if not (os.path.isdir(newdir) or os.path.islink(newdir)): + os.makedirs(newdir) - import gzip + for man in MAN_FILES: + filename = os.path.join('data', man) man_file_gz = os.path.join(newdir, man + '.gz') if os.path.exists(man_file_gz): if newer(filename, man_file_gz): @@ -97,13 +102,21 @@ def build_man(build_cmd): filename = False if filename: + import gzip # Binary io, so open is OK with open(filename, 'rb') as f_in,\ gzip.open(man_file_gz, 'wb') as f_out: f_out.writelines(f_in) log.info('Compiling %s >> %s', filename, man_file_gz) - target = 'share/man/man1' + +def install_man(install_cmd): + data_files = install_cmd.distribution.data_files + man_dir = os.path.join(build_dir, 'man') + target = 'share/man/man1' + + for man in MAN_FILES: + man_file_gz = os.path.join(man_dir, man + '.gz') data_files.append((target, [man_file_gz])) @@ -111,20 +124,22 @@ def build_intl(build_cmd): ''' Merge translation files into desktop and mime files ''' - data_files = build_cmd.distribution.data_files base = build_dir - merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), - ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')) - - for filename, target, option in merge_files: + for filename, _, option in META_FILES: filenamelocal = convert_path(filename) newfile = os.path.join(base, filenamelocal) newdir = os.path.dirname(newfile) if not(os.path.isdir(newdir) or os.path.islink(newdir)): os.makedirs(newdir) merge(filenamelocal + '.in', newfile, option) - data_files.append((target, [base + '/' + filename])) + + +def install_intl(install_cmd): + data_files = install_cmd.distribution.data_files + + for filename, target, _ in META_FILES: + data_files.append((target, [build_dir + '/' + filename])) def merge(in_file, out_file, option, po_dir='po'): @@ -154,6 +169,15 @@ class build(_build): _build.run(self) +class install(_install): + def run(self): + install_trans(self) + if sys.platform != 'win32': + install_man(self) + install_intl(self) + _install.run(self) + + class test(Command): description = "Run all tests" user_options = [] @@ -243,6 +267,7 @@ setup( ], cmdclass={ 'build_py': build, + 'install': install, 'test': test, 'test_nogui': test_nogui, 'update_po': update_po, ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -79,7 +79,8 @@ function install_deps { mingw-w64-"${ARCH}"-sqlite3 \ mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ - mingw-w64-"${ARCH}"-hunspell + mingw-w64-"${ARCH}"-hunspell \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools build_pip install setuptools_scm @@ -87,7 +88,6 @@ function install_deps { pyasn1 certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git -protobuf git+https://github.com/dlitz/pycrypto.git cryptography pyopenssl @@ -96,6 +96,7 @@ docutils qrcode keyring pillow==4.3.0 +six " build_pip install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c4830bd93c6ec68084425c05965ed0770… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c4830bd93c6ec68084425c05965ed0770… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Windows build
by Philipp Hörist 26 Apr '18

26 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 379a4b03 by Philipp Hörist at 2018-04-26T20:59:12+02:00 Fix Windows build - - - - - 1 changed file: - win/misc/create-launcher.py Changes: ===================================== win/misc/create-launcher.py ===================================== --- a/win/misc/create-launcher.py +++ b/win/misc/create-launcher.py @@ -89,8 +89,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PySys_SetArgvEx(__argc, szArglist, 0); result = PyRun_SimpleString("import sys; import os;" "sys.frozen=True;" - "import gajim.gajim as g;" - "g.GajimApplication().run(sys.argv);"); + "from gajim import gajim;" + "gajim.main();"); Py_Finalize(); return result; } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/379a4b03d71dde860cc50cceb2ff4cb83e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/379a4b03d71dde860cc50cceb2ff4cb83e… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2018