Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] 3 commits: Import app only once
by Philipp Hörist 25 Apr '18

25 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b4f6116e by Philipp Hörist at 2018-04-25T20:59:23+02:00 Import app only once - - - - - 8c23d5a4 by Philipp Hörist at 2018-04-25T21:24:05+02:00 Move some imports - - - - - 707599dd by Philipp Hörist at 2018-04-25T21:26:02+02:00 Dont determine paths at module import time - - - - - 4 changed files: - gajim/application.py - gajim/common/caps_cache.py - gajim/common/logger.py - gajim/history_manager.py Changes: ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -43,9 +43,13 @@ from urllib.parse import unquote from gi.repository import GLib, Gio, Gtk +from gajim.common import app from gajim.common import i18n from gajim.common import configpaths from gajim.common import logging_helpers +from gajim.common import exceptions +from gajim.common import caps_cache +from gajim.common import logger class GajimApplication(Gtk.Application): @@ -121,12 +125,8 @@ class GajimApplication(Gtk.Application): def _startup(self, application): # Create and initialize Application Paths & Databases - from gajim.common import app app.detect_dependencies() configpaths.create_paths() - from gajim.common import exceptions - from gajim.common import logger - from gajim.common import caps_cache try: app.logger = logger.Logger() caps_cache.initialize(app.logger) @@ -171,7 +171,6 @@ class GajimApplication(Gtk.Application): gui_menu_builder.build_accounts_menu() def _open_uris(self, uris): - from gajim.common import app for uri in uris: app.log('uri_handler').info('open %s', uri) if not uri.startswith('xmpp:'): @@ -213,7 +212,6 @@ class GajimApplication(Gtk.Application): self.interface.roster.prepare_quit() # Commit any outstanding SQL transactions - from gajim.common import app app.logger.commit() def _handle_remote_options(self, application, command_line): @@ -287,7 +285,6 @@ class GajimApplication(Gtk.Application): def add_actions(self): ''' Build Application Actions ''' from gajim.app_actions import AppActions - from gajim.common import app action = AppActions(self) self.account_actions = [ ===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -436,8 +436,7 @@ class MucCapsCache: identities, features, data = [], [], [] query_childs = stanza.getQueryChildren() if not query_childs: - from gajim.common import app - app.log('gajim.muc').warning('%s returned empty disco info', jid) + log.warning('%s returned empty disco info', jid) return for child in query_childs: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -49,9 +49,6 @@ from gajim.common.const import ( JIDConstant, KindConstant, ShowConstant, TypeConstant, SubscriptionConstant) -LOG_DB_PATH = configpaths.get('LOG_DB') -LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) -CACHE_DB_PATH = configpaths.get('CACHE_DB') LOGS_SQL_STATEMENT = ''' CREATE TABLE jids( @@ -132,6 +129,8 @@ class Logger: self._jid_ids = {} self._con = None self._commit_timout_id = None + self._log_db_path = configpaths.get('LOG_DB') + self._cache_db_path = configpaths.get('CACHE_DB') self._create_databases() self._migrate_databases() @@ -139,23 +138,23 @@ class Logger: self._get_jid_ids_from_db() def _create_databases(self): - if os.path.isdir(LOG_DB_PATH): + if os.path.isdir(self._log_db_path): log.error(_('%s is a directory but should be a file'), - LOG_DB_PATH) + self._log_db_path) sys.exit() - if os.path.isdir(CACHE_DB_PATH): + if os.path.isdir(self._cache_db_path): log.error(_('%s is a directory but should be a file'), - CACHE_DB_PATH) + self._cache_db_path) sys.exit() - if not os.path.exists(LOG_DB_PATH): - if os.path.exists(CACHE_DB_PATH): - os.remove(CACHE_DB_PATH) - self._create(LOGS_SQL_STATEMENT, LOG_DB_PATH) + if not os.path.exists(self._log_db_path): + if os.path.exists(self._cache_db_path): + os.remove(self._cache_db_path) + self._create(LOGS_SQL_STATEMENT, self._log_db_path) - if not os.path.exists(CACHE_DB_PATH): - self._create(CACHE_SQL_STATEMENT, CACHE_DB_PATH) + if not os.path.exists(self._cache_db_path): + self._create(CACHE_SQL_STATEMENT, self._cache_db_path) @staticmethod def _create(statement, path): @@ -181,11 +180,11 @@ class Logger: def _migrate_databases(self): try: - con = sqlite.connect(LOG_DB_PATH) + con = sqlite.connect(self._log_db_path) self._migrate_logs(con) con.close() - con = sqlite.connect(CACHE_DB_PATH) + con = sqlite.connect(self._cache_db_path) self._migrate_cache(con) con.close() except Exception: @@ -267,7 +266,7 @@ class Logger: def _connect_databases(self): self._con = sqlite.connect( - LOG_DB_PATH, timeout=20.0, isolation_level='IMMEDIATE') + self._log_db_path, timeout=20.0, isolation_level='IMMEDIATE') self._con.row_factory = self.namedtuple_factory @@ -278,7 +277,7 @@ class Logger: self._set_synchronous(False) try: self._con.execute("ATTACH DATABASE '%s' AS cache" % - CACHE_DB_PATH.replace("'", "''")) + self._cache_db_path.replace("'", "''")) except Exception as error: log.exception('Error') self._con.close() @@ -680,7 +679,7 @@ class Logger: sql, tuple(jids) + (restore, pending)).fetchall() except sqlite.DatabaseError: self.dispatch('DB_ERROR', - exceptions.DatabaseMalformed(LOG_DB_PATH)) + exceptions.DatabaseMalformed(self._log_db_path)) return [] messages.reverse() ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -84,7 +84,6 @@ if is_standalone(): from gajim.common import app from gajim import gtkgui_helpers -from gajim.common.logger import LOG_DB_PATH from gajim.common.const import JIDConstant, KindConstant from gajim.common import helpers from gajim import dialogs @@ -109,9 +108,10 @@ class HistoryManager: # set the icon to all windows Gtk.Window.set_default_icon_list(pixs) - if not os.path.exists(LOG_DB_PATH): + log_db_path = configpaths.get('LOG_DB') + if not os.path.exists(log_db_path): dialogs.ErrorDialog(_('Cannot find history logs database'), - '%s does not exist.' % LOG_DB_PATH) + '%s does not exist.' % log_db_path) sys.exit() xml = gtkgui_helpers.get_gtk_builder('history_manager.ui') @@ -128,8 +128,8 @@ class HistoryManager: self.jids_already_in = [] # holds jids that we already have in DB self.AT_LEAST_ONE_DELETION_DONE = False - self.con = sqlite3.connect(LOG_DB_PATH, timeout=20.0, - isolation_level='IMMEDIATE') + self.con = sqlite3.connect( + log_db_path, timeout=20.0, isolation_level='IMMEDIATE') self.cur = self.con.cursor() self._init_jids_listview() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/105427b8fdf6af213e73aacca48cda7ad… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/105427b8fdf6af213e73aacca48cda7ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use consistent way to get paths
by Philipp Hörist 25 Apr '18

