Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Flatpak: Disable install from ZIP
by Philipp Hörist 24 Mar '19

24 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a988d2e2 by Daniel Brötzmann at 2019-03-24T14:33:03Z Flatpak: Disable install from ZIP - - - - - 2 changed files: - gajim/data/gui/plugins_window.ui - gajim/plugins/gui.py Changes: ===================================== gajim/data/gui/plugins_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="plugins_window"> @@ -13,6 +13,9 @@ <property name="type_hint">dialog</property> <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <child type="titlebar"> + <placeholder/> + </child> <child> <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> @@ -232,6 +235,7 @@ <property name="wrap">True</property> <property name="wrap_mode">word-char</property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -375,9 +379,6 @@ </child> </object> </child> - <child type="titlebar"> - <placeholder/> - </child> </object> <object class="GtkTextBuffer" id="textbuffer1"> <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> ===================================== gajim/plugins/gui.py ===================================== @@ -32,6 +32,7 @@ from gi.repository import Gdk from gajim.common import app from gajim.common import configpaths from gajim.common.exceptions import PluginsystemError +from gajim.common.helpers import launch_browser_mailer from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException @@ -65,14 +66,21 @@ class PluginsWindow: widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', - 'plugin_homepage_linkbutton', 'uninstall_plugin_button', - 'configure_plugin_button', 'installed_plugins_treeview', - 'available_text', 'available_text_label') + 'plugin_homepage_linkbutton', 'install_plugin_button', + 'uninstall_plugin_button', 'configure_plugin_button', + 'installed_plugins_treeview', 'available_text', + 'available_text_label') for widget_name in widgets_to_extract: setattr(self, widget_name, builder.get_object(widget_name)) self.plugin_description_textview = builder.get_object('description') + + # Disable 'Install from ZIP' for Flatpak installs + if app.is_flatpak(): + self.install_plugin_button.set_tooltip_text( + _('Click to view Gajim\'s wiki page on how to install plugins in Flatpak.')) + self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, GdkPixbuf.Pixbuf) self.installed_plugins_treeview.set_model(self.installed_plugins_model) @@ -241,6 +249,10 @@ class PluginsWindow: @log_calls('PluginsWindow') def on_install_plugin_button_clicked(self, widget): + if app.is_flatpak(): + launch_browser_mailer('url', 'https://dev.gajim.org/gajim/gajim/wikis/help/flathub') + return + def show_warn_dialog(): text = _('Archive is malformed') dialog = WarningDialog(text, '', transient_for=self.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a988d2e25088fd77f48b292dd12f0f7b14… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a988d2e25088fd77f48b292dd12f0f7b14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add server blabber.im to servers.json
by Philipp Hörist 24 Mar '19

24 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0de04b1a by Dominion at 2019-03-22T09:09:46Z Add server blabber.im to servers.json - - - - - 1 changed file: - gajim/data/other/servers.json Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -2,6 +2,7 @@ "servers":[ "0nl1ne.at", "404.city", + "blabber.im", "brauchen.info", "chatme.im", "comm.unicate.me", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0de04b1ae9ec036312d1bf8b2d8ad7cbb1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0de04b1ae9ec036312d1bf8b2d8ad7cbb1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: Fix cryptography build
by André 20 Mar '19

20 Mar '19

André pushed to branch master at gajim / gajim Commits: c2be5372 by André Apitzsch at 2019-03-20T23:29:00Z Flatpak: Fix cryptography build - - - - - fd46fcab by André Apitzsch at 2019-03-20T23:29:45Z Flatpak: Update runtime version to 3.32 - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim runtime: org.gnome.Platform -runtime-version: 3.30 +runtime-version: 3.32 sdk: org.gnome.Sdk command: gajim tags: nightly @@ -13,6 +13,7 @@ finish-args: - --socket=pulseaudio - --system-talk-name=org.freedesktop.GeoClue2 - --system-talk-name=org.freedesktop.login1 + - --talk-name=org.freedesktop.Notifications - --talk-name=org.gnome.ScreenSaver - --talk-name=org.mpris.MediaPlayer2.* # Keyring @@ -88,7 +89,7 @@ modules: - name: python3-cryptography buildsystem: simple build-commands: - - pip3 install --prefix=/app . + - python3 setup.py install --prefix=/app sources: - type: archive url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae4c98cbb2d187bb846fadce9584c1499… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae4c98cbb2d187bb846fadce9584c1499… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show trust level for incoming encrypted messages
by Philipp Hörist 20 Mar '19

20 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae4c98cb by Malte Leip at 2019-03-20T19:50:49Z Show trust level for incoming encrypted messages - - - - - 2 changed files: - gajim/common/const.py - gajim/conversation_textview.py Changes: ===================================== gajim/common/const.py ===================================== @@ -199,6 +199,12 @@ class MUCUser(IntEnum): AFFILIATION = 3 AFFILIATION_TEXT = 4 +@unique +class Trust(IntEnum): + UNTRUSTED = 0 + UNDECIDED = 1 + BLIND = 2 + VERIFIED = 3 EME_MESSAGES = { 'urn:xmpp:otr:0': ===================================== gajim/conversation_textview.py ===================================== @@ -44,7 +44,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock -from gajim.common.const import StyleAttr +from gajim.common.const import StyleAttr, Trust from gajim.gtk import util from gajim.gtk.util import load_icon @@ -60,6 +60,22 @@ SHOWN = 2 log = logging.getLogger('gajim.conversation_textview') +TRUST_SYMBOL_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Trust Not Decided'), + 'warning-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Unverified'), + 'success-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color') +} + + def is_selection_modified(mark): name = mark.get_name() return name in ('selection_bound', 'insert') @@ -1133,13 +1149,17 @@ class ConversationTextview(GObject.GObject): color = 'unencrypted-color' tooltip = _('Not encrypted') else: - icon = 'channel-secure-symbolic' - color = 'encrypted-color' - name, fingerprint = details - if fingerprint is None: - tooltip = name + name, fingerprint, trust = details + tooltip = _('Encrypted (%s)') % (name) + if trust is None: + # The encryption plugin did not pass trust information + icon = 'channel-secure-symbolic' + color = 'encrypted-color' else: - tooltip = '%s %s' % (name, fingerprint) + icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] + tooltip = tooltip + '\n' + trust_tooltip + if fingerprint is not None: + tooltip = tooltip + ' (' + fingerprint + ')' temp_mark = self._buffer.create_mark(None, iter_, True) self._buffer.insert(iter_, ' ') @@ -1164,7 +1184,8 @@ class ConversationTextview(GObject.GObject): return fingerprint = additional_data.get_value('encrypted', 'fingerprint') - return name, fingerprint + trust = additional_data.get_value('encrypted', 'trust') + return name, fingerprint, trust def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): local_tim = time.localtime(tim) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ae4c98cbb2d187bb846fadce9584c1499a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ae4c98cbb2d187bb846fadce9584c1499a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Flatpak: Fix access to GnuPG keys
by André 16 Mar '19

16 Mar '19

André pushed to branch gajim_1.1 at gajim / gajim Commits: 4099b01f by André Apitzsch at 2019-03-16T22:59:15Z Flatpak: Fix access to GnuPG keys Fixes gajim/gajim-plugins#386 - - - - - 65dc8ed8 by André Apitzsch at 2019-03-16T23:09:46Z Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -20,6 +20,8 @@ finish-args: - --filesystem=~/.config/dconf:ro - --talk-name=ca.desrt.dconf - --env=DCONF_USER_CONFIG_DIR=.config/dconf + # GnuPG + - --filesystem=~/.gnupg # extensions - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages @@ -60,8 +62,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/bc/81/47bd0404f2cb5363edb371e3b15da… - sha256: 9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033 + url: https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761f… + sha256: e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7 - name: python3-asn1crypto buildsystem: simple @@ -87,8 +89,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef638575… - sha256: 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 + url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… + sha256: 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 - name: python3-pyopenssl buildsystem: simple @@ -180,8 +182,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/e4/74/877d904d144163862edae107dc919… - sha256: 660d796f6d97b30a5e249417abf012ee30a22b9e40817dde05ca9f35c96cc80d + url: https://files.pythonhosted.org/packages/d6/01/34b2a441926780f26edd21490158a… + sha256: cd73417777e4847fdd8d0d96c7cafc606952edbd2b9d52a2a72bb2aaa04d08ef - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c972196a4f25540a2cba30c1d22d9bf33… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c972196a4f25540a2cba30c1d22d9bf33… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: Fix access to GnuPG keys
by André 16 Mar '19

16 Mar '19

André pushed to branch master at gajim / gajim Commits: ab6623d7 by André Apitzsch at 2019-03-16T23:11:33Z Flatpak: Fix access to GnuPG keys Fixes gajim/gajim-plugins#386 - - - - - 5af7fbd4 by André Apitzsch at 2019-03-16T23:12:00Z Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -22,6 +22,8 @@ finish-args: - --filesystem=~/.config/dconf:ro - --talk-name=ca.desrt.dconf - --env=DCONF_USER_CONFIG_DIR=.config/dconf + # GnuPG + - --filesystem=~/.gnupg # extensions - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages @@ -62,8 +64,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/bc/81/47bd0404f2cb5363edb371e3b15da… - sha256: 9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033 + url: https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761f… + sha256: e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7 - name: python3-asn1crypto buildsystem: simple @@ -89,8 +91,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef638575… - sha256: 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 + url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… + sha256: 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 - name: python3-pyopenssl buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ef3b8e01b2b01a582125689351e9c5e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ef3b8e01b2b01a582125689351e9c5e8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Raise nbxmpp version
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 06ca9b39 by Philipp Hörist at 2019-03-16T15:21:53Z Raise nbxmpp version - - - - - c972196a by Philipp Hörist at 2019-03-16T15:32:42Z Update ChangeLog - - - - - 2 changed files: - ChangeLog - gajim/gajim.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,18 @@ +Gajim 1.1.3 (TBA) + + Bug fixes + + * #9514 Fix jingle filetransfers not working in some circumstances + * #9573 Dont leak DNS query when connecting over proxy + * #9578 Determine Windows version more reliably + * #9622 Fix an error while quitting Gajim + * Use UUID4 item ids for pubsub posts + * Various smaller improvements + + Features + + * Add a mobile phone indicator to the chat window + Gajim 1.1.2 (15 January 2019) Bug fixes ===================================== gajim/gajim.py ===================================== @@ -27,7 +27,7 @@ from distutils.version import LooseVersion as V # Install _() in namespace from gajim.common import i18n -_MIN_NBXMPP_VER = "0.6.9" +_MIN_NBXMPP_VER = "0.6.10" _MIN_GTK_VER = "3.22.0" View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb4daa294551cf9e2530db9586aa18bd3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb4daa294551cf9e2530db9586aa18bd3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 7 commits: Get module instance after checking for zeroconf
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c1948d05 by Philipp Hörist at 2019-03-16T14:38:19Z Get module instance after checking for zeroconf - - - - - 36e80622 by Philipp Hörist at 2019-03-16T14:47:51Z Notifications: Check if DBus is available - - - - - 3729b8f9 by Philipp Hörist at 2019-03-16T15:17:05Z Themes: Better visibility of scrollbar - - - - - 76cb4d1d by Philipp Hörist at 2019-03-16T15:18:49Z HistoryWindow: Center top widgets vertically - - - - - 7ba9bc4b by Philipp Hörist at 2019-03-16T15:19:11Z Dont leak DNS query if we connect via proxy Fixes #9573 - - - - - d159a7a1 by Philipp Hörist at 2019-03-16T15:19:26Z Fix error while quitting Fixes #9622 - - - - - bb4daa29 by Philipp Hörist at 2019-03-16T15:19:37Z Generate account label correctly - - - - - 7 changed files: - gajim/common/connection.py - gajim/data/gui/history_window.ui - gajim/data/gui/themes_window.ui - gajim/gtk/account_wizard.py - gajim/notify.py - gajim/plugins/pluginmanager.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -905,10 +905,6 @@ class Connection(CommonConnection, ConnectionHandlers): ] self._hostname = hostname - if h: - app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), - self._on_resolve_txt, type_='txt') - if use_srv and self._proxy is None: self._srv_hosts = [] @@ -918,6 +914,9 @@ class Connection(CommonConnection, ConnectionHandlers): for service in services: record_name = '_' + service + '._tcp.' + helpers.idn_to_ascii(h) app.resolver.resolve(record_name, self._on_resolve_srv) + + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), + self._on_resolve_txt, type_='txt') else: self._connect_to_next_host() ===================================== gajim/data/gui/history_window.ui ===================================== @@ -311,6 +311,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">center</property> <property name="label" translatable="yes">Chat</property> <style> <class name="dim-label"/> @@ -326,6 +327,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes">Record history for this chat</property> + <property name="valign">center</property> <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> </object> <packing> @@ -337,6 +339,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_left">6</property> <property name="label" translatable="yes">Record History</property> <style> @@ -353,6 +356,7 @@ <property name="width_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="hexpand">True</property> <property name="model">liststore1</property> <property name="tearoff_title" translatable="yes">Ttitle</property> ===================================== gajim/data/gui/themes_window.ui ===================================== @@ -10,7 +10,8 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> - <property name="min_content_height">200</property> + <property name="min_content_height">260</property> + <property name="overlay_scrolling">False</property> <child> <object class="GtkViewport"> <property name="visible">True</property> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -564,6 +564,7 @@ class AccountCreationWizard: def create_vars(self, config): app.config.add_per('accounts', self.account) + config['account_label'] = '%s@%s' % (config['name'], config['hostname']) if not config['savepass']: config['password'] = '' ===================================== gajim/notify.py ===================================== @@ -75,31 +75,10 @@ class Notification: Handle notifications """ def __init__(self): + self._dbus_available = False self.daemon_capabilities = ['actions'] - # Detect if actions are supported by the notification daemon - if sys.platform not in ('win32', 'darwin'): - def on_proxy_ready(source, res, data=None): - try: - proxy = Gio.DBusProxy.new_finish(res) - self.daemon_capabilities = proxy.GetCapabilities() - except GLib.Error as e: - if e.domain == 'g-dbus-error-quark': - log.info('Notifications D-Bus connection failed: %s', - e.message) - else: - raise - else: - log.debug('Notifications D-Bus connected') - - log.debug('Connecting to Notifications D-Bus') - Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, - Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, - None, - 'org.freedesktop.Notifications', - '/org/freedesktop/Notifications', - 'org.freedesktop.Notifications', - None, on_proxy_ready) + self._detect_dbus_caps() app.ged.register_event_handler( 'notification', ged.GUI2, self._nec_notification) @@ -107,6 +86,30 @@ class Notification: 'our-show', ged.GUI2, self._nec_our_status) app.events.event_removed_subscribe(self._on_event_removed) + def _detect_dbus_caps(self): + if sys.platform in ('win32', 'darwin'): + return + + def on_proxy_ready(_source, res, _data=None): + try: + proxy = Gio.DBusProxy.new_finish(res) + self.daemon_capabilities = proxy.GetCapabilities() + except GLib.Error: + log.exception('Notifications D-Bus connection failed') + else: + self._dbus_available = True + log.info('Notifications D-Bus connected') + + log.info('Connecting to Notifications D-Bus') + Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, + None, + 'org.freedesktop.Notifications', + '/org/freedesktop/Notifications', + 'org.freedesktop.Notifications', + None, + on_proxy_ready) + def _nec_notification(self, obj): if obj.do_popup: icon_name = self._get_icon_name(obj) @@ -170,6 +173,9 @@ class Notification: app.interface.roster.popup_notification_windows.append(instance) return + if not self._dbus_available: + return + scale = gtkgui_helpers.get_monitor_scale_factor() icon_pixbuf = gtkgui_helpers.gtk_icon_theme.load_icon_for_scale( icon_name, 48, scale, 0) @@ -220,8 +226,9 @@ class Notification: app.app.send_notification(notif_id, notification) def withdraw(self, *args): - if sys.platform != 'win32': - app.app.withdraw_notification(self._id(*args)) + if not self._dbus_available: + return + app.app.withdraw_notification(self._id(*args)) def _id(self, *args): return ','.join(args) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -406,9 +406,9 @@ class PluginManager(metaclass=Singleton): return for con in app.connections.values(): for module in plugin.modules: - instance, name = module.get_instance(con) if not module.zeroconf and con.name == 'Local': continue + instance, name = module.get_instance(con) modules.register_single(con, instance, name) # If handlers have been registered, register the @@ -558,9 +558,9 @@ class PluginManager(metaclass=Singleton): return for module in plugin.modules: - instance, name = module.get_instance(con) if not module.zeroconf and con.name == 'Local': continue + instance, name = module.get_instance(con) modules.register_single(con, instance, name) def _plugin_is_active_in_global_config(self, plugin): ===================================== gajim/roster_window.py ===================================== @@ -2501,8 +2501,11 @@ class RosterWindow: self.send_pep(acct, pep_dict) def on_continue2(message, pep_dict): + if 'file_transfers' not in app.interface.instances: + on_continue3(message, pep_dict) + return # check if there is an active file transfer - from gajim.common.protocol.bytestream import (is_transfer_active) + from gajim.common.protocol.bytestream import is_transfer_active files_props = app.interface.instances['file_transfers'].\ files_props transfer_active = False View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c0178db779d8a6f25f986b7609174b367… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c0178db779d8a6f25f986b7609174b367… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Check if DBus is available
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05dc0044 by Philipp Hörist at 2019-03-16T14:51:12Z Notifications: Check if DBus is available - - - - - 6ef3b8e0 by Philipp Hörist at 2019-03-16T15:06:00Z Windows: Dont steal focus on notification - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -52,29 +52,11 @@ class Notification: Handle notifications """ def __init__(self): + self._dbus_available = False self._daemon_capabilities = ['actions'] self._win32_active_popup = None - # Detect if actions are supported by the notification daemon - if sys.platform not in ('win32', 'darwin'): - def on_proxy_ready(_source, res, _data=None): - try: - proxy = Gio.DBusProxy.new_finish(res) - self._daemon_capabilities = proxy.GetCapabilities() - except GLib.Error: - log.exception('Notifications D-Bus connection failed') - else: - log.debug('Notifications D-Bus connected') - - log.debug('Connecting to Notifications D-Bus') - Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, - Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, - None, - 'org.freedesktop.Notifications', - '/org/freedesktop/Notifications', - 'org.freedesktop.Notifications', - None, - on_proxy_ready) + self._detect_dbus_caps() app.ged.register_event_handler( 'notification', ged.GUI2, self._nec_notification) @@ -82,6 +64,30 @@ class Notification: 'our-show', ged.GUI2, self._nec_our_status) app.events.event_removed_subscribe(self._on_event_removed) + def _detect_dbus_caps(self): + if sys.platform in ('win32', 'darwin'): + return + + def on_proxy_ready(_source, res, _data=None): + try: + proxy = Gio.DBusProxy.new_finish(res) + self.daemon_capabilities = proxy.GetCapabilities() + except GLib.Error: + log.exception('Notifications D-Bus connection failed') + else: + self._dbus_available = True + log.info('Notifications D-Bus connected') + + log.info('Connecting to Notifications D-Bus') + Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, + None, + 'org.freedesktop.Notifications', + '/org/freedesktop/Notifications', + 'org.freedesktop.Notifications', + None, + on_proxy_ready) + def _nec_notification(self, obj): if obj.do_popup: icon_name = self._get_icon_name(obj) @@ -149,6 +155,9 @@ class Notification: self._win32_active_popup.connect('destroy', self._on_popup_destroy) return + if not self._dbus_available: + return + scale = get_monitor_scale_factor() icon_pixbuf = load_icon(icon_name, size=48, pixbuf=True, scale=scale) @@ -210,7 +219,7 @@ class Notification: if sys.platform == 'win32': if self._win32_active_popup is not None: self._win32_active_popup.destroy() - else: + elif self._dbus_available: app.app.withdraw_notification(self._make_id(*args)) @staticmethod @@ -223,6 +232,8 @@ class PopupNotification(Gtk.Window): icon_name=None, title=None, text=None, timeout=-1): Gtk.Window.__init__(self) self.set_type_hint(Gdk.WindowTypeHint.NOTIFICATION) + self.set_focus_on_map(False) + self.set_accept_focus(False) self.set_name('NotificationPopup') self.set_skip_taskbar_hint(True) self.set_decorated(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c17b744465a371731d403f770280f283b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c17b744465a371731d403f770280f283b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Generate account label correctly
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c17b7444 by Philipp Hörist at 2019-03-16T14:33:58Z Generate account label correctly - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -561,6 +561,7 @@ class AccountCreationWizard: def create_vars(self, config): app.config.add_per('accounts', self.account) + config['account_label'] = '%s@%s' % (config['name'], config['hostname']) if not config['savepass']: config['password'] = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c17b744465a371731d403f770280f283be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c17b744465a371731d403f770280f283be… 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