Commits September 2017

commits@gajim.org

1 participants
49 discussions

[Git][gajim/python-nbxmpp][master] Prepare 0.6.0 release
by Philipp Hörist 25 Sep '17

25 Sep '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ffb08348 by Philipp Hörist at 2017-09-25T14:58:57+02:00 Prepare 0.6.0 release - - - - - 2 changed files: - ChangeLog - nbxmpp/__init__.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -python-nbxmpp 0.6.0 (tba) +python-nbxmpp 0.6.0 (25 September 2017) * Add new getOriginID/SetOriginID method for Messages * Add new getJid() method for Protocol ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5.7" +__version__ = "0.6.0" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ffb08348468e72488d7efb250b… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ffb08348468e72488d7efb250b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rename Zeroconf Credentials Dialog
by Philipp Hörist 25 Sep '17

25 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8f84338 by Philipp Hörist at 2017-09-25T13:57:25+02:00 Rename Zeroconf Credentials Dialog - - - - - 1 changed file: - gajim/accounts_window.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -556,8 +556,8 @@ class ZeroConfPage(GenericOptionPage): def __init__(self, account, parent=None): options = [ - Option(OptionKind.DIALOG, _('Credentials'), - OptionType.DIALOG, props={'dialog': CredentialsDialog}), + Option(OptionKind.DIALOG, _('Profile'), + OptionType.DIALOG, props={'dialog': ZeroconfProfileDialog}), Option(OptionKind.SWITCH, _('Connect on startup'), OptionType.ACCOUNT_CONFIG, 'autoconnect', @@ -578,7 +578,7 @@ class ZeroConfPage(GenericOptionPage): GenericOptionPage.__init__(self, account, parent, options) -class CredentialsDialog(OptionsDialog): +class ZeroconfProfileDialog(OptionsDialog): def __init__(self, account, parent): options = [ @@ -595,7 +595,7 @@ class CredentialsDialog(OptionsDialog): OptionType.ACCOUNT_CONFIG, 'zeroconf_email'), ] - OptionsDialog.__init__(self, parent, _('Credential Options'), + OptionsDialog.__init__(self, parent, _('Profile'), Gtk.DialogFlags.MODAL, options, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f8f84338b2f211d652c39aff06f90e84bc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f8f84338b2f211d652c39aff06f90e84bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 26 commits: Remove Makefiles
by Yann Leboulanger 25 Sep '17

25 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: cf36549f by André Apitzsch at 2017-09-22T19:12:26+02:00 Remove Makefiles - - - - - ad600f51 by André Apitzsch at 2017-09-22T19:12:26+02:00 Move data required to run gajim into gajim directory - - - - - 3ba58716 by André Apitzsch at 2017-09-22T19:12:26+02:00 Use setup.py to install gajim - - - - - 624bee75 by André Apitzsch at 2017-09-22T19:12:26+02:00 fix file lookup location and other issues - - - - - 789b73fd by André Apitzsch at 2017-09-22T19:12:26+02:00 Install jabber server list - - - - - f1b009dc by André Apitzsch at 2017-09-22T19:12:26+02:00 Fix CI test execution - - - - - a2ac23d1 by André Apitzsch at 2017-09-22T19:12:26+02:00 Add MANIFEST.in - - - - - c3b1c1dd by André Apitzsch at 2017-09-22T19:12:26+02:00 Add author and license information to setup.py - - - - - 996607d6 by André Apitzsch at 2017-09-22T19:12:26+02:00 CI: Update package script - - - - - 343811c2 by André Apitzsch at 2017-09-22T19:12:26+02:00 Cover plugins in setup.py - - - - - 5375965f by André Apitzsch at 2017-09-22T19:12:26+02:00 Don't hard code python path in scripts to support virtualenv - - - - - 77014f09 by André Apitzsch at 2017-09-22T19:12:26+02:00 Add dev version number support - - - - - 06102e7d by André Apitzsch at 2017-09-22T19:12:26+02:00 Linux: fix translation issue - - - - - 7751c3e7 by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: remove intltool dependency - - - - - 03955a68 by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: add description - - - - - 30424b36 by André Apitzsch at 2017-09-22T19:12:26+02:00 Move ipython_view to gajim.dev and exclude it from tarball - - - - - 6bcd4751 by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: fix license - - - - - 7ca5a1e8 by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: include activities, moods and sounds - - - - - 9ef94246 by André Apitzsch at 2017-09-22T19:12:26+02:00 Package test, but don't install it - - - - - 9950228d by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: add test and test_nogui - - - - - 864e5725 by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: install missing files - - - - - 3e80707e by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: add update_po command - - - - - 289c67fd by André Apitzsch at 2017-09-22T19:12:26+02:00 setup.py: always regenerate *.desktop and *.appdata.xml otherwise we might ship outdated files - - - - - af89d7cf by André Apitzsch at 2017-09-22T19:12:26+02:00 autopep8 setup.py - - - - - 5819f7e4 by André Apitzsch at 2017-09-22T21:48:18+02:00 setup.py: move plugins directory to data directory - - - - - 81a6be74 by Yann Leboulanger at 2017-09-25T11:15:40+02:00 Merge branch 'setuptools' into 'master' Use Setuptools to build gajim Closes #8633 See merge request !128 - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - + MANIFEST.in - − Makefile.am - − autogen.sh - − configure.ac - − data/Makefile.am - − data/defs.py.in - data/gajim-remote.desktop.in.in → data/gajim-remote.desktop.in - data/org.gajim.Gajim.desktop.in.in → data/org.gajim.Gajim.desktop.in - − data/pixmaps/Makefile.am - − gajim/Makefile.am - gajim/__init__.py - gajim/common/config.py - gajim/common/configpaths.py - − gajim/common/defs.py - gajim/common/i18n.py - − gajim/data/Makefile.am - − gajim/data/activities/Makefile.am - − gajim/data/emoticons/Makefile.am - − gajim/data/gui/Makefile.am - icons/hicolor/128x128/apps/org.gajim.Gajim.png → gajim/data/icons/hicolor/128x128/apps/org.gajim.Gajim.png - icons/hicolor/16x16/actions/document-send.png → gajim/data/icons/hicolor/16x16/actions/document-send.png - icons/hicolor/16x16/actions/gajim-cam_active.png → gajim/data/icons/hicolor/16x16/actions/gajim-cam_active.png - icons/hicolor/16x16/actions/gajim-cam_inactive.png → gajim/data/icons/hicolor/16x16/actions/gajim-cam_inactive.png - icons/hicolor/16x16/actions/gajim-kbd_input.png → gajim/data/icons/hicolor/16x16/actions/gajim-kbd_input.png - icons/hicolor/16x16/actions/gajim-mic_active.png → gajim/data/icons/hicolor/16x16/actions/gajim-mic_active.png - icons/hicolor/16x16/actions/gajim-mic_inactive.png → gajim/data/icons/hicolor/16x16/actions/gajim-mic_inactive.png - icons/hicolor/16x16/status/applications-internet.png → gajim/data/icons/hicolor/16x16/status/applications-internet.png - icons/hicolor/16x16/status/audio-mic-volume-high.png → gajim/data/icons/hicolor/16x16/status/audio-mic-volume-high.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/65d2284b59f00969c140b1d90e07b9996… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/65d2284b59f00969c140b1d90e07b9996… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Reduce PROCESS_TIMEOUT on Windows
by Philipp Hörist 23 Sep '17

23 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 65d2284b by Philipp Hörist at 2017-09-23T10:10:36+02:00 Reduce PROCESS_TIMEOUT on Windows If io_add_watch is available like on Linux, the PROCESS_TIMEOUT, is only used to check for timed out events. On Window its also used to call select() on the socket, so we get pending data. We need this as low as possible otherwise Gajim on Windows feels painfully slow. - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2309,7 +2309,12 @@ class Interface: app.idlequeue.process() except Exception: # Otherwise, an exception will stop our loop - timeout, in_seconds = app.idlequeue.PROCESS_TIMEOUT + + if sys.platform == 'win32': + timeout, in_seconds = 20, None + else: + timeout, in_seconds = app.idlequeue.PROCESS_TIMEOUT + if in_seconds: GLib.timeout_add_seconds(timeout, self.process_connections) else: @@ -2566,7 +2571,11 @@ class Interface: self.instances['file_transfers'] = dialogs.FileTransfersWindow() GLib.timeout_add(100, self.autoconnect) - timeout, in_seconds = app.idlequeue.PROCESS_TIMEOUT + if sys.platform == 'win32': + timeout, in_seconds = 20, None + else: + timeout, in_seconds = app.idlequeue.PROCESS_TIMEOUT + if in_seconds: GLib.timeout_add_seconds(timeout, self.process_connections) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/65d2284b59f00969c140b1d90e07b99968… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/65d2284b59f00969c140b1d90e07b99968… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set lock_image from icon name instead of filepath
by Philipp Hörist 22 Sep '17

22 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9785f314 by Philipp Hörist at 2017-09-22T16:44:07+02:00 Set lock_image from icon name instead of filepath Fixes #8673 - - - - - 2 changed files: - gajim/chat_control.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -856,18 +856,18 @@ class ChatControl(ChatControlBase): self._show_lock_image(**encryption_state) - def _show_lock_image(self, visible, enc_type='', - authenticated=False): + def _show_lock_image(self, visible, enc_type='', authenticated=False): """ Set lock icon visibility and create tooltip """ if authenticated: authenticated_string = _('and authenticated') - img_path = gtkgui_helpers.get_icon_path('security-high') + self.lock_image.set_from_icon_name( + 'security-high', Gtk.IconSize.MENU) else: authenticated_string = _('and NOT authenticated') - img_path = gtkgui_helpers.get_icon_path('security-low') - self.lock_image.set_from_file(img_path) + self.lock_image.set_from_icon_name( + 'security-low', Gtk.IconSize.MENU) tooltip = _('%(type)s encryption is active %(authenticated)s.') % {'type': enc_type, 'authenticated': authenticated_string} ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -785,18 +785,18 @@ class GroupchatControl(ChatControlBase): self._show_lock_image(**encryption_state) - def _show_lock_image(self, visible, enc_type='', - authenticated=False): + def _show_lock_image(self, visible, enc_type='', authenticated=False): """ Set lock icon visibility and create tooltip """ if authenticated: authenticated_string = _('and authenticated') - img_path = gtkgui_helpers.get_icon_path('security-high') + self.lock_image.set_from_icon_name( + 'security-high', Gtk.IconSize.MENU) else: authenticated_string = _('and NOT authenticated') - img_path = gtkgui_helpers.get_icon_path('security-low') - self.lock_image.set_from_file(img_path) + self.lock_image.set_from_icon_name( + 'security-low', Gtk.IconSize.MENU) tooltip = _('%(type)s encryption is active %(authenticated)s.') % { 'type': enc_type, 'authenticated': authenticated_string} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9785f314155853d85f1f4a70f3b7482bea… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9785f314155853d85f1f4a70f3b7482bea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] Set lock_image from pixbuf instead of filepath
by Philipp Hörist 22 Sep '17

22 Sep '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 1886fda5 by Philipp Hörist at 2017-09-22T15:57:52+02:00 Set lock_image from pixbuf instead of filepath Fixes #8673 - - - - - 1 changed file: - src/chat_control.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2314,12 +2314,13 @@ class ChatControl(ChatControlBase): if authenticated: #About encrypted chat session authenticated_string = _('and authenticated') - img_path = gtkgui_helpers.get_icon_path('security-high') + pixbuf = gtkgui_helpers.get_icon_pixmap('security-high') else: #About encrypted chat session authenticated_string = _('and NOT authenticated') - img_path = gtkgui_helpers.get_icon_path('security-low') - self.lock_image.set_from_file(img_path) + pixbuf = gtkgui_helpers.get_icon_pixmap('security-low') + + self.lock_image.set_from_pixbuf(pixbuf) #status will become 'is' or 'is not', authentificaed will become #'and authentificated' or 'and not authentificated', logged will become View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1886fda5c30d6e0b26705daa592096a961… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1886fda5c30d6e0b26705daa592096a961… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use own module logger for connection_zeroconf
by Philipp Hörist 21 Sep '17

21 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b60fe026 by Philipp Hörist at 2017-09-22T00:07:48+02:00 Use own module logger for connection_zeroconf - - - - - 1 changed file: - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -50,6 +50,8 @@ from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf.connection_handlers_zeroconf import * from gajim.common.connection_handlers_events import * +log = logging.getLogger('gajim.c.connection_zeroconf') + class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def __init__(self, name): ConnectionHandlersZeroconf.__init__(self) @@ -73,7 +75,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): values """ if not app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'name'): - app.log.debug('Creating zeroconf account') + log.debug('Creating zeroconf account') app.config.add_per('accounts', app.ZEROCONF_ACC_NAME) app.config.set_per('accounts', app.ZEROCONF_ACC_NAME, 'autoconnect', True) @@ -123,7 +125,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None - app.log.debug('reconnect') + log.debug('reconnect') self.disconnect() self.change_status(self.old_show, self.status) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b60fe02680f34011b9cd6ae854ba690ae9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b60fe02680f34011b9cd6ae854ba690ae9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Use GNotification instead of pynotify or dbus
by Yann Leboulanger 21 Sep '17

21 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 083e3017 by Yann Leboulanger at 2017-09-13T21:20:37+02:00 Use GNotification instead of pynotify or dbus - - - - - 66e9bc4e by Yann Leboulanger at 2017-09-21T20:44:18+02:00 Merge branch 'master' into 'gnotification' # Conflicts: # gajim/gajim.py - - - - - f4f8db52 by Yann Leboulanger at 2017-09-21T20:46:36+02:00 Merge branch 'gnotification' into 'master' Use GNotification instead of pynotify or dbus See merge request !130 - - - - - 6 changed files: - gajim/app_actions.py - gajim/common/config.py - gajim/common/dbus_support.py - gajim/features_window.py - gajim/gajim.py - gajim/notify.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -266,3 +266,9 @@ class AppActions(): else: interface.instances['logs'] = history_window.\ HistoryWindow() + + def on_open_event(self, action, param): + dict_ = param.unpack() + app.interface.handle_event(dict_['account'], dict_['jid'], + dict_['type_']) + ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -74,7 +74,6 @@ class Config: 'autopopupaway': [ opt_bool, False ], 'autopopup_chat_opened': [ opt_bool, False, _('Show desktop notification even when a chat window is opened for this contact and does not have focus') ], 'sounddnd': [ opt_bool, False, _('Play sound when user is busy')], - 'use_notif_daemon': [ opt_bool, True, _('Use D-Bus and Notification-Daemon to show notifications') ], 'showoffline': [ opt_bool, False ], 'show_only_chat_and_online': [ opt_bool, False, _('Show only online and free for chat contacts in roster.')], 'show_transports_group': [ opt_bool, True ], ===================================== gajim/common/dbus_support.py ===================================== --- a/gajim/common/dbus_support.py +++ b/gajim/common/dbus_support.py @@ -159,27 +159,6 @@ def get_interface(interface, path, start_service=True): return None -def get_notifications_interface(notif=None): - """ - Get the notifications interface - - :param notif: DesktopNotification instance - """ - # try to see if KDE notifications are available - iface = get_interface('org.kde.VisualNotifications', '/VisualNotifications', - start_service=False) - if iface != None: - if notif != None: - notif.kde_notifications = True - return iface - # KDE notifications don't seem to be available, falling back to - # notification-daemon - else: - if notif != None: - notif.kde_notifications = False - return get_interface('org.freedesktop.Notifications', - '/org/freedesktop/Notifications') - if supported: class MissingArgument(dbus.DBusException): _dbus_error_name = _GAJIM_ERROR_IFACE + '.MissingArgument' ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -73,10 +73,6 @@ class FeaturesWindow: _('Spellchecking of composed messages.'), _('Requires libgtkspell.'), _('Requires libgtkspell and libenchant.')), - _('Notification'): (self.notification_available, - _('Passive popups notifying for new events.'), - _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'), - _('Feature not available under Windows.')), _('Automatic status'): (self.idle_available, _('Ability to measure idle time, in order to set auto status.'), _('Requires libxss library.'), @@ -199,18 +195,6 @@ class FeaturesWindow: return False return True - def notification_available(self): - if os.name == 'nt': - return False - from gajim.common import dbus_support - if self.dbus_available() and dbus_support.get_notifications_interface(): - return True - try: - __import__('pynotify') - except Exception: - return False - return True - def idle_available(self): from gajim.common import sleepy return sleepy.SUPPORTED ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -314,7 +314,8 @@ class GajimApplication(Gtk.Application): ('-delete-motd', action.on_delete_motd, 'online', 's'), ('-activate-bookmark', action.on_activate_bookmark, 'online', 'a{sv}'), - ('-import-contacts', action.on_import_contacts, 'online', 's') + ('-open-event', action.on_open_event, 'always', 'a{sv}'), + ('-import-contacts', action.on_import_contacts, 'online', 's'), ] # General Stateful Actions @@ -347,7 +348,7 @@ class GajimApplication(Gtk.Application): ('features', action.on_features), ('content', action.on_contents), ('about', action.on_about), - ('faq', action.on_faq) + ('faq', action.on_faq), ] for action in self.general_actions: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -27,31 +27,16 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os -import time +import sys from gajim.dialogs import PopupNotificationWindow -from gi.repository import GObject from gi.repository import GLib +from gi.repository import Gio from gajim import gtkgui_helpers from gajim.common import app from gajim.common import helpers from gajim.common import ged -from gajim.common import dbus_support -if dbus_support.supported: - import dbus - - -USER_HAS_PYNOTIFY = True # user has pynotify module -try: - import gi - gi.require_version('Notify', '0.7') - from gi.repository import Notify - Notify.init('Gajim Notification') -except ValueError: - USER_HAS_PYNOTIFY = False - def get_show_in_roster(event, account, contact, session=None): """ Return True if this event must be shown in roster, else False @@ -74,12 +59,11 @@ def get_show_in_systray(event, account, contact, type_=None): return False return app.config.get('trayicon_notification_on_events') -def popup(event_type, jid, account, msg_type='', path_to_image=None, title=None, +def popup(event_type, jid, account, type_='', path_to_image=None, title=None, text=None, timeout=-1): """ - Notify a user of an event. It first tries to a valid implementation of - the Desktop Notification Specification. If that fails, then we fall back to - the older style PopupNotificationWindow method + Notify a user of an event using GNotification and GApplication under linux, + the older style PopupNotificationWindow method under windows """ # default image if not path_to_image: @@ -88,67 +72,44 @@ text=None, timeout=-1): if timeout < 0: timeout = app.config.get('notification_timeout') - # Try to show our popup via D-Bus and notification daemon - if app.config.get('use_notif_daemon') and dbus_support.supported: - try: - DesktopNotification(event_type, jid, account, msg_type, - path_to_image, title, GLib.markup_escape_text(text), timeout) - return # sucessfully did D-Bus Notification procedure! - except dbus.DBusException as e: - # Connection to D-Bus failed - app.log.debug(str(e)) - except TypeError as e: - # This means that we sent the message incorrectly - app.log.debug(str(e)) - - # Ok, that failed. Let's try pynotify, which also uses notification daemon - if app.config.get('use_notif_daemon') and USER_HAS_PYNOTIFY: - if not text and event_type == 'new_message': - # empty text for new_message means do_preview = False - # -> default value for text - _text = GLib.markup_escape_text(app.get_name_from_jid(account, - jid)) - else: - _text = GLib.markup_escape_text(text) - - if not title: - _title = '' - else: - _title = title - - notification = Notify.Notification.new(_title, _text) - notification.set_timeout(timeout*1000) - - notification.set_category(event_type) - notification._data = {} - notification._data["event_type"] = event_type - notification._data["jid"] = jid - notification._data["account"] = account - notification._data["msg_type"] = msg_type - notification.set_property('icon-name', path_to_image) - if 'actions' in Notify.get_server_caps(): - notification.add_action('default', 'Default Action', - on_pynotify_notification_clicked) - - try: - notification.show() - return - except GObject.GError as e: - # Connection to notification-daemon failed, see #2893 - app.log.debug(str(e)) - - # Either nothing succeeded or the user wants old-style notifications - instance = PopupNotificationWindow(event_type, jid, account, msg_type, - path_to_image, title, text, timeout) - app.interface.roster.popup_notification_windows.append(instance) - -def on_pynotify_notification_clicked(notification, action): - jid = notification._data.jid - account = notification._data.account - msg_type = notification._data.msg_type + if sys.platform == 'win32': + instance = PopupNotificationWindow(event_type, jid, account, type_, + path_to_image, title, text, timeout) + app.interface.roster.popup_notification_windows.append(instance) + return + + # use GNotification + # TODO: Move to standard GTK+ icons here. + icon = Gio.FileIcon.new(Gio.File.new_for_path(path_to_image)) + notification = Gio.Notification() + if title is not None: + notification.set_title(title) + if text is not None: + notification.set_body(text) + notification.set_icon(icon) + notif_id = None + if event_type in (_('Contact Signed In'), _('Contact Signed Out'), + _('New Message'), _('New Single Message'), _('New Private Message'), + _('Contact Changed Status'), _('File Transfer Request'), + _('File Transfer Error'), _('File Transfer Completed'), + _('File Transfer Stopped'), _('Groupchat Invitation'), + _('Connection Failed'), _('Subscription request'), _('Unsubscribed')): + # Create Variant Dict + dict_ = {'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', jid), + 'type_': GLib.Variant('s', type_)} + variant_dict = GLib.Variant('a{sv}', dict_) + action = 'app.{}-open-event'.format(account) + notification.add_button_with_target('Open', action, variant_dict) + notification.set_default_action_and_target(action, variant_dict) + if event_type in (_('New Message'), _('New Single Message'), + _('New Private Message')): + # Only one notification per JID + notif_id = jid + notification.set_priority(Gio.NotificationPriority.NORMAL) + notification.set_urgent(False) + app.app.send_notification(notif_id, notification) - notification.close() - app.interface.handle_event(account, jid, msg_type) class Notification: """ @@ -184,297 +145,3 @@ class Notification: helpers.exec_command(obj.command, use_shell=True) except Exception: pass - -class NotificationResponseManager: - """ - Collect references to pending DesktopNotifications and manages there - signalling. This is necessary due to a bug in DBus where you can't remove a - signal from an interface once it's connected - """ - - def __init__(self): - self.pending = {} - self.received = [] - self.interface = None - - def attach_to_interface(self): - if self.interface is not None: - return - self.interface = dbus_support.get_notifications_interface() - self.interface.connect_to_signal('ActionInvoked', - self.on_action_invoked) - self.interface.connect_to_signal('NotificationClosed', self.on_closed) - - def on_action_invoked(self, id_, reason): - if id_ in self.pending: - notification = self.pending[id_] - notification.on_action_invoked(id_, reason) - del self.pending[id_] - return - # got an action on popup that isn't handled yet? Maybe user clicked too - # fast. Remember it. - self.received.append((id_, time.time(), reason)) - if len(self.received) > 20: - curt = time.time() - for rec in self.received: - diff = curt - rec[1] - if diff > 10: - self.received.remove(rec) - - def on_closed(self, id_, reason=None): - if id_ in self.pending: - del self.pending[id_] - - def add_pending(self, id_, object_): - # Check to make sure that we handle an event immediately if we're adding - # an id that's already been triggered - for rec in self.received: - if rec[0] == id_: - object_.on_action_invoked(id_, rec[2]) - self.received.remove(rec) - return - if id_ not in self.pending: - # Add it - self.pending[id_] = object_ - else: - # We've triggered an event that has a duplicate ID! - app.log.debug('Duplicate ID of notification. Can\'t handle this.') - -notification_response_manager = NotificationResponseManager() - -class DesktopNotification: - """ - A DesktopNotification that interfaces with D-Bus via the Desktop - Notification Specification - """ - - def __init__(self, event_type, jid, account, msg_type='', - path_to_image=None, title=None, text=None, timeout=-1): - self.path_to_image = os.path.abspath(path_to_image) - self.event_type = event_type - self.title = title - self.text = text - self.timeout = timeout - # 0.3.1 is the only version of notification daemon that has no way - # to determine which version it is. If no method exists, it means - # they're using that one. - self.default_version = [0, 3, 1] - self.account = account - self.jid = jid - self.msg_type = msg_type - - # default value of text - if not text and event_type == 'new_message': - # empty text for new_message means do_preview = False - self.text = app.get_name_from_jid(account, jid) - - if not title: - self.title = event_type # default value - - if event_type == _('Contact Signed In'): - ntype = 'presence.online' - elif event_type == _('Contact Signed Out'): - ntype = 'presence.offline' - elif event_type in (_('New Message'), _('New Single Message'), - _('New Private Message')): - ntype = 'im.received' - elif event_type == _('File Transfer Request'): - ntype = 'transfer' - elif event_type == _('File Transfer Error'): - ntype = 'transfer.error' - elif event_type in (_('File Transfer Completed'), - _('File Transfer Stopped')): - ntype = 'transfer.complete' - elif event_type == _('New E-mail'): - ntype = 'email.arrived' - elif event_type == _('Groupchat Invitation'): - ntype = 'im.invitation' - elif event_type == _('Contact Changed Status'): - ntype = 'presence.status' - elif event_type == _('Connection Failed'): - ntype = 'connection.failed' - elif event_type == _('Subscription request'): - ntype = 'subscription.request' - elif event_type == _('Unsubscribed'): - ntype = 'unsubscribed' - else: - # default failsafe values - self.path_to_image = gtkgui_helpers.get_icon_path( - 'gajim-chat_msg_recv', 48) - ntype = 'im' # Notification Type - - self.notif = dbus_support.get_notifications_interface(self) - if self.notif is None: - raise dbus.DBusException('unable to get notifications interface') - self.ntype = ntype - - if self.kde_notifications: - self.attempt_notify() - else: - self.capabilities = self.notif.GetCapabilities() - if self.capabilities is None: - self.capabilities = ['actions'] - self.get_version() - - def attempt_notify(self): - ntype = self.ntype - if self.kde_notifications: - notification_text = ('<html><img src="%(image)s" align=left />' \ - '%(title)s<br/>%(text)s</html>') % {'title': self.title, - 'text': self.text, 'image': self.path_to_image} - gajim_icon = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) - try: - self.notif.Notify( - dbus.String(_('Gajim')), # app_name (string) - dbus.UInt32(0), # replaces_id (uint) - ntype, # event_id (string) - dbus.String(gajim_icon), # app_icon (string) - dbus.String(''), # summary (string) - dbus.String(notification_text), # body (string) - # actions (stringlist) - (dbus.String('default'), dbus.String(self.event_type), - dbus.String('ignore'), dbus.String(_('Ignore'))), - [], # hints (not used in KDE yet) - dbus.UInt32(self.timeout*1000), # timeout (int), in ms - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) - return - except Exception: - pass - version = self.version - if version[:2] == [0, 2]: - actions = {} - if 'actions' in self.capabilities and self.msg_type: - actions = {'default': 0} - try: - self.notif.Notify( - dbus.String(_('Gajim')), - dbus.String(self.path_to_image), - dbus.UInt32(0), - ntype, - dbus.Byte(0), - dbus.String(self.title), - dbus.String(self.text), - [dbus.String(self.path_to_image)], - actions, - [''], - True, - dbus.UInt32(self.timeout), - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) - except AttributeError: - # we're actually dealing with the newer version - version = [0, 3, 1] - if version > [0, 3]: - if app.interface.systray_enabled and \ - app.config.get('attach_notifications_to_systray'): - status_icon = app.interface.systray.status_icon - rect = status_icon.get_geometry()[2] - x, y, width, height = rect.x, rect.y, rect.width, rect.height - pos_x = x + (width / 2) - pos_y = y + (height / 2) - hints = {'x': pos_x, 'y': pos_y} - else: - hints = {} - if version >= [0, 3, 2]: - hints['urgency'] = dbus.Byte(0) # Low Urgency - hints['category'] = dbus.String(ntype) - # it seems notification-daemon doesn't like empty text - if self.text: - text = self.text - if len(self.text) > 200: - text = '%s\n…' % self.text[:200] - else: - text = ' ' - if os.environ.get('KDE_FULL_SESSION') == 'true': - text = '<table style=\'padding: 3px\'><tr><td>' \ - '<img src=\"%s\"></td><td width=20> </td>' \ - '<td>%s</td></tr></table>' % (self.path_to_image, - text) - self.path_to_image = os.path.abspath( - gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48)) - actions = () - if 'actions' in self.capabilities and self.msg_type: - actions = (dbus.String('default'), dbus.String( - self.event_type)) - try: - self.notif.Notify( - dbus.String(_('Gajim')), - # this notification does not replace other - dbus.UInt32(0), - dbus.String(self.path_to_image), - dbus.String(self.title), - dbus.String(text), - actions, - hints, - dbus.UInt32(self.timeout*1000), - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) - except Exception as e: - self.notify_another_way(e) - else: - try: - self.notif.Notify( - dbus.String(_('Gajim')), - dbus.String(self.path_to_image), - dbus.UInt32(0), - dbus.String(self.title), - dbus.String(self.text), - dbus.String(''), - hints, - dbus.UInt32(self.timeout*1000), - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) - except Exception as e: - self.notify_another_way(e) - - def attach_by_id(self, id_): - notification_response_manager.attach_to_interface() - notification_response_manager.add_pending(id_, self) - - def notify_another_way(self, e): - app.log.debug('Error when trying to use notification daemon: %s' % \ - str(e)) - instance = PopupNotificationWindow(self.event_type, self.jid, - self.account, self.msg_type, self.path_to_image, self.title, - self.text, self.timeout) - app.interface.roster.popup_notification_windows.append(instance) - - def on_action_invoked(self, id_, reason): - if self.notif is None: - return - self.notif.CloseNotification(dbus.UInt32(id_)) - self.notif = None - - if reason == 'ignore': - return - - app.interface.handle_event(self.account, self.jid, self.msg_type) - - def version_reply_handler(self, name, vendor, version, spec_version=None): - if spec_version: - version = spec_version - elif vendor == 'Xfce' and version.startswith('0.1.0'): - version = '0.9' - version_list = version.split('.') - self.version = [] - try: - while len(version_list): - self.version.append(int(version_list.pop(0))) - except ValueError: - self.version_error_handler_3_x_try(None) - self.attempt_notify() - - def get_version(self): - self.notif.GetServerInfo( - reply_handler=self.version_reply_handler, - error_handler=self.version_error_handler_2_x_try) - - def version_error_handler_2_x_try(self, e): - self.notif.GetServerInformation( - reply_handler=self.version_reply_handler, - error_handler=self.version_error_handler_3_x_try) - - def version_error_handler_3_x_try(self, e): - self.version = self.default_version - self.attempt_notify() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/28184273e6ab63474d8f5df26a2a9ecfc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/28184273e6ab63474d8f5df26a2a9ecfc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] annouce XEP-0380 support
by Yann Leboulanger 21 Sep '17

21 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 28184273 by Yann Leboulanger at 2017-09-21T20:36:45+02:00 annouce XEP-0380 support - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -259,7 +259,8 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT] + nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT, + nbxmpp.NS_EME] # Optional features gajim supports per account gajim_optional_features = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/28184273e6ab63474d8f5df26a2a9ecfc2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/28184273e6ab63474d8f5df26a2a9ecfc2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add simple log instance getter
by Philipp Hörist 21 Sep '17

21 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7e475705 by Philipp Hörist at 2017-09-21T19:49:07+02:00 Add simple log instance getter - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -53,7 +53,7 @@ ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher nec = None # Network Events Controller plugin_manager = None # Plugins Manager -log = logging.getLogger('gajim') +glog = logging.getLogger('gajim') logger = None @@ -174,7 +174,7 @@ try: ''' v_gnupg = gnupg.__version__ if V(v_gnupg) < V('0.3.8') or V(v_gnupg) > V('1.0.0'): - log.info('Gajim needs python-gnupg >= 0.3.8') + glog.info('Gajim needs python-gnupg >= 0.3.8') HAVE_GPG = False except ImportError: HAVE_GPG = False @@ -245,7 +245,7 @@ try: if sleepy.SUPPORTED: HAVE_IDLE = True except Exception: - log.debug(_('Unable to load idle module')) + glog.info(_('Unable to load idle module')) HAVE_IDLE = False @@ -491,3 +491,7 @@ def get_priority(account, show): elif prio > 127: prio = 127 return prio + +def log(domain): + root = 'gajim.' + return logging.getLogger(root + domain) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7e475705c923e1af7084168fc2419689c0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7e475705c923e1af7084168fc2419689c0… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2017