25 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 105427b8 by Philipp Hörist at 2018-04-25T20:49:37+02:00 Use consistent way to get paths This lets us now import the app module without setting paths - - - - - 19 changed files: - gajim/common/app.py - gajim/common/configpaths.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - gajim/common/jingle_content.py - gajim/common/jingle_xtls.py - gajim/config.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/gajimplugin.py - gajim/plugins/gui.py - gajim/plugins/pluginmanager.py - gajim/plugins/plugins_i18n.py - gajim/vcard.py - test/lib/__init__.py - test/test_pluginmanager.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -31,7 +31,6 @@ import os import sys import logging -import locale import uuid from distutils.version import LooseVersion as V from collections import namedtuple @@ -63,20 +62,6 @@ logger = None # some plugins use that gajimpaths = configpaths.gajimpaths -AVATAR_PATH = configpaths.get('AVATAR') -MY_EMOTS_PATH = configpaths.get('MY_EMOTS') -MY_ICONSETS_PATH = configpaths.get('MY_ICONSETS') -MY_MOOD_ICONSETS_PATH = configpaths.get('MY_MOOD_ICONSETS') -MY_ACTIVITY_ICONSETS_PATH = configpaths.get('MY_ACTIVITY_ICONSETS') -MY_CACERTS = configpaths.get('MY_CACERTS') -MY_PEER_CERTS_PATH = configpaths.get('MY_PEER_CERTS') -DATA_DIR = configpaths.get('DATA') -ICONS_DIR = configpaths.get('ICONS') -HOME_DIR = configpaths.get('HOME') -PLUGINS_DIRS = [configpaths.get('PLUGINS_BASE'), - configpaths.get('PLUGINS_USER')] -PLUGINS_CONFIG_DIR = configpaths.get('PLUGINS_CONFIG_DIR') -MY_CERT_DIR = configpaths.get('MY_CERT') RecentGroupchat = namedtuple('RecentGroupchat', ['room', 'server', 'nickname']) ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -32,6 +32,9 @@ from gajim.common.const import PathType, PathLocation def get(key): + if key == 'PLUGINS_DIRS': + return [_paths['PLUGINS_BASE'], + _paths['PLUGINS_USER']] return _paths[key] @@ -43,6 +46,10 @@ def get_paths(type_): yield _paths[key] +def override_path(*args, **kwargs): + _paths._add(*args, **kwargs) + + def set_separation(active: bool): _paths.profile_separation = active ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1217,7 +1217,7 @@ class Connection(CommonConnection, ConnectionHandlers): cacerts = '' if os.name == 'nt': cacerts = certifi.where() - mycerts = common.app.MY_CACERTS + mycerts = common.configpaths.get('MY_CACERTS') tls_version = app.config.get_per('accounts', self.name, 'tls_version') cipher_list = app.config.get_per('accounts', self.name, 'cipher_list') ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -47,6 +47,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import dataforms from gajim.common import jingle_xtls +from gajim.common import configpaths from gajim.common.caps_cache import muc_caps_cache from gajim.common.commands import ConnectionCommands from gajim.common.pubsub import ConnectionPubSub @@ -391,7 +392,7 @@ class ConnectionVcard: else: app.log('avatar').info( 'Update (vCard): %s %s', obj.nick, obj.avatar_sha) - path = os.path.join(app.AVATAR_PATH, obj.avatar_sha) + path = os.path.join(configpaths.get('AVATAR'), obj.avatar_sha) if not os.path.isfile(path): app.log('avatar').info( 'Request (vCard): %s', obj.nick) @@ -572,7 +573,7 @@ class ConnectionVcard: current_sha = app.config.get_per('accounts', self.name, 'avatar_sha') if current_sha == avatar_sha: - path = os.path.join(app.AVATAR_PATH, current_sha) + path = os.path.join(configpaths.get('AVATAR'), current_sha) if not os.path.isfile(path): app.log('avatar').info( 'Caching (vCard): %s', current_sha) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -40,6 +40,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common import dataforms +from gajim.common import configpaths from gajim.common.zeroconf.zeroconf import Constant from gajim.common.const import KindConstant from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS @@ -2738,7 +2739,8 @@ class NotificationEvent(nec.NetworkIncomingEvent): if jid: # we want an avatar puny_jid = helpers.sanitize_filename(jid) - path_to_file = os.path.join(app.AVATAR_PATH, puny_jid) + suffix + path_to_file = os.path.join( + configpaths.get('AVATAR'), puny_jid) + suffix path_to_local_file = path_to_file + '_local' for extension in ('.png', '.jpeg'): path_to_local_file_full = path_to_local_file + extension ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -53,6 +53,7 @@ import nbxmpp from gajim.common.i18n import Q_ from gajim.common.i18n import ngettext +from gajim.common import configpaths try: import precis_i18n.codec @@ -863,8 +864,8 @@ def check_soundfile_path(file_, dirs=None): :return the path to file or None if it doesn't exists. """ if dirs is None: - dirs = [app.configpaths.get('MY_DATA'), - app.DATA_DIR] + dirs = [configpaths.get('MY_DATA'), + configpaths.get('DATA')] if not file_: return None @@ -891,8 +892,8 @@ def strip_soundfile_path(file_, dirs=None, abs=True): return None if dirs is None: - dirs = [app.configpaths.get('MY_DATA'), - app.DATA_DIR] + dirs = [configpaths.get('MY_DATA'), + configpaths.get('DATA')] name = os.path.basename(file_) for d in dirs: @@ -1257,31 +1258,32 @@ def get_current_show(account): return app.SHOW_LIST[status] def get_iconset_path(iconset): - if os.path.isdir(os.path.join(app.DATA_DIR, 'iconsets', iconset)): - return os.path.join(app.DATA_DIR, 'iconsets', iconset) - elif os.path.isdir(os.path.join(app.MY_ICONSETS_PATH, iconset)): - return os.path.join(app.MY_ICONSETS_PATH, iconset) + if os.path.isdir(os.path.join(configpaths.get('DATA'), 'iconsets', iconset)): + return os.path.join(configpaths.get('DATA'), 'iconsets', iconset) + elif os.path.isdir(os.path.join(configpaths.get('MY_ICONSETS'), iconset)): + return os.path.join(configpaths.get('MY_ICONSETS'), iconset) def get_mood_iconset_path(iconset): - if os.path.isdir(os.path.join(app.DATA_DIR, 'moods', iconset)): - return os.path.join(app.DATA_DIR, 'moods', iconset) - elif os.path.isdir(os.path.join(app.MY_MOOD_ICONSETS_PATH, iconset)): - return os.path.join(app.MY_MOOD_ICONSETS_PATH, iconset) + if os.path.isdir(os.path.join(configpaths.get('DATA'), 'moods', iconset)): + return os.path.join(configpaths.get('DATA'), 'moods', iconset) + elif os.path.isdir( + os.path.join(configpaths.get('MY_MOOD_ICONSETS'), iconset)): + return os.path.join(configpaths.get('MY_MOOD_ICONSETS'), iconset) def get_activity_iconset_path(iconset): - if os.path.isdir(os.path.join(app.DATA_DIR, 'activities', iconset)): - return os.path.join(app.DATA_DIR, 'activities', iconset) - elif os.path.isdir(os.path.join(app.MY_ACTIVITY_ICONSETS_PATH, + if os.path.isdir(os.path.join(configpaths.get('DATA'), 'activities', iconset)): + return os.path.join(configpaths.get('DATA'), 'activities', iconset) + elif os.path.isdir(os.path.join(configpaths.get('MY_ACTIVITY_ICONSETS'), iconset)): - return os.path.join(app.MY_ACTIVITY_ICONSETS_PATH, iconset) + return os.path.join(configpaths.get('MY_ACTIVITY_ICONSETS'), iconset) def get_transport_path(transport): - if os.path.isdir(os.path.join(app.DATA_DIR, 'iconsets', 'transports', + if os.path.isdir(os.path.join(configpaths.get('DATA'), 'iconsets', 'transports', transport)): - return os.path.join(app.DATA_DIR, 'iconsets', 'transports', transport) - elif os.path.isdir(os.path.join(app.MY_ICONSETS_PATH, 'transports', + return os.path.join(configpaths.get('DATA'), 'iconsets', 'transports', transport) + elif os.path.isdir(os.path.join(configpaths.get('MY_ICONSETS'), 'transports', transport)): - return os.path.join(app.MY_ICONSETS_PATH, 'transports', transport) + return os.path.join(configpaths.get('MY_ICONSETS'), 'transports', transport) # No transport folder found, use default jabber one return get_iconset_path(app.config.get('iconset')) @@ -1606,13 +1608,13 @@ def version_condition(current_version, required_version): def get_available_emoticon_themes(): emoticons_themes = [] - emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons') + emoticons_data_path = os.path.join(configpaths.get('DATA'), 'emoticons') font_theme_path = os.path.join( - app.DATA_DIR, 'emoticons', 'font-emoticons', 'emoticons_theme.py') + configpaths.get('DATA'), 'emoticons', 'font-emoticons', 'emoticons_theme.py') folders = os.listdir(emoticons_data_path) - if os.path.isdir(app.MY_EMOTS_PATH): - folders += os.listdir(app.MY_EMOTS_PATH) + if os.path.isdir(configpaths.get('MY_EMOTS')): + folders += os.listdir(configpaths.get('MY_EMOTS')) file = 'emoticons_theme.py' if os.name == 'nt' and not os.path.exists(font_theme_path): @@ -1628,11 +1630,11 @@ def get_available_emoticon_themes(): return emoticons_themes def get_emoticon_theme_path(theme): - emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons', theme) + emoticons_data_path = os.path.join(configpaths.get('DATA'), 'emoticons', theme) if os.path.exists(emoticons_data_path): return emoticons_data_path - emoticons_user_path = os.path.join(app.MY_EMOTS_PATH, theme) + emoticons_user_path = os.path.join(configpaths.get('MY_EMOTS'), theme) if os.path.exists(emoticons_user_path): return emoticons_user_path ===================================== gajim/common/jingle_content.py ===================================== --- a/gajim/common/jingle_content.py +++ b/gajim/common/jingle_content.py @@ -19,6 +19,7 @@ Handles Jingle contents (XEP 0166) import os from gajim.common import app +from gajim.common import configpaths import nbxmpp from gajim.common.jingle_xtls import SELF_SIGNED_CERTIFICATE from gajim.common.jingle_xtls import load_cert_file @@ -221,8 +222,8 @@ class JingleContent: if self.use_security: security = nbxmpp.simplexml.Node( tag=nbxmpp.NS_JINGLE_XTLS + ' security') - certpath = os.path.join(app.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE)\ - + '.cert' + certpath = os.path.join( + configpaths.get('MY_CERT'), SELF_SIGNED_CERTIFICATE) + '.cert' cert = load_cert_file(certpath) if cert: try: ===================================== gajim/common/jingle_xtls.py ===================================== --- a/gajim/common/jingle_xtls.py +++ b/gajim/common/jingle_xtls.py @@ -21,6 +21,7 @@ import os import nbxmpp from gajim.common import app +from gajim.common import configpaths log = logging.getLogger('gajim.c.jingle_xtls') @@ -111,18 +112,18 @@ def get_context(fingerprint, verify_cb=None, remote_jid=None): elif fingerprint == 'client': ctx.set_verify(SSL.VERIFY_PEER, verify_cb or default_callback) - cert_name = os.path.join(app.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + cert_name = os.path.join(configpaths.get('MY_CERT'), SELF_SIGNED_CERTIFICATE) ctx.use_privatekey_file((cert_name + '.pkey').encode('utf-8')) ctx.use_certificate_file((cert_name + '.cert').encode('utf-8')) # Try to load Diffie-Hellman parameters. # First try user DH parameters, if this fails load the default DH parameters - dh_params_name = os.path.join(app.MY_CERT_DIR, DH_PARAMS) + dh_params_name = os.path.join(configpaths.get('MY_CERT'), DH_PARAMS) try: with open(dh_params_name, "r") as dh_params_file: ctx.load_tmp_dh(dh_params_name.encode('utf-8')) except FileNotFoundError as err: - default_dh_params_name = os.path.join(app.DATA_DIR, + default_dh_params_name = os.path.join(configpaths.get('DATA'), 'other', DEFAULT_DH_PARAMS) try: with open(default_dh_params_name, "r") as default_dh_params_file: @@ -134,7 +135,7 @@ def get_context(fingerprint, verify_cb=None, remote_jid=None): if remote_jid: store = ctx.get_cert_store() - path = os.path.join(os.path.expanduser(app.MY_PEER_CERTS_PATH), + path = os.path.join(os.path.expanduser(configpaths.get('MY_PEER_CERTS')), remote_jid) + '.cert' if os.path.exists(path): load_cert_file(path, cert_store=store) @@ -151,7 +152,7 @@ def read_cert(certpath): return certificate def send_cert(con, jid_from, sid): - certpath = os.path.join(app.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + \ + certpath = os.path.join(configpaths.get('MY_CERT'), SELF_SIGNED_CERTIFICATE) + \ '.cert' certificate = read_cert(certpath) iq = nbxmpp.Iq('result', to=jid_from) @@ -170,7 +171,7 @@ def send_cert(con, jid_from, sid): def handle_new_cert(con, obj, jid_from): jid = app.get_jid_without_resource(jid_from) - certpath = os.path.join(os.path.expanduser(app.MY_PEER_CERTS_PATH), jid) + certpath = os.path.join(os.path.expanduser(configpaths.get('MY_PEER_CERTS')), jid) certpath += '.cert' id_ = obj.getAttr('id') @@ -188,7 +189,7 @@ def handle_new_cert(con, obj, jid_from): approve_pending_content(id_) def check_cert(jid, fingerprint): - certpath = os.path.join(os.path.expanduser(app.MY_PEER_CERTS_PATH), jid) + certpath = os.path.join(os.path.expanduser(configpaths.get('MY_PEER_CERTS')), jid) certpath += '.cert' if os.path.exists(certpath): cert = load_cert_file(certpath) ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -58,6 +58,7 @@ from gajim.common import app from gajim.common import connection from gajim.common import dataforms from gajim.common import ged +from gajim.common import configpaths from gajim.accounts_window import AccountsWindow try: @@ -202,9 +203,10 @@ class PreferencesWindow: self.update_theme_list() # iconset - iconsets_list = os.listdir(os.path.join(app.DATA_DIR, 'iconsets')) - if os.path.isdir(app.MY_ICONSETS_PATH): - iconsets_list += os.listdir(app.MY_ICONSETS_PATH) + iconsets_list = os.listdir( + os.path.join(configpaths.get('DATA'), 'iconsets')) + if os.path.isdir(configpaths.get('MY_ICONSETS')): + iconsets_list += os.listdir(configpaths.get('MY_ICONSETS')) # new model, image in 0, string in 1 model = Gtk.ListStore(Gtk.Image, str) renderer_image = cell_renderer_image.CellRendererImage(0, 0) @@ -217,8 +219,8 @@ class PreferencesWindow: self.iconset_combobox.set_model(model) l = [] for dir in iconsets_list: - if not os.path.isdir(os.path.join(app.DATA_DIR, 'iconsets', dir)) \ - and not os.path.isdir(os.path.join(app.MY_ICONSETS_PATH, dir)): + if not os.path.isdir(os.path.join(configpaths.get('DATA'), 'iconsets', dir)) \ + and not os.path.isdir(os.path.join(configpaths.get('MY_ICONSETS'), dir)): continue if dir != '.svn' and dir != 'transports': l.append(dir) @@ -2292,7 +2294,8 @@ class AccountCreationWizardWindow: self.update_proxy_list() # parse servers.xml - servers_xml = os.path.join(app.DATA_DIR, 'other', 'servers.xml') + servers_xml = os.path.join( + configpaths.get('DATA'), 'other', 'servers.xml') servers = gtkgui_helpers.parse_server_xml(servers_xml) servers_model = self.xml.get_object('server_liststore') for server in servers: @@ -2532,16 +2535,17 @@ class AccountCreationWizardWindow: 'hostname'] # Check if cert is already in file certs = '' - if os.path.isfile(app.MY_CACERTS): - f = open(app.MY_CACERTS) + my_ca_certs = configpaths.get('MY_CACERTS') + if os.path.isfile(my_ca_certs): + f = open(my_ca_certs) certs = f.read() f.close() if self.ssl_cert in certs: dialogs.ErrorDialog(_('Certificate Already in File'), _('This certificate is already in file %s, so it\'s ' - 'not added again.') % app.MY_CACERTS) + 'not added again.') % my_ca_certs) else: - f = open(app.MY_CACERTS, 'a') + f = open(my_ca_certs, 'a') f.write(hostname + '\n') f.write(self.ssl_cert + '\n\n') f.close() ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -52,7 +52,7 @@ from gajim.common import pep from gajim.common import configpaths gtk_icon_theme = Gtk.IconTheme.get_default() -gtk_icon_theme.append_search_path(app.ICONS_DIR) +gtk_icon_theme.append_search_path(configpaths.get('ICONS')) class Color: BLACK = Gdk.RGBA(red=0, green=0, blue=0, alpha=1) @@ -610,7 +610,7 @@ def get_pep_as_pixbuf(pep_class): elif isinstance(pep_class, pep.UserTunePEP): icon = get_icon_pixmap('audio-x-generic', quiet=True) if not icon: - path = os.path.join(app.DATA_DIR, 'emoticons', 'static', + path = os.path.join(configpaths.get('DATA'), 'emoticons', 'static', 'music.png') return GdkPixbuf.Pixbuf.new_from_file(path) return icon ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1352,16 +1352,17 @@ class Interface: if is_checked[0]: # Check if cert is already in file certs = '' - if os.path.isfile(app.MY_CACERTS): - f = open(app.MY_CACERTS) + my_ca_certs = configpaths.get('MY_CACERTS') + if os.path.isfile(my_ca_certs): + f = open(my_ca_certs) certs = f.read() f.close() if obj.cert in certs: dialogs.ErrorDialog(_('Certificate Already in File'), _('This certificate is already in file %s, so it\'s ' - 'not added again.') % app.MY_CACERTS) + 'not added again.') % my_ca_certs) else: - f = open(app.MY_CACERTS, 'a') + f = open(my_ca_certs, 'a') f.write(server + '\n') f.write(obj.cert + '\n\n') f.close() @@ -2446,14 +2447,15 @@ class Interface: pixbuf = pixbuf.scale_simple(AvatarSize.PROFILE, AvatarSize.PROFILE, GdkPixbuf.InterpType.BILINEAR) - publish_path = os.path.join(app.AVATAR_PATH, 'temp_publish') + publish_path = os.path.join( + configpaths.get('AVATAR'), 'temp_publish') pixbuf.savev(publish_path, 'png', [], []) with open(publish_path, 'rb') as file: data = file.read() return self.save_avatar(data) sha = hashlib.sha1(data).hexdigest() - path = os.path.join(app.AVATAR_PATH, sha) + path = os.path.join(configpaths.get('AVATAR'), sha) try: with open(path, "wb") as output_file: output_file.write(data) @@ -2475,7 +2477,7 @@ class Interface: size = size * scale if publish: - path = os.path.join(app.AVATAR_PATH, filename) + path = os.path.join(configpaths.get('AVATAR'), filename) with open(path, 'rb') as file: data = file.read() return data @@ -2488,7 +2490,7 @@ class Interface: except KeyError: pass - path = os.path.join(app.AVATAR_PATH, filename) + path = os.path.join(configpaths.get('AVATAR'), filename) if not os.path.isfile(path): return @@ -2532,7 +2534,7 @@ class Interface: @staticmethod def avatar_exists(filename): - path = os.path.join(app.AVATAR_PATH, filename) + path = os.path.join(configpaths.get('AVATAR'), filename) if not os.path.isfile(path): return False return True @@ -2601,7 +2603,8 @@ class Interface: mood = received_mood if received_mood in pep.MOODS else 'unknown' return gtkgui_helpers.load_mood_icon(mood).get_pixbuf() elif isinstance(pep_obj, pep.UserTunePEP): - path = os.path.join(app.DATA_DIR, 'emoticons', 'static', 'music.png') + path = os.path.join( + configpaths.get('DATA'), 'emoticons', 'static', 'music.png') return GdkPixbuf.Pixbuf.new_from_file(path) elif isinstance(pep_obj, pep.UserActivityPEP): pep_ = pep_obj._pep_specific_data ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -47,6 +47,7 @@ from gi.repository import GLib from gi.repository import Gio from gajim.common import i18n +from gajim.common import configpaths def is_standalone(): @@ -59,10 +60,6 @@ def is_standalone(): if is_standalone(): - # Standalone Mode - # Must be done before importing app - from gajim.common import configpaths - try: shortargs = 'hvsc:l:p:' longargs = 'help verbose separate config-path= loglevel= profile=' @@ -474,7 +471,7 @@ class HistoryManager: dlg = xml.get_object('filechooserdialog') dlg.set_title(_('Exporting History Logs…')) - dlg.set_current_folder(app.HOME_DIR) + dlg.set_current_folder(configpaths.get('HOME')) dlg.props.do_overwrite_confirmation = True response = dlg.run() ===================================== gajim/plugins/gajimplugin.py ===================================== --- a/gajim/plugins/gajimplugin.py +++ b/gajim/plugins/gajimplugin.py @@ -27,7 +27,7 @@ Base class for implementing plugin. import os import locale -from gajim.common import app +from gajim.common import configpaths from gajim.plugins.helpers import log_calls, log from gajim.plugins.gui import GajimPluginConfigDialog @@ -213,7 +213,7 @@ class GajimPluginConfig(): def __init__(self, plugin): self.plugin = plugin self.FILE_PATH = os.path.join( - app.PLUGINS_CONFIG_DIR, self.plugin.short_name) + configpaths.get('PLUGINS_CONFIG_DIR'), self.plugin.short_name) self.data = {} @log_calls('GajimPluginConfig') ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -38,6 +38,7 @@ from gajim import gtkgui_helpers from gajim.dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog from gajim.htmltextview import HtmlTextView from gajim.common import app +from gajim.common import configpaths from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.plugins_i18n import _ @@ -161,8 +162,8 @@ class PluginsWindow(object): self.plugin_description_textview, None) self.plugin_description_textview.set_property('sensitive', True) - self.uninstall_plugin_button.set_property('sensitive', - app.PLUGINS_DIRS[1] in plugin.__path__) + self.uninstall_plugin_button.set_property( + 'sensitive', configpaths.get('PLUGINS_USER') in plugin.__path__) self.configure_plugin_button.set_property( 'sensitive', plugin.config_dialog is not None) ===================================== 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 @@ -107,7 +108,7 @@ class PluginManager(metaclass=Singleton): Registered names with instances of encryption Plugins. ''' - for path in [app.PLUGINS_DIRS[1], app.PLUGINS_DIRS[0]]: + for path in reversed(configpaths.get('PLUGINS_DIRS')): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) @@ -534,7 +535,7 @@ class PluginManager(metaclass=Singleton): try: if module_name in sys.modules: - if path == app.PLUGINS_DIRS[0]: + 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. @@ -632,7 +633,7 @@ class PluginManager(metaclass=Singleton): if len(dirs) > 1: raise PluginsystemError(_('Archive is malformed')) - base_dir, user_dir = app.PLUGINS_DIRS + base_dir, user_dir = configpaths.get('PLUGINS_DIRS') plugin_dir = os.path.join(user_dir, dirs[0]) if os.path.isdir(plugin_dir): ===================================== gajim/plugins/plugins_i18n.py ===================================== --- a/gajim/plugins/plugins_i18n.py +++ b/gajim/plugins/plugins_i18n.py @@ -23,9 +23,10 @@ import gettext from os import path as os_path import os from gajim.common import app +from gajim.common import configpaths APP = 'gajim_plugins' -plugins_locale_dir = os_path.join(app.PLUGINS_DIRS[1], 'locale') +plugins_locale_dir = os_path.join(configpaths.get('PLUGINS_USER'), 'locale') if os.name != 'nt': locale.setlocale(locale.LC_ALL, '') ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -44,6 +44,7 @@ from gajim import gtkgui_helpers from gajim.common import helpers from gajim.common import app from gajim.common import ged +from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.const import AvatarSize @@ -84,7 +85,7 @@ class VcardWindow: self.real_resource = contact.resource puny_jid = helpers.sanitize_filename(contact.jid) - local_avatar_basepath = os.path.join(app.AVATAR_PATH, puny_jid) + \ + local_avatar_basepath = os.path.join(configpaths.get('AVATAR'), puny_jid) + \ '_local' for extension in ('.png', '.jpeg'): local_avatar_path = local_avatar_basepath + extension ===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -47,7 +47,7 @@ def setup_env(): import logging logging.basicConfig() - app.DATA_DIR = gajim_root + '/gajim/data' + configpaths.override_path('DATA', gajim_root + '/gajim/data') app.use_x = use_x app.contacts = LegacyContactsAPI() app.connections = {} ===================================== test/test_pluginmanager.py ===================================== --- a/test/test_pluginmanager.py +++ b/test/test_pluginmanager.py @@ -54,9 +54,8 @@ configpaths.set_config_root(configdir) configpaths.init() # for some reason common.app needs to be imported before xmpppy? -from gajim.common import app -app.DATA_DIR = gajim_root + '/gajim/data' +configpaths.override_path('DATA', gajim_root + '/gajim/data') from common.stanza_session import StanzaSession View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/105427b8fdf6af213e73aacca48cda7ada… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/105427b8fdf6af213e73aacca48cda7ada… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor Gajim startup
by Philipp Hörist 25 Apr '18

25 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52cbae69 by Philipp Hörist at 2018-04-25T19:16:38+02:00 Refactor Gajim startup Remove as much as possible startup code from GtkApplication to stay more true to our goal to separate GUI from the rest of Gajim - - - - - 3 changed files: - + gajim/application.py - gajim/common/i18n.py - gajim/gajim.py Changes: ===================================== gajim/application.py ===================================== --- /dev/null +++ b/gajim/application.py @@ -0,0 +1,397 @@ +# -*- coding:utf-8 -*- +## src/gajim.py +## +## Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> +## Norman Rasmussen <norman AT rasmussen.co.za> +## Stéphan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Alex Mauer <hawke AT hawkesnest.net> +## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## James Newton <redshodan AT gmail.com> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Copyright (C) 2016-2017 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> +## Philipp Hörist <philipp AT hoerist.com> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +import sys +import os +from urllib.parse import unquote + +from gi.repository import GLib, Gio, Gtk + +from gajim.common import i18n +from gajim.common import configpaths +from gajim.common import logging_helpers + + +class GajimApplication(Gtk.Application): + '''Main class handling activation and command line.''' + + def __init__(self): + Gtk.Application.__init__(self, application_id='org.gajim.Gajim', + flags=( + Gio.ApplicationFlags.HANDLES_COMMAND_LINE | + Gio.ApplicationFlags.HANDLES_OPEN)) + + self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show the application\'s version')) + self.add_main_option('quiet', ord('q'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show only critical errors')) + self.add_main_option('separate', ord('s'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Separate profile files completely (even ' + 'history database and plugins)')) + self.add_main_option('verbose', ord('v'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Print XML stanzas and other debug ' + 'information')) + self.add_main_option('profile', ord('p'), GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Use defined profile in configuration ' + 'directory'), 'NAME') + self.add_main_option('config-path', ord('c'), GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Set configuration directory'), 'PATH') + self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Configure logging system'), 'LEVEL') + self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show all warnings')) + self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Open IPython shell')) + self.add_main_option('show-next-pending-event', 0, GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Pops up a window with the next pending event')) + self.add_main_option('start-chat', 0, GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Start a new chat')) + + self.add_main_option_entries(self._get_remaining_entry()) + + self.connect('handle-local-options', self._handle_local_options) + self.connect('command-line', self._handle_remote_options) + self.connect('startup', self._startup) + self.connect('activate', self._activate) + + self.interface = None + + GLib.set_prgname('gajim') + if GLib.get_application_name() != 'Gajim': + GLib.set_application_name('Gajim') + + @staticmethod + def _get_remaining_entry(): + option = GLib.OptionEntry() + option.arg = GLib.OptionArg.STRING_ARRAY + option.arg_data = None + option.arg_description = ('[URI …]') + option.flags = GLib.OptionFlags.NONE + option.long_name = GLib.OPTION_REMAINING + option.short_name = 0 + return [option] + + def _startup(self, application): + + # Create and initialize Application Paths & Databases + from gajim.common import app + app.detect_dependencies() + configpaths.create_paths() + from gajim.common import exceptions + from gajim.common import logger + from gajim.common import caps_cache + try: + app.logger = logger.Logger() + caps_cache.initialize(app.logger) + except exceptions.DatabaseMalformed as error: + dlg = Gtk.MessageDialog( + None, + Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, + Gtk.MessageType.ERROR, + Gtk.ButtonsType.OK, + _('Database Error')) + dlg.format_secondary_text(str(error)) + dlg.run() + dlg.destroy() + sys.exit() + + # Set Application Menu + app.app = self + path = os.path.join(configpaths.get('GUI'), 'application_menu.ui') + builder = Gtk.Builder() + builder.set_translation_domain(i18n.DOMAIN) + builder.add_from_file(path) + menubar = builder.get_object("menubar") + appmenu = builder.get_object("appmenu") + if app.prefers_app_menu(): + self.set_app_menu(appmenu) + else: + # Add it to the menubar instead + menubar.prepend_submenu('Gajim', appmenu) + self.set_menubar(menubar) + + def _activate(self, application): + if self.interface is not None: + self.interface.roster.window.present() + return + from gajim.gui_interface import Interface + from gajim import gtkgui_helpers + self.interface = Interface() + gtkgui_helpers.load_css() + self.interface.run(self) + self.add_actions() + from gajim import gui_menu_builder + gui_menu_builder.build_accounts_menu() + + def _open_uris(self, uris): + from gajim.common import app + for uri in uris: + app.log('uri_handler').info('open %s', uri) + if not uri.startswith('xmpp:'): + continue + # remove xmpp: + uri = uri[5:] + try: + jid, cmd = uri.split('?') + except ValueError: + # No query argument + jid, cmd = uri, 'message' + if cmd == 'join': + self.interface.join_gc_minimal(None, jid) + elif cmd == 'roster': + self.activate_action('add-contact', GLib.Variant('s', jid)) + elif cmd.startswith('message'): + attributes = cmd.split(';') + message = None + for key in attributes: + if key.startswith('body'): + try: + message = unquote(key.split('=')[1]) + except Exception: + app.log('uri_handler').error('Invalid URI: %s', cmd) + accounts = list(app.connections.keys()) + if not accounts: + continue + if len(accounts) == 1: + app.interface.new_chat_from_jid(accounts[0], jid, message) + else: + self.activate_action('start-chat') + start_chat_window = app.interface.instances['start_chat'] + start_chat_window.search_entry.set_text(jid) + + def do_shutdown(self, *args): + Gtk.Application.do_shutdown(self) + # Shutdown GUI and save config + if hasattr(self.interface, 'roster') and self.interface.roster: + self.interface.roster.prepare_quit() + + # Commit any outstanding SQL transactions + from gajim.common import app + app.logger.commit() + + def _handle_remote_options(self, application, command_line): + # Parse all options that should be executed on a remote instance + options = command_line.get_options_dict() + + remote_commands = ['ipython', + 'show-next-pending-event', + 'start-chat', + ] + + remaining = options.lookup_value(GLib.OPTION_REMAINING, + GLib.VariantType.new('as')) + + for cmd in remote_commands: + if options.contains(cmd): + self.activate_action(cmd) + return 0 + + if remaining is not None: + self._open_uris(remaining.unpack()) + return 0 + + self.activate() + return 0 + + def _handle_local_options(self, application, + options: GLib.VariantDict) -> int: + # Parse all options that have to be executed before ::startup + if options.contains('profile'): + # Incorporate profile name into application id + # to have a single app instance for each profile. + profile = options.lookup_value('profile').get_string() + app_id = '%s.%s' % (self.get_application_id(), profile) + self.set_application_id(app_id) + configpaths.set_profile(profile) + if options.contains('separate'): + configpaths.set_separation(True) + if options.contains('config-path'): + path = options.lookup_value('config-path').get_string() + configpaths.set_config_root(path) + + configpaths.init() + logging_helpers.init() + + if options.contains('quiet'): + logging_helpers.set_quiet() + if options.contains('verbose'): + logging_helpers.set_verbose() + if options.contains('loglevel'): + loglevel = options.lookup_value('loglevel').get_string() + logging_helpers.set_loglevels(loglevel) + if options.contains('warnings'): + self.show_warnings() + + return -1 + + def show_warnings(self): + import traceback + import warnings + + def warn_with_traceback(message, category, filename, lineno, + file=None, line=None): + traceback.print_stack(file=sys.stderr) + sys.stderr.write(warnings.formatwarning(message, category, + filename, lineno, line)) + + warnings.showwarning = warn_with_traceback + warnings.filterwarnings(action="always") + + def add_actions(self): + ''' Build Application Actions ''' + from gajim.app_actions import AppActions + from gajim.common import app + action = AppActions(self) + + self.account_actions = [ + ('-start-single-chat', action.on_single_message, 'online', 's'), + ('-join-groupchat', action.on_join_gc, 'online', 's'), + ('-add-contact', action.on_add_contact, 'online', 's'), + ('-services', action.on_service_disco, 'online', 's'), + ('-profile', action.on_profile, 'feature', 's'), + ('-xml-console', action.on_xml_console, 'always', 's'), + ('-server-info', action.on_server_info, 'online', 's'), + ('-archive', action.on_archiving_preferences, 'feature', 's'), + ('-sync-history', action.on_history_sync, 'online', 's'), + ('-privacylists', action.on_privacy_lists, 'feature', 's'), + ('-send-server-message', + action.on_send_server_message, 'online', 's'), + ('-set-motd', action.on_set_motd, 'online', 's'), + ('-update-motd', action.on_update_motd, 'online', 's'), + ('-delete-motd', action.on_delete_motd, 'online', 's'), + ('-activate-bookmark', + action.on_activate_bookmark, 'online', 'a{sv}'), + ('-open-event', action.on_open_event, 'always', 'a{sv}'), + ('-import-contacts', action.on_import_contacts, 'online', 's'), + ] + + # General Stateful Actions + + act = Gio.SimpleAction.new_stateful( + 'merge', None, + GLib.Variant.new_boolean(app.config.get('mergeaccounts'))) + act.connect('change-state', action.on_merge_accounts) + self.add_action(act) + + act = Gio.SimpleAction.new_stateful( + 'agent', None, + GLib.Variant.new_boolean(app.config.get('use_gpg_agent'))) + self.add_action(act) + + # General Actions + + self.general_actions = [ + ('quit', action.on_quit), + ('accounts', action.on_accounts), + ('add-account', action.on_add_account), + ('manage-proxies', action.on_manage_proxies), + ('start-chat', action.on_new_chat), + ('bookmarks', action.on_manage_bookmarks), + ('history-manager', action.on_history_manager), + ('preferences', action.on_preferences), + ('plugins', action.on_plugins), + ('file-transfer', action.on_file_transfers), + ('history', action.on_history), + ('shortcuts', action.on_keyboard_shortcuts), + ('features', action.on_features), + ('content', action.on_contents), + ('about', action.on_about), + ('faq', action.on_faq), + ('ipython', action.toggle_ipython), + ('show-next-pending-event', action.show_next_pending_event), + ] + + act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) + act.connect("activate", action.on_add_contact_jid) + self.add_action(act) + + for action in self.general_actions: + action_name, func = action + act = Gio.SimpleAction.new(action_name, None) + act.connect("activate", func) + self.add_action(act) + + accounts_list = sorted(app.config.get_per('accounts')) + if not accounts_list: + return + if len(accounts_list) > 1: + for acc in accounts_list: + self.add_account_actions(acc) + else: + self.add_account_actions(accounts_list[0]) + + def add_account_actions(self, account): + for action in self.account_actions: + action_name, func, state, type_ = action + action_name = account + action_name + if self.lookup_action(action_name): + # We already added this action + continue + act = Gio.SimpleAction.new( + action_name, GLib.VariantType.new(type_)) + act.connect("activate", func) + if state != 'always': + act.set_enabled(False) + self.add_action(act) + + def remove_account_actions(self, account): + for action in self.account_actions: + action_name = account + action[0] + self.remove_action(action_name) + + def set_account_actions_state(self, account, new_state=False): + for action in self.account_actions: + action_name, _, state, _ = action + if not new_state and state in ('online', 'feature'): + # We go offline + self.lookup_action(account + action_name).set_enabled(False) + elif new_state and state == 'online': + # We go online + self.lookup_action(account + action_name).set_enabled(True) ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -133,7 +133,6 @@ def initialize_win_translation(): def initialize_direction_mark(): - import gi from gi.repository import Gtk global direction_mark ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -1,461 +1,112 @@ -# -*- coding:utf-8 -*- -## src/gajim.py -## -## Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> -## Norman Rasmussen <norman AT rasmussen.co.za> -## Stéphan Kochen <stephan AT kochen.nl> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -## Alex Mauer <hawke AT hawkesnest.net> -## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> -## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> -## James Newton <redshodan AT gmail.com> -## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> -## Julien Pivotto <roidelapluie AT gmail.com> -## Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Copyright (C) 2016-2017 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> -## Philipp Hörist <philipp AT hoerist.com> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## +# -*- coding: utf-8 -*- +# +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# Gajim is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + -import sys import os +import sys import signal -from urllib.parse import unquote - -import gi -gi.require_version('GLib', '2.0') -gi.require_version('Gio', '2.0') -gi.require_version('Gtk', '3.0') -gi.require_version('Gdk', '3.0') -gi.require_version('GObject', '2.0') -gi.require_version('Pango', '1.0') -from gi.repository import GLib, Gio, Gtk +import platform +from ctypes import CDLL, byref, create_string_buffer +from ctypes.util import find_library +from distutils.version import LooseVersion as V +# Install _() in namespace from gajim.common import i18n -from gajim.common import configpaths -from gajim.common import logging_helpers - -MIN_NBXMPP_VER = "0.6.4" -MIN_GTK_VER = "3.22.0" - - -class GajimApplication(Gtk.Application): - '''Main class handling activation and command line.''' - - def __init__(self): - Gtk.Application.__init__(self, application_id='org.gajim.Gajim', - flags=( - Gio.ApplicationFlags.HANDLES_COMMAND_LINE | - Gio.ApplicationFlags.HANDLES_OPEN)) - - self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show the application\'s version')) - self.add_main_option('quiet', ord('q'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show only critical errors')) - self.add_main_option('separate', ord('s'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Separate profile files completely (even ' - 'history database and plugins)')) - self.add_main_option('verbose', ord('v'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Print XML stanzas and other debug ' - 'information')) - self.add_main_option('profile', ord('p'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Use defined profile in configuration ' - 'directory'), 'NAME') - self.add_main_option('config-path', ord('c'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Set configuration directory'), 'PATH') - self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Configure logging system'), 'LEVEL') - self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show all warnings')) - self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Open IPython shell')) - self.add_main_option('show-next-pending-event', 0, GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Pops up a window with the next pending event')) - self.add_main_option('start-chat', 0, GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Start a new chat')) - - self.add_main_option_entries(self._get_remaining_entry()) - - self.connect('handle-local-options', self._handle_local_options) - self.connect('command-line', self._handle_remote_options) - self.connect('startup', self._startup) - self.connect('activate', self._activate) - - self.interface = None - - GLib.set_prgname('gajim') - if GLib.get_application_name() != 'Gajim': - GLib.set_application_name('Gajim') - - @staticmethod - def _get_remaining_entry(): - option = GLib.OptionEntry() - option.arg = GLib.OptionArg.STRING_ARRAY - option.arg_data = None - option.arg_description = ('[URI …]') - option.flags = GLib.OptionFlags.NONE - option.long_name = GLib.OPTION_REMAINING - option.short_name = 0 - return [option] - - def _startup(self, application): - from gajim import gtkexcepthook - gtkexcepthook.init() - - try: - import nbxmpp - except ImportError: - print('Gajim needs python-nbxmpp to run. Quitting…') - sys.exit(1) - - from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): - print('Gajim needs python-nbxmpp >= %s to run. ' - 'Quitting...' % MIN_NBXMPP_VER) - sys.exit(1) - - gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) - if V(gtk_ver) < V(MIN_GTK_VER): - print('Gajim needs GTK+ >= %s to run. ' - 'Quitting...' % MIN_GTK_VER) - sys.exit(1) - - # Create and initialize Application Paths & Databases - from gajim.common import app - i18n.initialize_direction_mark() - app.detect_dependencies() - configpaths.create_paths() - from gajim.common import exceptions - from gajim.common import logger - from gajim.common import caps_cache - try: - app.logger = logger.Logger() - caps_cache.initialize(app.logger) - except exceptions.DatabaseMalformed as error: - dlg = Gtk.MessageDialog( - None, - Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, - Gtk.MessageType.ERROR, - Gtk.ButtonsType.OK, - _('Database Error')) - dlg.format_secondary_text(str(error)) - dlg.run() - dlg.destroy() - sys.exit() - from ctypes import CDLL, byref, create_string_buffer - from ctypes.util import find_library - import platform +_MIN_NBXMPP_VER = "0.6.4" +_MIN_GTK_VER = "3.22.0" - sysname = platform.system() - if sysname in ('Linux', 'FreeBSD', 'OpenBSD', 'NetBSD'): - libc = CDLL(find_library('c')) - # The constant defined in <linux/prctl.h> which is used to set the name - # of the process. - PR_SET_NAME = 15 +def _check_required_deps(): + try: + import nbxmpp + except ImportError: + print('Gajim needs python-nbxmpp to run. Quitting…') + sys.exit(1) - if sysname == 'Linux': - proc_name = b'gajim' - buff = create_string_buffer(len(proc_name)+1) - buff.value = proc_name - libc.prctl(PR_SET_NAME, byref(buff), 0, 0, 0) - elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): - libc.setproctitle('gajim') + from distutils.version import LooseVersion as V + if V(nbxmpp.__version__) < V(_MIN_NBXMPP_VER): + print('Gajim needs python-nbxmpp >= %s to run. ' + 'Quitting...' % _MIN_NBXMPP_VER) + sys.exit(1) - def sigint_cb(num, stack): - print('SIGINT/SIGTERM received') - self.quit() - # ^C exits the application normally - signal.signal(signal.SIGINT, sigint_cb) - signal.signal(signal.SIGTERM, sigint_cb) - # Set Application Menu - app.app = self - path = os.path.join(configpaths.get('GUI'), 'application_menu.ui') - builder = Gtk.Builder() - builder.set_translation_domain(i18n.DOMAIN) - builder.add_from_file(path) - menubar = builder.get_object("menubar") - appmenu = builder.get_object("appmenu") - if app.prefers_app_menu(): - self.set_app_menu(appmenu) - else: - # Add it to the menubar instead - menubar.prepend_submenu('Gajim', appmenu) - self.set_menubar(menubar) +def _init_gui(gui): + if gui == 'GTK': + _init_gtk() - def _activate(self, application): - if self.interface is not None: - self.interface.roster.window.present() - return - from gajim.gui_interface import Interface - from gajim import gtkgui_helpers - self.interface = Interface() - gtkgui_helpers.load_css() - self.interface.run(self) - self.add_actions() - from gajim import gui_menu_builder - gui_menu_builder.build_accounts_menu() - def _open_uris(self, uris): - from gajim.common import app - for uri in uris: - app.log('uri_handler').info('open %s', uri) - if not uri.startswith('xmpp:'): - continue - # remove xmpp: - uri = uri[5:] - try: - jid, cmd = uri.split('?') - except ValueError: - # No query argument - jid, cmd = uri, 'message' - if cmd == 'join': - self.interface.join_gc_minimal(None, jid) - elif cmd == 'roster': - self.activate_action('add-contact', GLib.Variant('s', jid)) - elif cmd.startswith('message'): - attributes = cmd.split(';') - message = None - for key in attributes: - if key.startswith('body'): - try: - message = unquote(key.split('=')[1]) - except Exception: - app.log('uri_handler').error('Invalid URI: %s', cmd) - accounts = list(app.connections.keys()) - if not accounts: - continue - if len(accounts) == 1: - app.interface.new_chat_from_jid(accounts[0], jid, message) - else: - self.activate_action('start-chat') - start_chat_window = app.interface.instances['start_chat'] - start_chat_window.search_entry.set_text(jid) +def _init_gtk(): + import gi + gi.require_version('GLib', '2.0') + gi.require_version('Gio', '2.0') + gi.require_version('Gtk', '3.0') + gi.require_version('Gdk', '3.0') + gi.require_version('GObject', '2.0') + gi.require_version('Pango', '1.0') - def do_shutdown(self, *args): - Gtk.Application.do_shutdown(self) - # Shutdown GUI and save config - if hasattr(self.interface, 'roster') and self.interface.roster: - self.interface.roster.prepare_quit() + from gi.repository import Gtk + gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) + if V(gtk_ver) < V(_MIN_GTK_VER): + print('Gajim needs GTK+ >= %s to run. ' + 'Quitting...' % _MIN_GTK_VER) + sys.exit(1) - # Commit any outstanding SQL transactions - from gajim.common import app - app.logger.commit() + from gajim import gtkexcepthook + gtkexcepthook.init() - def _handle_remote_options(self, application, command_line): - # Parse all options that should be executed on a remote instance - options = command_line.get_options_dict() + i18n.initialize_direction_mark() - remote_commands = ['ipython', - 'show-next-pending-event', - 'start-chat', - ] + from gajim.application import GajimApplication - remaining = options.lookup_value(GLib.OPTION_REMAINING, - GLib.VariantType.new('as')) + application = GajimApplication() + _install_terminate(application) + application.run(sys.argv) - for cmd in remote_commands: - if options.contains(cmd): - self.activate_action(cmd) - return 0 - if remaining is not None: - self._open_uris(remaining.unpack()) - return 0 +def _set_proc_title(): + sysname = platform.system() + if sysname in ('Linux', 'FreeBSD', 'OpenBSD', 'NetBSD'): + libc = CDLL(find_library('c')) - self.activate() - return 0 + # The constant defined in <linux/prctl.h> which is used to set the name + # of the process. + PR_SET_NAME = 15 - def _handle_local_options(self, application, - options: GLib.VariantDict) -> int: - # Parse all options that have to be executed before ::startup - if options.contains('profile'): - # Incorporate profile name into application id - # to have a single app instance for each profile. - profile = options.lookup_value('profile').get_string() - app_id = '%s.%s' % (self.get_application_id(), profile) - self.set_application_id(app_id) - configpaths.set_profile(profile) - if options.contains('separate'): - configpaths.set_separation(True) - if options.contains('config-path'): - path = options.lookup_value('config-path').get_string() - configpaths.set_config_root(path) + if sysname == 'Linux': + proc_name = b'gajim' + buff = create_string_buffer(len(proc_name)+1) + buff.value = proc_name + libc.prctl(PR_SET_NAME, byref(buff), 0, 0, 0) + elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): + libc.setproctitle('gajim') - configpaths.init() - logging_helpers.init() - if options.contains('quiet'): - logging_helpers.set_quiet() - if options.contains('verbose'): - logging_helpers.set_verbose() - if options.contains('loglevel'): - loglevel = options.lookup_value('loglevel').get_string() - logging_helpers.set_loglevels(loglevel) - if options.contains('warnings'): - self.show_warnings() - - return -1 - - def show_warnings(self): - import traceback - import warnings - - def warn_with_traceback(message, category, filename, lineno, - file=None, line=None): - traceback.print_stack(file=sys.stderr) - sys.stderr.write(warnings.formatwarning(message, category, - filename, lineno, line)) - - warnings.showwarning = warn_with_traceback - warnings.filterwarnings(action="always") - - def add_actions(self): - ''' Build Application Actions ''' - from gajim.app_actions import AppActions - from gajim.common import app - action = AppActions(self) - - self.account_actions = [ - ('-start-single-chat', action.on_single_message, 'online', 's'), - ('-join-groupchat', action.on_join_gc, 'online', 's'), - ('-add-contact', action.on_add_contact, 'online', 's'), - ('-services', action.on_service_disco, 'online', 's'), - ('-profile', action.on_profile, 'feature', 's'), - ('-xml-console', action.on_xml_console, 'always', 's'), - ('-server-info', action.on_server_info, 'online', 's'), - ('-archive', action.on_archiving_preferences, 'feature', 's'), - ('-sync-history', action.on_history_sync, 'online', 's'), - ('-privacylists', action.on_privacy_lists, 'feature', 's'), - ('-send-server-message', - action.on_send_server_message, 'online', 's'), - ('-set-motd', action.on_set_motd, 'online', 's'), - ('-update-motd', action.on_update_motd, 'online', 's'), - ('-delete-motd', action.on_delete_motd, 'online', 's'), - ('-activate-bookmark', - action.on_activate_bookmark, 'online', 'a{sv}'), - ('-open-event', action.on_open_event, 'always', 'a{sv}'), - ('-import-contacts', action.on_import_contacts, 'online', 's'), - ] - - # General Stateful Actions - - act = Gio.SimpleAction.new_stateful( - 'merge', None, - GLib.Variant.new_boolean(app.config.get('mergeaccounts'))) - act.connect('change-state', action.on_merge_accounts) - self.add_action(act) - - act = Gio.SimpleAction.new_stateful( - 'agent', None, - GLib.Variant.new_boolean(app.config.get('use_gpg_agent'))) - self.add_action(act) - - # General Actions - - self.general_actions = [ - ('quit', action.on_quit), - ('accounts', action.on_accounts), - ('add-account', action.on_add_account), - ('manage-proxies', action.on_manage_proxies), - ('start-chat', action.on_new_chat), - ('bookmarks', action.on_manage_bookmarks), - ('history-manager', action.on_history_manager), - ('preferences', action.on_preferences), - ('plugins', action.on_plugins), - ('file-transfer', action.on_file_transfers), - ('history', action.on_history), - ('shortcuts', action.on_keyboard_shortcuts), - ('features', action.on_features), - ('content', action.on_contents), - ('about', action.on_about), - ('faq', action.on_faq), - ('ipython', action.toggle_ipython), - ('show-next-pending-event', action.show_next_pending_event), - ] - - act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) - act.connect("activate", action.on_add_contact_jid) - self.add_action(act) - - for action in self.general_actions: - action_name, func = action - act = Gio.SimpleAction.new(action_name, None) - act.connect("activate", func) - self.add_action(act) - - accounts_list = sorted(app.config.get_per('accounts')) - if not accounts_list: - return - if len(accounts_list) > 1: - for acc in accounts_list: - self.add_account_actions(acc) - else: - self.add_account_actions(accounts_list[0]) - - def add_account_actions(self, account): - for action in self.account_actions: - action_name, func, state, type_ = action - action_name = account + action_name - if self.lookup_action(action_name): - # We already added this action - continue - act = Gio.SimpleAction.new( - action_name, GLib.VariantType.new(type_)) - act.connect("activate", func) - if state != 'always': - act.set_enabled(False) - self.add_action(act) - - def remove_account_actions(self, account): - for action in self.account_actions: - action_name = account + action[0] - self.remove_action(action_name) - - def set_account_actions_state(self, account, new_state=False): - for action in self.account_actions: - action_name, _, state, _ = action - if not new_state and state in ('online', 'feature'): - # We go offline - self.lookup_action(account + action_name).set_enabled(False) - elif new_state and state == 'online': - # We go online - self.lookup_action(account + action_name).set_enabled(True) +def _install_terminate(application): + def sigint_cb(num, stack): + print('SIGINT/SIGTERM received') + application.quit() + # ^C exits the application normally + signal.signal(signal.SIGINT, sigint_cb) + signal.signal(signal.SIGTERM, sigint_cb) def main(): @@ -463,9 +114,6 @@ def main(): if os.geteuid() == 0: sys.exit("You must not launch gajim as root, it is insecure.") - appli = GajimApplication() - appli.run(sys.argv) - - -if __name__ == '__main__': - main() + _check_required_deps() + _set_proc_title() + _init_gui('GTK') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52cbae69eed7f205edb8a22072f7b18e66… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52cbae69eed7f205edb8a22072f7b18e66… 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 24 Apr '18

24 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1c48ee40 by Philipp Hörist at 2018-04-24T23:53:18+02:00 Fix Windows build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== 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/commit/1c48ee405d1d9496731ac2c203fef31342… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c48ee405d1d9496731ac2c203fef31342… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor i18n module
by Philipp Hörist 24 Apr '18

24 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e2383fd7 by Philipp Hörist at 2018-04-24T23:03:19+02:00 Refactor i18n module - Move everything translation related from gajim.py to i18n.py - - - - - 4 changed files: - gajim/common/app.py - gajim/common/i18n.py - gajim/gajim.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -80,16 +80,6 @@ MY_CERT_DIR = configpaths.get('MY_CERT') RecentGroupchat = namedtuple('RecentGroupchat', ['room', 'server', 'nickname']) -try: - LANG = locale.getdefaultlocale()[0] # en_US, fr_FR, el_GR etc.. -except (ValueError, locale.Error): - # unknown locale, use en is better than fail - LANG = None -if LANG is None: - LANG = 'en' -else: - LANG = LANG[:2] # en, fr, el etc.. - os_info = None # used to cache os information transport_type = {} # list the type of transport ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -5,6 +5,7 @@ ## Copyright (C) 2004 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2009 Benjamin Richter <br AT waldteufel-online.net> +## Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> ## ## This file is part of Gajim. ## @@ -26,66 +27,137 @@ import gettext import os import unicodedata -# May be changed after GTK is imported +DOMAIN = 'gajim' +LANG = 'en' direction_mark = '\u200E' +_translations = None -def paragraph_direction_mark(text): - """ - Determine paragraph writing direction according to - http://www.unicode.org/reports/tr9/#The_Paragraph_Level - Returns either Unicode LTR mark or RTL mark. - """ - for char in text: - bidi = unicodedata.bidirectional(char) - if bidi == 'L': - return '\u200E' - elif bidi == 'AL' or bidi == 'R': - return '\u200F' +def initialize(): + global _translations - return '\u200E' + locale.setlocale(locale.LC_ALL, '') + # initialize_win_translation() broken + initialize_lang() + set_i18n_env() + + localedir = get_locale_dir() + if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, localedir) + + gettext.install(DOMAIN, localedir) + if gettext._translations: + _translations = list(gettext._translations.values())[0] + else: + _translations = gettext.NullTranslations() + + +def set_i18n_env(): + if os.name == 'nt': + lang = os.getenv('LANG') + if lang is None: + default_lang = locale.getdefaultlocale()[0] + if default_lang: + lang = default_lang + + if lang: + os.environ['LANG'] = lang -APP = 'gajim' -# set '' so each part of the locale that should be modified is set -# according to the environment variables -locale.setlocale(locale.LC_ALL, '') +def initialize_lang(): + global LANG + try: + # en_US, fr_FR, el_GR etc.. + LANG = locale.getdefaultlocale()[0] + LANG = LANG[:2] + except (ValueError, locale.Error): + pass -## For windows: set, if needed, a value in LANG environmental variable ## -if os.name == 'nt': - lang = os.getenv('LANG') - if lang is None: - default_lang = locale.getdefaultlocale()[0] # en_US, fr_FR, el_GR etc.. - if default_lang: - lang = default_lang - if lang: - os.environ['LANG'] = lang +def get_locale_dir(): + if os.name == 'nt': + return "../po" - localedir = "../po" -else: # try to find domain in localedir - path = gettext.find(APP) + path = gettext.find(DOMAIN) if path: # extract localedir from localedir/language/LC_MESSAGES/domain.mo path, tail = os.path.split(path) path, tail = os.path.split(path) localedir, tail = os.path.split(path) - else: # fallback to user locale + else: + # fallback to user locale base = os.getenv('XDG_DATA_HOME') if base is None or base[0] != '/': base = os.path.expanduser('~/.local/share') localedir = os.path.join(base, "locale") + return localedir + + +def initialize_win_translation(): + # broken for now + return + + if os.name != 'nt': + return + + # needed for docutils + # sys.path.append('.') + APP = 'gajim' + DIR = '../po' + lang = locale.getdefaultlocale()[0] + os.environ['LANG'] = lang + gettext.bindtextdomain(APP, DIR) + gettext.textdomain(APP) + gettext.install(APP, DIR) + + # This is for Windows translation which is currently not + # working on GTK 3.18.9 + # locale.setlocale(locale.LC_ALL, '') + # import ctypes + # import ctypes.util + # libintl_path = ctypes.util.find_library('intl') + # if libintl_path == None: + # local_intl = os.path.join('gtk', 'bin', 'intl.dll') + # if os.path.exists(local_intl): + # libintl_path = local_intl + # if libintl_path == None: + # raise ImportError('intl.dll library not found') + # libintl = ctypes.cdll.LoadLibrary(libintl_path) + # libintl.bindtextdomain(APP, DIR) + # libintl.bind_textdomain_codeset(APP, 'UTF-8') + # plugins_locale_dir = os.path.join(common.configpaths[ + # 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) + # libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) + # libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') + + +def initialize_direction_mark(): + import gi + from gi.repository import Gtk + + global direction_mark + + if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: + direction_mark = '\u200F' - if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(APP, localedir) -gettext.install(APP, localedir) +def paragraph_direction_mark(text): + """ + Determine paragraph writing direction according to + http://www.unicode.org/reports/tr9/#The_Paragraph_Level + + Returns either Unicode LTR mark or RTL mark. + """ + for char in text: + bidi = unicodedata.bidirectional(char) + if bidi == 'L': + return '\u200E' + elif bidi == 'AL' or bidi == 'R': + return '\u200F' + + return '\u200E' -if gettext._translations: - _translation = list(gettext._translations.values())[0] -else: - _translation = gettext.NullTranslations() def Q_(text): """ @@ -107,16 +179,20 @@ def Q_(text): qualifier, text = text.split(':', 1) return text -def ngettext(s_sing, s_plural, n, replace_sing = None, replace_plural = None): + +def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): """ Use as: - i18n.ngettext('leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c') + i18n.ngettext('leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c') In other words this is a hack to ngettext() to support %s %d etc.. """ - text = _translation.ngettext(s_sing, s_plural, n) + text = _translations.ngettext(s_sing, s_plural, n) if n == 1 and replace_sing is not None: text = text % replace_sing elif n > 1 and replace_plural is not None: text = text % replace_plural return text + + +initialize() ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -40,7 +40,6 @@ import sys import os import signal -import locale from urllib.parse import unquote import gi @@ -156,6 +155,7 @@ class GajimApplication(Gtk.Application): # Create and initialize Application Paths & Databases from gajim.common import app + i18n.initialize_direction_mark() app.detect_dependencies() configpaths.create_paths() from gajim.common import exceptions @@ -176,41 +176,6 @@ class GajimApplication(Gtk.Application): dlg.destroy() sys.exit() - if os.name == 'nt': - import gettext - # needed for docutils - sys.path.append('.') - APP = 'gajim' - DIR = '../po' - lang = locale.getdefaultlocale()[0] - os.environ['LANG'] = lang - gettext.bindtextdomain(APP, DIR) - gettext.textdomain(APP) - gettext.install(APP, DIR) - - # This is for Windows translation which is currently not - # working on GTK 3.18.9 - # locale.setlocale(locale.LC_ALL, '') - # import ctypes - # import ctypes.util - # libintl_path = ctypes.util.find_library('intl') - # if libintl_path == None: - # local_intl = os.path.join('gtk', 'bin', 'intl.dll') - # if os.path.exists(local_intl): - # libintl_path = local_intl - # if libintl_path == None: - # raise ImportError('intl.dll library not found') - # libintl = ctypes.cdll.LoadLibrary(libintl_path) - # libintl.bindtextdomain(APP, DIR) - # libintl.bind_textdomain_codeset(APP, 'UTF-8') - # plugins_locale_dir = os.path.join(common.configpaths[ - # 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) - # libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) - # libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') - - if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: - i18n.direction_mark = '\u200F' - from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library import platform @@ -242,7 +207,7 @@ class GajimApplication(Gtk.Application): app.app = self path = os.path.join(configpaths.get('GUI'), 'application_menu.ui') builder = Gtk.Builder() - builder.set_translation_domain(i18n.APP) + builder.set_translation_domain(i18n.DOMAIN) builder.add_from_file(path) menubar = builder.get_object("menubar") appmenu = builder.get_object("appmenu") @@ -319,7 +284,7 @@ class GajimApplication(Gtk.Application): remote_commands = ['ipython', 'show-next-pending-event', 'start-chat', - ] + ] remaining = options.lookup_value(GLib.OPTION_REMAINING, GLib.VariantType.new('as')) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -124,7 +124,7 @@ def get_image_button(icon_name, tooltip, toggle=False): def get_gtk_builder(file_name, widget=None): file_path = os.path.join(configpaths.get('GUI'), file_name) builder = Gtk.Builder() - builder.set_translation_domain(i18n.APP) + builder.set_translation_domain(i18n.DOMAIN) if widget: builder.add_objects_from_file(file_path, [widget]) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e2383fd7a4cfd8d1dc38ca51fb74f97e7a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e2383fd7a4cfd8d1dc38ca51fb74f97e7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import / codestyle
by Philipp Hörist 24 Apr '18

24 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21d4d0cb by Philipp Hörist at 2018-04-24T21:34:53+02:00 Remove unused import / codestyle Pass args to logging method instead of string formatting - - - - - 1 changed file: - gajim/common/resolver.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -17,7 +17,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys import logging import functools @@ -25,6 +24,7 @@ from gi.repository import Gio, GLib log = logging.getLogger('gajim.c.resolver') + def get_resolver(): return GioResolver() @@ -38,7 +38,7 @@ class CommonResolver(): def resolve(self, host, on_ready, type_='srv'): host = host.lower() - log.debug('resolve %s type=%s' % (host, type_)) + log.debug('resolve %s type=%s', host, type_) assert(type_ in ['srv', 'txt']) if not host: # empty host, return empty list of srv records @@ -46,25 +46,25 @@ class CommonResolver(): return if host + type_ in self.resolved_hosts: # host is already resolved, return cached values - log.debug('%s already resolved: %s' % (host, - self.resolved_hosts[host + type_])) + log.debug('%s already resolved: %s', + host, self.resolved_hosts[host + type_]) on_ready(host, self.resolved_hosts[host + type_]) return if host + type_ in self.handlers: # host is about to be resolved by another connection, # attach our callback - log.debug('already resolving %s' % host) + log.debug('already resolving %s', host) self.handlers[host + type_].append(on_ready) else: # host has never been resolved, start now - log.debug('Starting to resolve %s using %s' % (host, self)) + log.debug('Starting to resolve %s using %s', host, self) self.handlers[host + type_] = [on_ready] self.start_resolve(host, type_) def _on_ready(self, host, type_, result_list): # practically it is impossible to be the opposite, but who knows :) host = host.lower() - log.debug('Resolving result for %s: %s' % (host, result_list)) + log.debug('Resolving result for %s: %s', host, result_list) if host + type_ not in self.resolved_hosts: self.resolved_hosts[host + type_] = result_list if host + type_ in self.handlers: @@ -94,7 +94,7 @@ class GioResolver(CommonResolver): callback = functools.partial(self._on_ready_srv, host) type_ = Gio.ResolverRecordType.SRV - resq = self.gio_resolver.lookup_records_async(host, type_, None, callback) + self.gio_resolver.lookup_records_async(host, type_, None, callback) def _on_ready_srv(self, host, source_object, result): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21d4d0cb1eff21b9787df0f42ac5010991… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21d4d0cb1eff21b9787df0f42ac5010991… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Detect dependencys only on demand
by Philipp Hörist 24 Apr '18

24 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e265514d by Philipp Hörist at 2018-04-24T19:36:33+02:00 Detect dependencys only on demand This allows us to import the app module without triggering dependency detection Also add is_installed() for checking if a dependency is installed and disable_dependency() in case we dont want to use a dependency - - - - - 19 changed files: - gajim/accounts_window.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/gpg.py - gajim/common/helpers.py - gajim/common/jingle.py - gajim/common/protocol/bytestream.py - gajim/common/stanza_session.py - gajim/config.py - gajim/dialogs.py - gajim/features_window.py - gajim/gajim.py - gajim/gui_interface.py - gajim/message_textview.py - gajim/options_dialog.py - gajim/roster_window.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -384,9 +384,10 @@ class Account(Gtk.Box): def set_activatable(self): if self.account == app.ZEROCONF_ACC_NAME: - self.get_parent().set_activatable(app.HAVE_ZEROCONF) - self.get_parent().set_sensitive(app.HAVE_ZEROCONF) - if not app.HAVE_ZEROCONF: + zeroconf = app.is_installed('ZEROCONF') + self.get_parent().set_activatable(zeroconf) + self.get_parent().set_sensitive(zeroconf) + if not zeroconf: self.get_parent().set_tooltip_text( _('Please check if Avahi or Bonjour is installed.')) @@ -482,7 +483,7 @@ class GenericOptionPage(Gtk.Box): switch.set_vexpand(False) switch.set_valign(Gtk.Align.CENTER) switch.set_halign(Gtk.Align.END) - if self.account == app.ZEROCONF_ACC_NAME and not app.HAVE_ZEROCONF: + if self.account == app.ZEROCONF_ACC_NAME and not app.is_installed('ZEROCONF'): switch.set_sensitive(False) switch.set_active(False) ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -394,7 +394,7 @@ class ChatControl(ChatControlBase): # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - app.HAVE_FARSTREAM and self.contact.resource: + app.is_installed('FARSTREAM') and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -63,7 +63,7 @@ from gajim.command_system.implementation.middleware import CommandTools from gajim.command_system.implementation import standard from gajim.command_system.implementation import execute -if app.HAVE_SPELL: +if app.is_installed('GSPELL'): from gi.repository import Gspell @@ -487,7 +487,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): Gtk.IconSize.MENU) def set_speller(self): - if not app.HAVE_SPELL or not app.config.get('use_speller'): + if not app.is_installed('GSPELL') or not app.config.get('use_speller'): return gspell_lang = self.get_speller_language() ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -11,6 +11,7 @@ ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> ## Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Copyright (C) 2018 Philipp Hörist <philipp @ hoerist.com> ## ## This file is part of Gajim. ## @@ -34,10 +35,8 @@ import locale import uuid from distutils.version import LooseVersion as V from collections import namedtuple -import gi -import nbxmpp -from gi.repository import GLib +import nbxmpp from gajim.common import config as c_config from gajim.common import configpaths @@ -58,8 +57,6 @@ ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher nec = None # Network Events Controller plugin_manager = None # Plugins Manager -glog = logging.getLogger('gajim') - logger = None # For backwards compatibility needed @@ -152,122 +149,6 @@ ZEROCONF_ACC_NAME = 'Local' idlequeue = None socks5queue = None -HAVE_ZEROCONF = True -try: - __import__('avahi') -except ImportError: - try: - __import__('pybonjour') - except Exception: # Linux raises ImportError, Windows raises WindowsError - HAVE_ZEROCONF = False - -HAVE_PYCRYPTO = True -try: - __import__('Crypto') -except ImportError: - HAVE_PYCRYPTO = False - -HAVE_GPG = True -GPG_BINARY = 'gpg' -try: - import gnupg - ''' - We need https://pypi.python.org/pypi/python-gnupg - but https://pypi.python.org/pypi/gnupg shares the same package name. - It cannot be used as a drop-in replacement. - We test with a version check if python-gnupg is installed as it is - on a much lower version number than gnupg - Also we need at least python-gnupg 0.3.8 - ''' - v_gnupg = gnupg.__version__ - if V(v_gnupg) < V('0.3.8') or V(v_gnupg) > V('1.0.0'): - glog.info('Gajim needs python-gnupg >= 0.3.8') - HAVE_GPG = False -except ImportError: - HAVE_GPG = False -else: - import subprocess - def test_gpg(binary='gpg'): - if os.name == 'nt': - gpg_cmd = binary + ' -h >nul 2>&1' - else: - gpg_cmd = binary + ' -h >/dev/null 2>&1' - if subprocess.call(gpg_cmd, shell=True): - return False - return True - if test_gpg(binary='gpg2'): - GPG_BINARY = 'gpg2' - if not test_gpg(binary='gpg'): - HAVE_GPG = False - -HAVE_FARSTREAM = True -try: - if os.name == 'nt': - os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' - os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' - gi.require_version('Farstream', '0.2') - from gi.repository import Farstream - gi.require_version('Gst', '1.0') - from gi.repository import Gst - from gi.repository import GLib - try: - Gst.init(None) - conference = Gst.ElementFactory.make('fsrtpconference', None) - session = conference.new_session(Farstream.MediaType.AUDIO) - del session - del conference - except Exception as e: - glog.info(e) - HAVE_FARSTREAM = False - -except (ImportError, ValueError): - HAVE_FARSTREAM = False - -HAVE_GEOCLUE = True -try: - gi.require_version('Geoclue', '2.0') - from gi.repository import Geoclue -except (ImportError, ValueError): - HAVE_GEOCLUE = False - -HAVE_UPNP_IGD = True -try: - gi.require_version('GUPnPIgd', '1.0') - from gi.repository import GUPnPIgd - gupnp_igd = GUPnPIgd.SimpleIgd() -except ValueError: - HAVE_UPNP_IGD = False - -HAVE_PYCURL = True -try: - __import__('pycurl') -except ImportError: - HAVE_PYCURL = False - -try: - from gajim.common import sleepy - if sleepy.SUPPORTED: - HAVE_IDLE = True -except Exception: - glog.info(_('Unable to load idle module')) - HAVE_IDLE = False - -HAVE_SPELL = False -try: - spell_log = logging.getLogger('gajim.speller') - gi.require_version('Gspell', '1') - from gi.repository import Gspell - langs = Gspell.language_get_available() - for lang in langs: - spell_log.info('%s (%s) dict available', - lang.get_name(), lang.get_code()) - if langs: - HAVE_SPELL = True - else: - spell_log.info('No dicts available') -except (ImportError, ValueError): - pass - gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_MUC, nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC_ADMIN, nbxmpp.NS_MUC_OWNER, @@ -287,6 +168,161 @@ gajim_optional_features = {} # Capabilities hash per account caps_hash = {} +_dependencies = { + 'AVAHI': False, + 'PYBONJOUR': False, + 'PYCRYPTO': False, + 'PYGPG': False, + 'GPG_BINARY': False, + 'FARSTREAM': False, + 'GEOCLUE': False, + 'UPNP': False, + 'PYCURL': False, + 'GSPELL': False, + 'IDLE': False, + } + + +def is_installed(dependency): + if dependency == 'GPG': + # Alias for checking python-gnupg and the GPG binary + return _dependencies['PYGPG'] and _dependencies['GPG_BINARY'] + if dependency == 'ZEROCONF': + # Alias for checking zeroconf libs + return _dependencies['AVAHI'] or _dependencies['PYBONJOUR'] + return _dependencies[dependency] + +def disable_dependency(dependency): + _dependencies[dependency] = False + +def detect_dependencies(): + import gi + + # ZEROCONF + try: + if os.name == 'nt': + import pybonjour + _dependencies['PYBONJOUR'] = True + else: + import avahi + _dependencies['AVAHI'] = True + except Exception: + pass + + # PYCRYPTO + try: + import Crypto + _dependencies['PYCRYPTO'] = True + except ImportError: + pass + + # python-gnupg + try: + import gnupg + ''' + We need https://pypi.python.org/pypi/python-gnupg + but https://pypi.python.org/pypi/gnupg shares the same package name. + It cannot be used as a drop-in replacement. + We test with a version check if python-gnupg is installed as it is + on a much lower version number than gnupg + Also we need at least python-gnupg 0.3.8 + ''' + v_gnupg = gnupg.__version__ + if V(v_gnupg) < V('0.3.8') or V(v_gnupg) > V('1.0.0'): + log('gajim').info('Gajim needs python-gnupg >= 0.3.8') + raise ImportError + _dependencies['PYGPG'] = True + except ImportError: + pass + + # GPG BINARY + import subprocess + + def test_gpg(binary='gpg'): + if os.name == 'nt': + gpg_cmd = binary + ' -h >nul 2>&1' + else: + gpg_cmd = binary + ' -h >/dev/null 2>&1' + if subprocess.call(gpg_cmd, shell=True): + return False + return True + + if test_gpg(binary='gpg2'): + _dependencies['GPG_BINARY'] = 'gpg2' + elif test_gpg(binary='gpg'): + _dependencies['GPG_BINARY'] = 'gpg' + + # FARSTREAM + try: + if os.name == 'nt': + os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' + os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' + gi.require_version('Farstream', '0.2') + from gi.repository import Farstream + gi.require_version('Gst', '1.0') + from gi.repository import Gst + try: + Gst.init(None) + conference = Gst.ElementFactory.make('fsrtpconference', None) + session = conference.new_session(Farstream.MediaType.AUDIO) + except Exception as error: + log('gajim').info(error) + _dependencies['FARSTREAM'] = True + except (ImportError, ValueError): + pass + + # GEOCLUE + try: + gi.require_version('Geoclue', '2.0') + from gi.repository import Geoclue + _dependencies['GEOCLUE'] = True + except (ImportError, ValueError): + pass + + # UPNP + try: + gi.require_version('GUPnPIgd', '1.0') + from gi.repository import GUPnPIgd + gupnp_igd = GUPnPIgd.SimpleIgd() + _dependencies['UPNP'] = True + except ValueError: + pass + + # PYCURL + try: + import pycurl + _dependencies['PYCURL'] = True + except ImportError: + pass + + # IDLE + try: + from gajim.common import sleepy + if sleepy.SUPPORTED: + _dependencies['IDLE'] = True + except Exception: + pass + + # GSPELL + try: + gi.require_version('Gspell', '1') + from gi.repository import Gspell + langs = Gspell.language_get_available() + for lang in langs: + log('gajim').info('%s (%s) dict available', + lang.get_name(), lang.get_code()) + if langs: + _dependencies['GSPELL'] = True + except (ImportError, ValueError): + pass + + # Print results + for dep, val in _dependencies.items(): + log('gajim').info('%-13s %s', dep, val) + +def get_gpg_binary(): + return _dependencies['GPG_BINARY'] + def get_an_id(): return str(uuid.uuid4()) @@ -556,8 +592,9 @@ def get_priority(account, show): return prio def log(domain): - root = 'gajim.' - return logging.getLogger(root + domain) + if domain != 'gajim': + domain = 'gajim.%s' % domain + return logging.getLogger(domain) def prefers_app_menu(): if sys.platform == 'darwin': ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -136,7 +136,7 @@ class CommonConnection: self.server_resource = self._compute_resource() self.gpg = None self.USE_GPG = False - if app.HAVE_GPG: + if app.is_installed('GPG'): self.USE_GPG = True self.gpg = gpg.GnuPG() self.status = '' @@ -598,7 +598,7 @@ class CommonConnection: self.old_show = show self.on_purpose = False self.server_resource = self._compute_resource() - if app.HAVE_GPG: + if app.is_installed('GPG'): self.USE_GPG = True self.gpg = gpg.GnuPG() app.nec.push_incoming_event(BeforeChangeShowEvent(None, @@ -638,7 +638,7 @@ class CommonConnection: self.connected = app.SHOW_LIST.index(show) idle_time = None if auto: - if app.HAVE_IDLE and app.config.get('autoaway'): + if app.is_installed('IDLE') and app.config.get('autoaway'): idle_sec = int(app.interface.sleeper.getIdleSec()) idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) @@ -898,7 +898,7 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(AccountNotCreatedEvent( None, conn=self, reason=reason)) return - if app.HAVE_GPG: + if app.is_installed('GPG'): self.USE_GPG = True self.gpg = gpg.GnuPG() app.nec.push_incoming_event( @@ -2755,7 +2755,7 @@ class Connection(CommonConnection, ConnectionHandlers): p = self.add_sha(p, ptype != 'unavailable') self.add_lang(p) if auto: - if app.HAVE_IDLE and app.config.get('autoaway'): + if app.is_installed('IDLE') and app.config.get('autoaway'): idle_sec = int(app.interface.sleeper.getIdleSec()) idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1712,7 +1712,7 @@ ConnectionHTTPUpload): def _nec_last_request_received(self, obj): if obj.conn.name != self.name: return - if app.HAVE_IDLE and app.config.get_per('accounts', self.name, + if app.is_installed('IDLE') and app.config.get_per('accounts', self.name, 'send_idle_time'): iq_obj = obj.stanza.buildReply('result') qp = iq_obj.setQuery() ===================================== gajim/common/gpg.py ===================================== --- a/gajim/common/gpg.py +++ b/gajim/common/gpg.py @@ -26,14 +26,14 @@ import os import logging from gajim.common import app -if app.HAVE_GPG: +if app.is_installed('GPG'): import gnupg gnupg.logger = logging.getLogger('gajim.c.gnupg') class GnuPG(gnupg.GPG): def __init__(self): use_agent = app.config.get('use_gpg_agent') - gnupg.GPG.__init__(self, gpgbinary=app.GPG_BINARY, use_agent=use_agent) + gnupg.GPG.__init__(self, gpgbinary=app.get_gpg_binary(), use_agent=use_agent) encoding = app.config.get('pgp_encoding') if encoding: self.encoding = encoding ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -732,7 +732,7 @@ def parse_datetime(timestring, check_utc=False, convert='utc', epoch=False): return None from gajim.common import app -if app.HAVE_PYCURL: +if app.is_installed('PYCURL'): import pycurl from io import StringIO @@ -1360,13 +1360,13 @@ def update_optional_features(account = None): app.gajim_optional_features[a].append(nbxmpp.NS_CHATSTATES) if not app.config.get('ignore_incoming_xhtml'): app.gajim_optional_features[a].append(nbxmpp.NS_XHTML_IM) - if app.HAVE_PYCRYPTO \ + if app.is_installed('PYCRYPTO') \ and app.config.get_per('accounts', a, 'enable_esessions'): app.gajim_optional_features[a].append(nbxmpp.NS_ESESSION) if app.config.get_per('accounts', a, 'answer_receipts'): app.gajim_optional_features[a].append(nbxmpp.NS_RECEIPTS) app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE) - if app.HAVE_FARSTREAM: + if app.is_installed('FARSTREAM'): app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP) app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_AUDIO) app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_VIDEO) @@ -1545,7 +1545,7 @@ def _get_img_proxy(attrs, proxy): Download an image through a proxy. This function should be launched in a separated thread. """ - if not app.HAVE_PYCURL: + if not app.is_installed('PYCURL'): return '', _('PyCURL is not installed') mem, alt, max_size = '', '', 2*1024*1024 if 'max_size' in attrs: ===================================== gajim/common/jingle.py ===================================== --- a/gajim/common/jingle.py +++ b/gajim/common/jingle.py @@ -37,7 +37,7 @@ from gajim.common import app from gajim.common.jingle_session import JingleSession, JingleStates from gajim.common.jingle_ft import JingleFileTransfer from gajim.common.jingle_transport import JingleTransportSocks5, JingleTransportIBB -if app.HAVE_FARSTREAM: +if app.is_installed('FARSTREAM'): from gajim.common.jingle_rtp import JingleAudio, JingleVideo logger = logging.getLogger('gajim.c.jingle') ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -416,7 +416,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): self._add_streamhosts_to_query(query, sender, port, additional_hosts) def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): - if not app.HAVE_UPNP_IGD: + if not app.is_installed('UPNP'): self.connection.send(iq) return @@ -487,7 +487,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): def no_upnp_reply(): log.debug('Got not GUPnP-IGD answer') # stop trying to use it - app.HAVE_UPNP_IGD = False + app.disable_dependency('UPNP') self.no_gupnp_reply_id = 0 self.connection.send(iq) cleanup_gupnp() ===================================== gajim/common/stanza_session.py ===================================== --- a/gajim/common/stanza_session.py +++ b/gajim/common/stanza_session.py @@ -40,7 +40,7 @@ from gajim.common import crypto import logging log = logging.getLogger('gajim.c.stanza_session') -if app.HAVE_PYCRYPTO: +if app.is_installed('PYCRYPTO'): from Crypto.Cipher import AES from Crypto.PublicKey import RSA ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -67,7 +67,7 @@ try: except (ImportError, ValueError): HAS_GST = False -if app.HAVE_SPELL: +if app.is_installed('GSPELL'): from gi.repository import Gspell #---------- PreferencesWindow class -------------# @@ -179,7 +179,7 @@ class PreferencesWindow: self.xml.get_object('xhtml_checkbutton').set_active(st) # use speller - if app.HAVE_SPELL: + if app.is_installed('GSPELL'): st = app.config.get('use_speller') self.xml.get_object('speller_checkbutton').set_active(st) else: @@ -400,7 +400,7 @@ class PreferencesWindow: if config == value: combobox.set_active(index) - if HAS_GST and app.HAVE_FARSTREAM: + if HAS_GST and app.is_installed('FARSTREAM'): create_av_combobox('audio_input', AudioInputManager().get_devices()) create_av_combobox('audio_output', AudioOutputManager().get_devices( )) ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -62,7 +62,7 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common.exceptions import GajimGeneralException from gajim.common.connection_handlers_events import MessageOutgoingEvent -if app.HAVE_SPELL: +if app.is_installed('GSPELL'): from gi.repository import Gspell import logging @@ -3322,7 +3322,7 @@ class SingleMessageWindow: else: self.to_entry.set_text(to) - if app.config.get('use_speller') and app.HAVE_SPELL and action == 'send': + if app.config.get('use_speller') and app.is_installed('GSPELL') and action == 'send': lang = app.config.get('speller_language') gspell_lang = Gspell.language_lookup(lang) if gspell_lang is None: ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -140,14 +140,14 @@ class FeaturesWindow: self.desc_label.set_text(text) def zeroconf_available(self): - return app.HAVE_ZEROCONF + return app.is_installed('ZEROCONF') def dbus_available(self): from gajim.common import dbus_support return dbus_support.supported def gpg_available(self): - return app.HAVE_GPG + return app.is_installed('GPG') def some_keyring_available(self): if os.name == 'nt': @@ -160,14 +160,14 @@ class FeaturesWindow: return True def speller_available(self): - return app.HAVE_SPELL + return app.is_installed('GSPELL') def idle_available(self): from gajim.common import sleepy return sleepy.SUPPORTED def pycrypto_available(self): - return app.HAVE_PYCRYPTO + return app.is_installed('PYCRYPTO') def docutils_available(self): try: @@ -177,8 +177,8 @@ class FeaturesWindow: return True def farstream_available(self): - return app.HAVE_FARSTREAM + return app.is_installed('FARSTREAM') def gupnp_igd_available(self): - return app.HAVE_UPNP_IGD + return app.is_installed('UPNP') ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -156,6 +156,7 @@ class GajimApplication(Gtk.Application): # Create and initialize Application Paths & Databases from gajim.common import app + app.detect_dependencies() configpaths.create_paths() from gajim.common import exceptions from gajim.common import logger ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -56,7 +56,7 @@ from gajim.common import events from gajim.music_track_listener import MusicTrackListener -if app.HAVE_GEOCLUE: +if app.is_installed('GEOCLUE'): from gajim.common import location_listener from gajim import gtkgui_helpers @@ -1138,7 +1138,7 @@ class Interface: app.config.get_per('accounts', account, 'publish_tune')): self.enable_music_listener() # enable location listener - if (obj.conn.pep_supported and app.HAVE_GEOCLUE and + if (obj.conn.pep_supported and app.is_installed('GEOCLUE') and app.config.get_per('accounts', account, 'publish_location')): location_listener.enable() @@ -2881,7 +2881,7 @@ class Interface: self.create_zeroconf_default_config() if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \ - and app.HAVE_ZEROCONF: + and app.is_installed('ZEROCONF'): app.connections[app.ZEROCONF_ACC_NAME] = \ connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME) for account in app.config.get_per('accounts'): ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -30,7 +30,7 @@ from gi.repository import Pango from gajim.common import app from gajim import gtkgui_helpers -if app.HAVE_SPELL: +if app.is_installed('GSPELL'): from gi.repository import Gspell @@ -133,7 +133,7 @@ class MessageTextView(Gtk.TextView): self.toggle_speller(False) def toggle_speller(self, activate): - if app.HAVE_SPELL and app.config.get('use_speller'): + if app.is_installed('GSPELL') and app.config.get('use_speller'): spell_view = Gspell.TextView.get_from_gtk_text_view(self) spell_view.set_inline_spell_checking(activate) ===================================== gajim/options_dialog.py ===================================== --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -598,4 +598,4 @@ class GPGOption(DialogOption): def set_activatable(self, name, value): active = self.account in app.connections - self.get_parent().set_activatable(app.HAVE_GPG and active) + self.get_parent().set_activatable(app.is_installed('GPG') and active) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -64,7 +64,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n -if app.HAVE_GEOCLUE: +if app.is_installed('GEOCLUE'): from gajim.common import location_listener from gajim.common import ged from gajim.message_window import MessageWindowMgr @@ -4940,7 +4940,7 @@ class RosterWindow: item = Gtk.CheckMenuItem(_('Publish Location')) pep_submenu.append(item) - if not app.HAVE_GEOCLUE: + if not app.is_installed('GEOCLUE'): item.set_sensitive(False) else: activ = app.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e265514d8849dc9bd8cea08a1aa4bbcf45… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e265514d8849dc9bd8cea08a1aa4bbcf45… You're receiving this email because of your account on dev.gajim.org.

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