Commits October 2018

commits@gajim.org

1 participants
107 discussions

[Git][gajim/gajim][master] Add clipboard button to copy server infos
by Philipp Hörist 27 Oct '18

27 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bed18c90 by Daniel Brötzmann at 2018-10-27T13:35:37Z Add clipboard button to copy server infos - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -18,6 +18,7 @@ from datetime import timedelta import nbxmpp from gi.repository import Gtk +from gi.repository import Gdk from gajim.common import app from gajim.common import ged @@ -50,8 +51,17 @@ class ServerInfoDialog(Gtk.Dialog): self.feature_listbox.set_header_func(self.header_func, 'Features') grid.attach(self.feature_listbox, 0, 1, 1, 1) + self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard_button = Gtk.Button(halign=Gtk.Align.END) + clp_image = Gtk.Image.new_from_icon_name('edit-copy-symbolic', + Gtk.IconSize.BUTTON) + clipboard_button.set_image(clp_image) + clipboard_button.set_tooltip_text(_('Copy info to clipboard')) + clipboard_button.connect('clicked', self.on_clipboard_button_clicked) + box = self.get_content_area() box.pack_start(grid, True, True, 0) + box.pack_start(clipboard_button, False, True, 0) box.set_property('margin', 12) box.set_spacing(18) @@ -193,6 +203,24 @@ class ServerInfoDialog(Gtk.Dialog): Info(_('Server Software'), self.version, None), Info(_('Server Uptime'), self.uptime, None)] + def on_clipboard_button_clicked(self, widget): + server_software = 'Server Software: %s\n' % self.get_infos()[1].value + server_features = '' + + for feature in self.get_features(): + if feature.available: + available = 'Yes' + else: + available = 'No' + if feature.tooltip != '': + tooltip = '(%s)' % feature.tooltip + else: + tooltip = '' + server_features += '%s: %s %s\n' % (feature.name, available, tooltip) + + clipboard_text = server_software + server_features + self.clipboard.set_text(clipboard_text, -1) + def on_response(self, dialog, response): if response == Gtk.ResponseType.OK: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bed18c9067ac7f168b31d70861b43dcb56… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bed18c9067ac7f168b31d70861b43dcb56… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Features Dialog Design
by Philipp Hörist 27 Oct '18

27 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fb60324 by Daniel Brötzmann at 2018-10-27T12:54:57Z Update Features Dialog Design - - - - - 3 changed files: - gajim/data/gui/features_window.ui - gajim/data/style/gajim.css - gajim/gtk/features.py Changes: ===================================== gajim/data/gui/features_window.ui ===================================== @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="features_box"> - <property name="width_request">300</property> - <property name="height_request">530</property> + <property name="width_request">400</property> + <property name="height_request">500</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -19,9 +16,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> + <property name="label" translatable="yes">Listing of available features</property> <property name="use_markup">True</property> - <property name="xalign">0</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -41,9 +41,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="enable_grid_lines">horizontal</property> <signal name="cursor-changed" handler="on_features_treeview_cursor_changed" swapped="no"/> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <object class="GtkTreeSelection"/> </child> </object> </child> @@ -55,35 +56,97 @@ </packing> </child> <child> - <object class="GtkFrame"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">3</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Description</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="feature_desc_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="halign">start</property> <property name="wrap">True</property> <property name="selectable">True</property> <property name="xalign">0</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <child type="label"> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Description</b></property> + <property name="halign">start</property> + <property name="label" translatable="yes">Requirements</property> <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + <class name="margin-top6"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="feature_req_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -88,6 +88,13 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ #ServerInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #ServerInfoGrid > list > row.activatable:active { box-shadow: none; } +/* Features Info */ +#FeaturesInfoGrid > list { border: 1px solid; border-color: @borders; } +#FeaturesInfoGrid > list > row:first-child { border-top: 1px solid; border-color: @borders; } +#FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } +#FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } +#FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } + /* OptionsBox */ #OptionsBox > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } #OptionsBox > row:last-child { border-bottom: 0px} ===================================== gajim/gtk/features.py ===================================== @@ -20,142 +20,148 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +from collections import namedtuple import gi -from gi.repository import Gtk, Gdk +from gi.repository import Gtk from gajim.common import app -from gajim.common.i18n import Q_ from gajim.common.i18n import _ -from gajim.gtk.util import get_builder - class FeaturesDialog(Gtk.Dialog): def __init__(self): flags = Gtk.DialogFlags.DESTROY_WITH_PARENT super().__init__(_('Features'), None, flags) - self.connect('key-press-event', self.on_key_press_event) self.set_transient_for(app.interface.roster.window) + self.set_resizable(False) - self.builder = get_builder('features_window.ui') - content = self.get_content_area() - content.add(self.builder.get_object('features_box')) - - treeview = self.builder.get_object('features_treeview') - self.desc_label = self.builder.get_object('feature_desc_label') - - # {name: (available_function, unix_text, windows_text)} - self.features = { - _('Bonjour / Zeroconf'): ( - self.zeroconf_available, - _('Serverless chatting with autodetected clients in a local network.'), - _('Requires python-dbus.'), - _('Requires pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/).'}), - _('Command line'): ( - self.dbus_available, - _('A script to control Gajim via commandline.'), - _('Requires python-dbus.'), - _('Feature not available under Windows.')), - _('OpenPGP message encryption'): ( - self.gpg_available, - _('Ability to encrypting chat messages with OpenPGP.'), - _('Requires gpg and python-gnupg (%(url)s).') % {'url': 'https://bitbucket.org/vinay.sajip/python-gnupg'}, - _('Requires gpg.exe in PATH.')), - _('Password encryption'): ( - self.some_keyring_available, - _('Passwords can be stored securely and not just in plaintext.'), - _('Requires libsecret and a provider (such as GNOME Keyring and KSecretService).'), - _('On Windows the Windows Credential Vault is used.')), - _('Spell Checker'): ( - self.speller_available, - _('Spellchecking of composed messages.'), - _('Requires Gspell'), - _('Requires Gspell')), - _('Automatic status'): ( - self.idle_available, - _('Ability to measure idle time, in order to set auto status.'), - _('Requires libxss library.'), - _('Requires python2.5.')), - _('RST Generator'): ( - self.docutils_available, - _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), - _('Requires python-docutils.'), - _('Requires python-docutils.')), - _('Audio / Video'): ( - self.farstream_available, - _('Ability to start audio and video chat.'), - _('Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and gstreamer1.0-plugins-ugly.'), - _('Feature not available under Windows.')), - _('UPnP-IGD'): ( - self.gupnp_igd_available, - _('Ability to request your router to forward port for file transfer.'), - _('Requires gir1.2-gupnpigd-1.0.'), - _('Feature not available under Windows.')), - } - - # name, supported - self.model = Gtk.ListStore(str, bool) - treeview.set_model(self.model) - - col = Gtk.TreeViewColumn(Q_('?features:Available')) - treeview.append_column(col) - cell = Gtk.CellRendererToggle() - cell.set_property('radio', True) - col.pack_start(cell, True) - col.add_attribute(cell, 'active', 1) - - col = Gtk.TreeViewColumn(_('Feature')) - treeview.append_column(col) - cell = Gtk.CellRendererText() - col.pack_start(cell, True) - col.add_attribute(cell, 'text', 0) - - # Fill model - for feature in self.features: - func = self.features[feature][0] - rep = func() - self.model.append([feature, rep]) - - self.model.set_sort_column_id(0, Gtk.SortType.ASCENDING) - - self.builder.connect_signals(self) - self.show_all() + grid = Gtk.Grid() + grid.set_name('FeaturesInfoGrid') + grid.set_row_spacing(10) + grid.set_hexpand(True) - def on_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() + self.feature_listbox = Gtk.ListBox() + self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.feature_listbox.set_header_func(self.header_func, _('Features')) - def on_close_button_clicked(self, widget): - self.destroy() - - def on_features_treeview_cursor_changed(self, widget): - selection = widget.get_selection() - if not selection: - return - rows = selection.get_selected_rows()[1] - if not rows: - return - path = rows[0] - feature = self.model[path][0] - text = self.features[feature][1] + '\n' - if os.name == 'nt': - text = text + self.features[feature][3] + grid.attach(self.feature_listbox, 0, 0, 1, 1) + + box = self.get_content_area() + box.pack_start(grid, True, True, 0) + box.set_property('margin', 12) + box.set_spacing(18) + + self.connect('response', self.on_response) + + for feature in self.get_features(): + self.add_feature(feature) + + self.show_all() + + @staticmethod + def header_func(row, before, user_data): + if before: + row.set_header(None) else: - text = text + self.features[feature][2] - self.desc_label.set_text(text) + label = Gtk.Label(label=user_data) + label.set_halign(Gtk.Align.START) + row.set_header(label) + + def on_response(self, dialog, response): + if response == Gtk.ResponseType.OK: + self.destroy() - def zeroconf_available(self): - return app.is_installed('ZEROCONF') + def add_feature(self, feature): + item = FeatureItem(feature) + self.feature_listbox.add(item) + item.get_parent().set_tooltip_text(item.tooltip) + + def get_features(self): + Feature = namedtuple('Feature', + ['name', 'available', 'tooltip', + 'dependency_u', 'dependency_w', 'enabled']) + + spell_check_enabled = app.config.get('use_speller') + + auto_status = [app.config.get('autoaway'), app.config.get('autoxa')] + auto_status_enabled = bool(any(auto_status)) + + return [ + Feature(_('Audio / Video'), + app.is_installed('FARSTREAM'), + _('Enables Gajim to provide Audio and Video chats'), + _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' + 'gstreamer1.0-libav, gstreamer1.0-plugins-ugly'), + _('Feature not available under Windows'), + None), + Feature(_('Automatic Status'), + self.idle_available(), + _('Enables Gajim to measure your computer\'s idle time in ' + 'order to set your Status automatically'), + _('Requires: libxss'), + _('No additional requirements'), + auto_status_enabled), + Feature(_('Bonjour / Zeroconf (Serverless Chat)'), + app.is_installed('ZEROCONF'), + _('Enables Gajim to automatically detected clients in a ' + 'local network for serverless chats'), + _('Requires: python-dbus'), + _('Requires: pybonjour and bonjour SDK running (%(url)s)') + % {'url': 'https://developer.apple.com/opensource/)'}, + None), + Feature(_('Command line Control'), + self.dbus_available(), + _('Enables you to control Gajim with via commandline'), + _('Requires: python-dbus'), + _('Feature not available under Windows'), + None), + Feature(_('OpenPGP Message Encryption'), + app.is_installed('GPG'), + _('Enables Gajim to encrypt chat messages with OpenPGP'), + _('Requires: gpg and python-gnupg (%(url)s)') + % {'url': 'https://bitbucket.org/vinay.sajip/python-gnupg'}, + _('Requires: gpg.exe in your PATH environment variable'), + None), + Feature(_('RST XHTML Generator'), + self.docutils_available(), + _('Enables Gajim to generate XHTML output from RST ' + 'code (%(url)s)') % {'url': + 'http://docutils.sourceforge.net/docs/ref/rst/' + 'restructuredtext.html'}, + _('Requires: python-docutils'), + _('Requires: python-docutils'), + None), + Feature(_('Secure Password Storage'), + self.some_keyring_available(), + _('Enables Gajim to store Passwords securely instead of ' + 'storing them in plaintext'), + _('Requires: libsecret and a provider (such as GNOME ' + 'Keyring and KSecretService)'), + _('Windows Credential Vault is used for secure password ' + 'storage'), + None), + Feature(_('Spell Checker'), + app.is_installed('GSPELL'), + _('Enables Gajim to spell check your messages while ' + 'composing'), + _('Requires: Gspell'), + _('Requires: Gspell'), + spell_check_enabled), + Feature(_('UPnP-IGD Port Forwarding'), + app.is_installed('UPNP'), + _('Enables Gajim to request your router to forward ports ' + 'for file transfers'), + _('Requires: gir1.2-gupnpigd-1.0'), + _('Feature not available under Windows'), + None) + ] def dbus_available(self): from gajim.common import dbus_support return dbus_support.supported - def gpg_available(self): - return app.is_installed('GPG') - def some_keyring_available(self): if os.name == 'nt': return True @@ -166,9 +172,6 @@ class FeaturesDialog(Gtk.Dialog): return False return True - def speller_available(self): - return app.is_installed('GSPELL') - def idle_available(self): from gajim.common import idle return idle.Monitor.is_available() @@ -180,8 +183,66 @@ class FeaturesDialog(Gtk.Dialog): return False return True - def farstream_available(self): - return app.is_installed('FARSTREAM') - def gupnp_igd_available(self): - return app.is_installed('UPNP') +class FeatureItem(Gtk.Grid): + def __init__(self, feature): + super().__init__() + self.set_column_spacing(12) + + self.tooltip = feature.tooltip + self.feature_dependency_u_text = feature.dependency_u + self.feature_dependency_w_text = feature.dependency_w + + self.box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + self.feature_label = Gtk.Label(label=feature.name) + self.feature_label.set_halign(Gtk.Align.START) + self.box.pack_start(self.feature_label, True, True, 0) + + self.feature_dependency_u = Gtk.Label(label=feature.dependency_u) + self.feature_dependency_u.get_style_context().add_class('dim-label') + self.feature_dependency_w = Gtk.Label(label=feature.dependency_w) + self.feature_dependency_w.get_style_context().add_class('dim-label') + + if not feature.available: + self.feature_dependency_u.set_halign(Gtk.Align.START) + self.feature_dependency_u.set_alignment(0.0, 0.0) + self.feature_dependency_u.set_line_wrap(True) + self.feature_dependency_u.set_max_width_chars(50) + self.feature_dependency_u.set_selectable(True) + self.feature_dependency_w.set_halign(Gtk.Align.START) + self.feature_dependency_w.set_alignment(0.0, 0.0) + self.feature_dependency_w.set_line_wrap(True) + self.feature_dependency_w.set_max_width_chars(50) + self.feature_dependency_w.set_selectable(True) + + if os.name == 'nt': + self.box.pack_start(self.feature_dependency_w, True, True, 0) + else: + self.box.pack_start(self.feature_dependency_u, True, True, 0) + + self.icon = Gtk.Image() + self.label_disabled = Gtk.Label(label='Disabled in Preferences') + self.label_disabled.get_style_context().add_class('dim-label') + self.set_feature(feature.available, feature.enabled) + + self.add(self.icon) + self.add(self.box) + + def set_feature(self, available, enabled): + self.icon.get_style_context().remove_class('error-color') + self.icon.get_style_context().remove_class('warning-color') + self.icon.get_style_context().remove_class('success-color') + + if not available: + self.icon.set_from_icon_name('window-close-symbolic', + Gtk.IconSize.MENU) + self.icon.get_style_context().add_class('error-color') + elif enabled is False: + self.icon.set_from_icon_name('dialog-warning-symbolic', + Gtk.IconSize.MENU) + self.box.pack_start(self.label_disabled, True, True, 0) + self.icon.get_style_context().add_class('warning-color') + else: + self.icon.set_from_icon_name('emblem-ok-symbolic', + Gtk.IconSize.MENU) + self.icon.get_style_context().add_class('success-color') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fb6032420720c820d44e57198ea9cf05d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fb6032420720c820d44e57198ea9cf05d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 6 commits: Dont use deprecated const
by Philipp Hörist 26 Oct '18

26 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 383e220e by Philipp Hörist at 2018-10-26T15:17:56Z Dont use deprecated const - - - - - cfd24b6d by Philipp Hörist at 2018-10-26T15:17:57Z Move dbus modules into own folder - light refactor of the screensaver module - - - - - b80afa71 by Philipp Hörist at 2018-10-26T15:17:57Z Fix imports - - - - - bc97f6a9 by Philipp Hörist at 2018-10-26T15:17:57Z Guard GeoClue import - So we dont have to check on module import if GeoClue is installed - - - - - 7bb4d07d by Philipp Hörist at 2018-10-26T15:17:57Z Fix import - - - - - 698ae2a3 by Matthew W. S. Bell at 2018-10-26T15:17:57Z Obtain sleep inhibitor again after every sleep - There is a PrepareForSleep signal before and after every sleep event. The expectation is that before sleep, gajim cleans up and then releases the sleep inhibitor. Accordingly, we must reacquire the inhibitor after sleeping, which can helpfully be done with the other signal. - Moved module to the dbus folder - Embed logic in a LogindListener object so we can import the module without listening to dbus - - - - - 10 changed files: - + gajim/common/dbus/__init__.py - gajim/common/location_listener.py → gajim/common/dbus/location.py - + gajim/common/dbus/logind.py - gajim/music_track_listener.py → gajim/common/dbus/music_track.py - + gajim/common/dbus/screensaver.py - gajim/gui_interface.py - − gajim/logind_listener.py - gajim/message_textview.py - gajim/roster_window.py - − gajim/screensaver_listener.py Changes: ===================================== gajim/common/dbus/__init__.py ===================================== ===================================== gajim/common/location_listener.py → gajim/common/dbus/location.py ===================================== @@ -14,17 +14,17 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from datetime import datetime import logging +from datetime import datetime + +from gi.repository import GLib from gajim.common import app -import gi -gi.require_version('Geoclue', '2.0') -from gi.repository import Geoclue -from gi.repository import GLib +if app.is_installed('GEOCLUE'): + from gi.repository import Geoclue -log = logging.getLogger('gajim.c.location_listener') +log = logging.getLogger('gajim.c.dbus.location') class LocationListener: @@ -102,5 +102,9 @@ class LocationListener: def enable(): + if not app.is_installed('GEOCLUE'): + log.warning('GeoClue not installed') + return + listener = LocationListener.get() listener.start() ===================================== gajim/common/dbus/logind.py ===================================== @@ -0,0 +1,135 @@ +# Copyright (C) 2014 Kamil Paral <kamil.paral AT gmail.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/>. + +''' +Watch for system sleep using systemd-logind. +Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit +''' + +import os +import logging + +from gi.repository import Gio +from gi.repository import GLib + +from gajim.common import app +from gajim.common.i18n import _ + +log = logging.getLogger('gajim.c.dbus.logind') + + +class LogindListener: + _instance = None + + @classmethod + def get(cls): + if cls._instance is None: + cls._instance = cls() + return cls._instance + + def __init__(self): + # file descriptor object of the inhibitor + self._inhibit_fd = None + + Gio.bus_watch_name( + Gio.BusType.SYSTEM, + 'org.freedesktop.login1', + Gio.BusNameWatcherFlags.NONE, + self._on_appear_logind, + self._on_vanish_logind) + + def _on_prepare_for_sleep(self, connection, _sender_name, _object_path, + interface_name, signal_name, parameters, + *_user_data): + '''Signal handler for PrepareForSleep event''' + log.debug('Received signal %s.%s%s', interface_name, signal_name, parameters) + + before = parameters[0] # Signal is either before or after sleep occurs + if before: + warn = self._inhibit_fd is None + log.log( + logging.WARNING if warn else logging.INFO, + 'Preparing for sleep by disconnecting from network%s', + ', without holding a sleep inhibitor' if warn else '') + + for name, conn in app.connections.items(): + if app.account_is_connected(name): + conn.old_show = app.SHOW_LIST[conn.connected] + st = conn.status + conn.change_status('offline', _('Machine is going to sleep')) + conn.status = st + conn.time_to_reconnect = 5 + + self._disinhibit_sleep() + else: + self._inhibit_sleep(connection) + for conn in app.connections.values(): + if conn.connected <= 0 and conn.time_to_reconnect: + conn.reconnect() + + def _inhibit_sleep(self, connection): + '''Obtain a sleep delay inhibitor from logind''' + if self._inhibit_fd is not None: + # Something is wrong, we have an inhibitor fd, and we are asking for + # yet another one. + log.warning('Trying to obtain a sleep inhibitor ' + 'while already holding one.') + + ret, ret_fdlist = connection.call_with_unix_fd_list_sync( + 'org.freedesktop.login1', + '/org/freedesktop/login1', + 'org.freedesktop.login1.Manager', + 'Inhibit', + GLib.Variant('(ssss)', ( + 'sleep', 'org.gajim.Gajim', _('Disconnect from the network'), + 'delay' # Inhibitor will delay but not block sleep + )), + GLib.VariantType.new('(h)'), + Gio.DBusCallFlags.NONE, -1, None, None) + + log.info('Inhibit sleep') + self._inhibit_fd = ret_fdlist.get(ret.unpack()[0]) + + def _disinhibit_sleep(self): + '''Relinquish our sleep delay inhibitor''' + if self._inhibit_fd is not None: + os.close(self._inhibit_fd) + self._inhibit_fd = None + log.info('Disinhibit sleep') + + def _on_appear_logind(self, connection, name, name_owner, *_user_data): + '''Use signal and locks provided by org.freedesktop.login1''' + log.info('Name %s appeared, owned by %s', name, name_owner) + + connection.signal_subscribe( + 'org.freedesktop.login1', + 'org.freedesktop.login1.Manager', + 'PrepareForSleep', + '/org/freedesktop/login1', + None, + Gio.DBusSignalFlags.NONE, + self._on_prepare_for_sleep, + None) + self._inhibit_sleep(connection) + + def _on_vanish_logind(self, _connection, name, *_user_data): + '''Release remaining resources related to org.freedesktop.login1''' + log.info('Name %s vanished', name) + self._disinhibit_sleep() + + +def enable(): + LogindListener.get() ===================================== gajim/music_track_listener.py → gajim/common/dbus/music_track.py ===================================== @@ -24,7 +24,7 @@ import logging from gi.repository import GObject from gi.repository import Gio, GLib -log = logging.getLogger('gajim.music_track_listener') +log = logging.getLogger('gajim.c.dbus.music_track') MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.' ===================================== gajim/common/dbus/screensaver.py ===================================== @@ -0,0 +1,103 @@ +# Copyright (C) 2018 André Apitzsch <git AT apitzsch.eu> +# +# 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 logging + +from gi.repository import Gio + +from gajim.common import app + +log = logging.getLogger('gajim.c.dbus.screensaver') + + +class ScreensaverListener: + _instance = None + + @classmethod + def get(cls): + if cls._instance is None: + cls._instance = cls() + return cls._instance + + def __init__(self): + Gio.bus_watch_name( + Gio.BusType.SESSION, + 'org.gnome.ScreenSaver', + Gio.BusNameWatcherFlags.NONE, + self._appeared, + None) + + @staticmethod + def _signal_received(_connection, _sender_name, _object_path, + interface_name, _signal_name, parameters, *_user_data): + '''Signal handler for screensaver active change''' + + log.info('Signal received: %s - %s', interface_name, parameters) + + roster = app.interface.roster + + if not parameters[0]: + for account in app.connections: + if app.account_is_connected(account) and \ + app.sleeper_state[account] == 'autoaway-forced': + # We came back online after screensaver + # autoaway + roster.send_status(account, 'online', + app.status_before_autoaway[account]) + app.status_before_autoaway[account] = '' + app.sleeper_state[account] = 'online' + return + if not app.config.get('autoaway'): + # Don't go auto away if user disabled the option + return + for account in app.connections: + if account not in app.sleeper_state or not app.sleeper_state[account]: + continue + if app.sleeper_state[account] == 'online': + if not app.account_is_connected(account): + continue + # we save our online status + app.status_before_autoaway[account] = \ + app.connections[account].status + # we go away (no auto status) [we pass True to auto param] + auto_message = app.config.get('autoaway_message') + if not auto_message: + auto_message = app.connections[account].status + else: + auto_message = auto_message.replace('$S', '%(status)s') + auto_message = auto_message.replace('$T', '%(time)s') + auto_message = auto_message % { + 'status': app.status_before_autoaway[account], + 'time': app.config.get('autoxatime')} + roster.send_status(account, 'away', auto_message, auto=True) + app.sleeper_state[account] = 'autoaway-forced' + + def _appeared(self, connection, name, _name_owner, *_user_data): + '''Set up a listener for screensaver signals''' + log.info('%s appeared', name) + connection.signal_subscribe( + 'org.gnome.ScreenSaver', + 'org.gnome.ScreenSaver', + 'ActiveChanged', + '/org/gnome/ScreenSaver', + None, + Gio.DBusSignalFlags.NONE, + self._signal_received, + None) + + +def enable(): + ScreensaverListener.get() ===================================== gajim/gui_interface.py ===================================== @@ -56,11 +56,10 @@ except Exception: from gajim.common import app from gajim.common import events - -from gajim.music_track_listener import MusicTrackListener - -if app.is_installed('GEOCLUE'): - from gajim.common import location_listener +from gajim.common.dbus import screensaver +from gajim.common.dbus import location +from gajim.common.dbus import music_track +from gajim.common.dbus import logind from gajim import gtkgui_helpers from gajim import gui_menu_builder @@ -1118,7 +1117,7 @@ class Interface: # enable location listener if (pep_supported and app.is_installed('GEOCLUE') and app.config.get_per('accounts', account, 'publish_location')): - location_listener.enable() + location.enable() @staticmethod def show_httpupload_progress(file): @@ -2083,14 +2082,14 @@ class Interface: def enable_music_listener(self): - listener = MusicTrackListener.get() + listener = music_track.MusicTrackListener.get() if not self.music_track_changed_signal: self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) listener.start() def disable_music_listener(self): - listener = MusicTrackListener.get() + listener = music_track.MusicTrackListener.get() listener.disconnect(self.music_track_changed_signal) self.music_track_changed_signal = None listener.stop() @@ -2725,8 +2724,8 @@ class Interface: # Handle screensaver if sys.platform == 'linux': - from gajim import logind_listener # pylint: disable=unused-variable - from gajim import screensaver_listener # pylint: disable=unused-variable + logind.enable() + screensaver.enable() self.show_vcard_when_connect = [] ===================================== gajim/logind_listener.py deleted ===================================== @@ -1,116 +0,0 @@ -# Copyright (C) 2014 Kamil Paral <kamil.paral AT gmail.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/>. - -''' -Watch for system suspend using systemd-logind. -Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit -''' - -import os -import logging - -from gi.repository import Gio, GLib - -from gajim.common import app -from gajim.common.i18n import _ - -log = logging.getLogger('gajim.logind_listener') - -# file descriptor of the inhibitor; negative number means we don't -# hold any (yet) -fd = None - - -def signal_received(connection, sender_name, object_path, - interface_name, signal_name, parameters, *user_data): - '''Signal handler for suspend event''' - - global fd - - log.info('Signal received: %s - %s', interface_name, parameters) - - # signal is sent right before (with the parameter True) and after - # (with the parameter False) the system goes down for suspend/hibernate - if not parameters[0]: - return - - # we're going for suspend, let's disconnect - log.debug('System suspend detected, disconnecting from network…') - for name, conn in app.connections.items(): - if app.account_is_connected(name): - conn.old_show = app.SHOW_LIST[conn.connected] - st = conn.status - conn.change_status('offline', _('Machine is going to sleep')) - conn.status = st - conn.time_to_reconnect = 5 - - # close the file descriptor and let the computer suspend - if fd is not None: - os.close(fd) - fd = None - else: - # something is wrong, the system is suspending but we don't have - # a lock file - log.warning("System suspend detected, but we don't seem to be holding " - "a file descriptor for sleep inhibitor") - - -def get_inhibitor(connection): - '''Ask for a suspend delay inhibitor''' - - global fd - - if fd is not None: - # something is wrong, we haven't closed the previous file descriptor - # and we ask for yet another one - log.warning('We are about to ask for a sleep inhibitor, but we seem ' - 'to be holding one already') - - ret = connection.call_with_unix_fd_list_sync( - 'org.freedesktop.login1', - '/org/freedesktop/login1', - 'org.freedesktop.login1.Manager', - 'Inhibit', - GLib.Variant('(ssss)', ('sleep', 'org.gajim.Gajim', - _('Disconnect from the network'), 'delay')), - GLib.VariantType.new('(h)'), - Gio.DBusCallFlags.NONE, -1, None, None) - - fd = ret.out_fd_list.get(0) - - -def appeared(connection, name, name_owner, *user_data): - '''Set up a listener for suspend signals''' - log.info('%s appeared', name) - if name == 'org.freedesktop.login1': - connection.signal_subscribe( - 'org.freedesktop.login1', - 'org.freedesktop.login1.Manager', - 'PrepareForSleep', - '/org/freedesktop/login1', - None, - Gio.DBusSignalFlags.NONE, - signal_received, - None) - get_inhibitor(connection) - - -Gio.bus_watch_name( - Gio.BusType.SYSTEM, - 'org.freedesktop.login1', - Gio.BusNameWatcherFlags.NONE, - appeared, - None) ===================================== gajim/message_textview.py ===================================== @@ -38,7 +38,7 @@ class MessageTextView(Gtk.TextView): chat/groupchat windows """ __gsignals__ = { - 'text-changed': (GObject.SIGNAL_RUN_LAST, None, (Gtk.TextBuffer,)) + 'text-changed': (GObject.SignalFlags.RUN_LAST, None, (Gtk.TextBuffer,)) } UNDO_LIMIT = 20 ===================================== gajim/roster_window.py ===================================== @@ -61,8 +61,8 @@ from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.const import PEPEventType, AvatarSize, StyleAttr -if app.is_installed('GEOCLUE'): - from gajim.common import location_listener +from gajim.common.dbus import location + from gajim.common import ged from gajim.message_window import MessageWindowMgr @@ -3659,7 +3659,7 @@ class RosterWindow: active = widget.get_active() app.config.set_per('accounts', account, 'publish_location', active) if active: - location_listener.enable() + location.enable() else: app.connections[account].get_module('UserLocation').send(None) ===================================== gajim/screensaver_listener.py deleted ===================================== @@ -1,90 +0,0 @@ -# Copyright (C) 2018 André Apitzsch <git AT apitzsch.eu> -# -# 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 logging - -from gi.repository import Gio - -from gajim.common import app - -log = logging.getLogger('gajim.screensaver_listener') - - -def signal_received(connection, sender_name, object_path, - interface_name, signal_name, parameters, *user_data): - '''Signal handler for screensaver active change''' - - log.info('Signal received: %s - %s', interface_name, parameters) - - roster = app.interface.roster - - if not parameters[0]: - for account in app.connections: - if app.account_is_connected(account) and \ - app.sleeper_state[account] == 'autoaway-forced': - # We came back online after screensaver - # autoaway - roster.send_status(account, 'online', - app.status_before_autoaway[account]) - app.status_before_autoaway[account] = '' - app.sleeper_state[account] = 'online' - return - if not app.config.get('autoaway'): - # Don't go auto away if user disabled the option - return - for account in app.connections: - if account not in app.sleeper_state or not app.sleeper_state[account]: - continue - if app.sleeper_state[account] == 'online': - if not app.account_is_connected(account): - continue - # we save our online status - app.status_before_autoaway[account] = \ - app.connections[account].status - # we go away (no auto status) [we pass True to auto param] - auto_message = app.config.get('autoaway_message') - if not auto_message: - auto_message = app.connections[account].status - else: - auto_message = auto_message.replace('$S', '%(status)s') - auto_message = auto_message.replace('$T', '%(time)s') - auto_message = auto_message % { - 'status': app.status_before_autoaway[account], - 'time': app.config.get('autoxatime')} - roster.send_status(account, 'away', auto_message, auto=True) - app.sleeper_state[account] = 'autoaway-forced' - - -def appeared(connection, name, name_owner, *user_data): - '''Set up a listener for screensaver signals''' - log.info('%s appeared', name) - connection.signal_subscribe( - 'org.gnome.ScreenSaver', - 'org.gnome.ScreenSaver', - 'ActiveChanged', - '/org/gnome/ScreenSaver', - None, - Gio.DBusSignalFlags.NONE, - signal_received, - None) - - -Gio.bus_watch_name( - Gio.BusType.SESSION, - 'org.gnome.ScreenSaver', - Gio.BusNameWatcherFlags.NONE, - appeared, - None) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a7624b564f2c8503b4580d0085c50cff2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a7624b564f2c8503b4580d0085c50cff2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Obtain sleep inhibitor again after every sleep
by Philipp Hörist 26 Oct '18

26 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a62209e by Matthew W. S. Bell at 2018-10-26T10:57:13Z Obtain sleep inhibitor again after every sleep - There is a PrepareForSleep signal before and after every sleep event. The expectation is that before sleep, gajim cleans up and then releases the sleep inhibitor. Accordingly, we must reacquire the inhibitor after sleeping, which can helpfully be done with the other signal. - Moved module to the dbus folder - Embed logic in a LogindListener object so we can import the module without listening to dbus - - - - - 3 changed files: - + gajim/common/dbus/logind.py - gajim/gui_interface.py - − gajim/logind_listener.py Changes: ===================================== gajim/common/dbus/logind.py ===================================== @@ -0,0 +1,135 @@ +# Copyright (C) 2014 Kamil Paral <kamil.paral AT gmail.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/>. + +''' +Watch for system sleep using systemd-logind. +Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit +''' + +import os +import logging + +from gi.repository import Gio +from gi.repository import GLib + +from gajim.common import app +from gajim.common.i18n import _ + +log = logging.getLogger('gajim.c.dbus.logind') + + +class LogindListener: + _instance = None + + @classmethod + def get(cls): + if cls._instance is None: + cls._instance = cls() + return cls._instance + + def __init__(self): + # file descriptor object of the inhibitor + self._inhibit_fd = None + + Gio.bus_watch_name( + Gio.BusType.SYSTEM, + 'org.freedesktop.login1', + Gio.BusNameWatcherFlags.NONE, + self._on_appear_logind, + self._on_vanish_logind) + + def _on_prepare_for_sleep(self, connection, _sender_name, _object_path, + interface_name, signal_name, parameters, + *_user_data): + '''Signal handler for PrepareForSleep event''' + log.debug('Received signal %s.%s%s', interface_name, signal_name, parameters) + + before = parameters[0] # Signal is either before or after sleep occurs + if before: + warn = self._inhibit_fd is None + log.log( + logging.WARNING if warn else logging.INFO, + 'Preparing for sleep by disconnecting from network%s', + ', without holding a sleep inhibitor' if warn else '') + + for name, conn in app.connections.items(): + if app.account_is_connected(name): + conn.old_show = app.SHOW_LIST[conn.connected] + st = conn.status + conn.change_status('offline', _('Machine is going to sleep')) + conn.status = st + conn.time_to_reconnect = 5 + + self._disinhibit_sleep() + else: + self._inhibit_sleep(connection) + for conn in app.connections.values(): + if conn.connected <= 0 and conn.time_to_reconnect: + conn.reconnect() + + def _inhibit_sleep(self, connection): + '''Obtain a sleep delay inhibitor from logind''' + if self._inhibit_fd is not None: + # Something is wrong, we have an inhibitor fd, and we are asking for + # yet another one. + log.warning('Trying to obtain a sleep inhibitor ' + 'while already holding one.') + + ret, ret_fdlist = connection.call_with_unix_fd_list_sync( + 'org.freedesktop.login1', + '/org/freedesktop/login1', + 'org.freedesktop.login1.Manager', + 'Inhibit', + GLib.Variant('(ssss)', ( + 'sleep', 'org.gajim.Gajim', _('Disconnect from the network'), + 'delay' # Inhibitor will delay but not block sleep + )), + GLib.VariantType.new('(h)'), + Gio.DBusCallFlags.NONE, -1, None, None) + + log.info('Inhibit sleep') + self._inhibit_fd = ret_fdlist.get(ret.unpack()[0]) + + def _disinhibit_sleep(self): + '''Relinquish our sleep delay inhibitor''' + if self._inhibit_fd is not None: + os.close(self._inhibit_fd) + self._inhibit_fd = None + log.info('Disinhibit sleep') + + def _on_appear_logind(self, connection, name, name_owner, *_user_data): + '''Use signal and locks provided by org.freedesktop.login1''' + log.info('Name %s appeared, owned by %s', name, name_owner) + + connection.signal_subscribe( + 'org.freedesktop.login1', + 'org.freedesktop.login1.Manager', + 'PrepareForSleep', + '/org/freedesktop/login1', + None, + Gio.DBusSignalFlags.NONE, + self._on_prepare_for_sleep, + None) + self._inhibit_sleep(connection) + + def _on_vanish_logind(self, _connection, name, *_user_data): + '''Release remaining resources related to org.freedesktop.login1''' + log.info('Name %s vanished', name) + self._disinhibit_sleep() + + +def enable(): + LogindListener.get() ===================================== gajim/gui_interface.py ===================================== @@ -59,6 +59,7 @@ from gajim.common import events from gajim.common.dbus import screensaver from gajim.common.dbus import location from gajim.common.dbus import music_track +from gajim.common.dbus import logind from gajim import gtkgui_helpers from gajim import gui_menu_builder @@ -2723,7 +2724,7 @@ class Interface: # Handle screensaver if sys.platform == 'linux': - from gajim import logind_listener # pylint: disable=unused-variable + logind.enable() screensaver.enable() self.show_vcard_when_connect = [] ===================================== gajim/logind_listener.py deleted ===================================== @@ -1,116 +0,0 @@ -# Copyright (C) 2014 Kamil Paral <kamil.paral AT gmail.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/>. - -''' -Watch for system suspend using systemd-logind. -Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit -''' - -import os -import logging - -from gi.repository import Gio, GLib - -from gajim.common import app -from gajim.common.i18n import _ - -log = logging.getLogger('gajim.logind_listener') - -# file descriptor of the inhibitor; negative number means we don't -# hold any (yet) -fd = None - - -def signal_received(connection, sender_name, object_path, - interface_name, signal_name, parameters, *user_data): - '''Signal handler for suspend event''' - - global fd - - log.info('Signal received: %s - %s', interface_name, parameters) - - # signal is sent right before (with the parameter True) and after - # (with the parameter False) the system goes down for suspend/hibernate - if not parameters[0]: - return - - # we're going for suspend, let's disconnect - log.debug('System suspend detected, disconnecting from network…') - for name, conn in app.connections.items(): - if app.account_is_connected(name): - conn.old_show = app.SHOW_LIST[conn.connected] - st = conn.status - conn.change_status('offline', _('Machine is going to sleep')) - conn.status = st - conn.time_to_reconnect = 5 - - # close the file descriptor and let the computer suspend - if fd is not None: - os.close(fd) - fd = None - else: - # something is wrong, the system is suspending but we don't have - # a lock file - log.warning("System suspend detected, but we don't seem to be holding " - "a file descriptor for sleep inhibitor") - - -def get_inhibitor(connection): - '''Ask for a suspend delay inhibitor''' - - global fd - - if fd is not None: - # something is wrong, we haven't closed the previous file descriptor - # and we ask for yet another one - log.warning('We are about to ask for a sleep inhibitor, but we seem ' - 'to be holding one already') - - ret = connection.call_with_unix_fd_list_sync( - 'org.freedesktop.login1', - '/org/freedesktop/login1', - 'org.freedesktop.login1.Manager', - 'Inhibit', - GLib.Variant('(ssss)', ('sleep', 'org.gajim.Gajim', - _('Disconnect from the network'), 'delay')), - GLib.VariantType.new('(h)'), - Gio.DBusCallFlags.NONE, -1, None, None) - - fd = ret.out_fd_list.get(0) - - -def appeared(connection, name, name_owner, *user_data): - '''Set up a listener for suspend signals''' - log.info('%s appeared', name) - if name == 'org.freedesktop.login1': - connection.signal_subscribe( - 'org.freedesktop.login1', - 'org.freedesktop.login1.Manager', - 'PrepareForSleep', - '/org/freedesktop/login1', - None, - Gio.DBusSignalFlags.NONE, - signal_received, - None) - get_inhibitor(connection) - - -Gio.bus_watch_name( - Gio.BusType.SYSTEM, - 'org.freedesktop.login1', - Gio.BusNameWatcherFlags.NONE, - appeared, - None) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2a62209e1e5e0dff020d3cf94e82f811f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2a62209e1e5e0dff020d3cf94e82f811f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix import
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54fe4dac by Philipp Hörist at 2018-10-25T23:49:15Z Fix import - - - - - 1 changed file: - gajim/common/dbus/location.py Changes: ===================================== gajim/common/dbus/location.py ===================================== @@ -21,6 +21,8 @@ from gi.repository import GLib from gajim.common import app +if app.is_installed('GEOCLUE'): + from gi.repository import Geoclue log = logging.getLogger('gajim.c.dbus.location') @@ -104,6 +106,5 @@ def enable(): log.warning('GeoClue not installed') return - from gi.repository import Geoclue listener = LocationListener.get() listener.start() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/54fe4dacf2b5b51cd402e2ad607f8f9f30… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/54fe4dacf2b5b51cd402e2ad607f8f9f30… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Guard GeoClue import
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e5beff26 by Philipp Hörist at 2018-10-25T23:45:43Z Guard GeoClue import - So we dont have to check on module import if GeoClue is installed - - - - - 1 changed file: - gajim/common/dbus/location.py Changes: ===================================== gajim/common/dbus/location.py ===================================== @@ -14,15 +14,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from datetime import datetime import logging +from datetime import datetime + +from gi.repository import GLib from gajim.common import app -import gi -gi.require_version('Geoclue', '2.0') -from gi.repository import Geoclue -from gi.repository import GLib log = logging.getLogger('gajim.c.dbus.location') @@ -102,5 +100,10 @@ class LocationListener: def enable(): + if not app.is_installed('GEOCLUE'): + log.warning('GeoClue not installed') + return + + from gi.repository import Geoclue listener = LocationListener.get() listener.start() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e5beff266a2324542a5df3dcb76cb4f865… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e5beff266a2324542a5df3dcb76cb4f865… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix imports
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef167349 by Philipp Hörist at 2018-10-25T23:31:49Z Fix imports - - - - - 2 changed files: - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -56,7 +56,9 @@ except Exception: from gajim.common import app from gajim.common import events -from gajim.common import dbus +from gajim.common.dbus import screensaver +from gajim.common.dbus import location +from gajim.common.dbus import music_track from gajim import gtkgui_helpers from gajim import gui_menu_builder @@ -1114,7 +1116,7 @@ class Interface: # enable location listener if (pep_supported and app.is_installed('GEOCLUE') and app.config.get_per('accounts', account, 'publish_location')): - dbus.location.enable() + location.enable() @staticmethod def show_httpupload_progress(file): @@ -2079,14 +2081,14 @@ class Interface: def enable_music_listener(self): - listener = dbus.music_track.MusicTrackListener.get() + listener = music_track.MusicTrackListener.get() if not self.music_track_changed_signal: self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) listener.start() def disable_music_listener(self): - listener = dbus.music_track.MusicTrackListener.get() + listener = music_track.MusicTrackListener.get() listener.disconnect(self.music_track_changed_signal) self.music_track_changed_signal = None listener.stop() @@ -2722,7 +2724,7 @@ class Interface: # Handle screensaver if sys.platform == 'linux': from gajim import logind_listener # pylint: disable=unused-variable - dbus.screensaver.enable() + screensaver.enable() self.show_vcard_when_connect = [] ===================================== gajim/roster_window.py ===================================== @@ -61,8 +61,8 @@ from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.const import PEPEventType, AvatarSize, StyleAttr -if app.is_installed('GEOCLUE'): - from gajim.common import dbus +from gajim.common.dbus import location + from gajim.common import ged from gajim.message_window import MessageWindowMgr @@ -3659,7 +3659,7 @@ class RosterWindow: active = widget.get_active() app.config.set_per('accounts', account, 'publish_location', active) if active: - dbus.location.enable() + location.enable() else: app.connections[account].get_module('UserLocation').send(None) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef167349f8c2d7206ffd7e8f17eef7f1a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef167349f8c2d7206ffd7e8f17eef7f1a0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move dbus modules into own folder
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: df7f0324 by Philipp Hörist at 2018-10-25T23:19:47Z Move dbus modules into own folder - light refactor of the screensaver module - - - - - 7 changed files: - + gajim/common/dbus/__init__.py - gajim/common/location_listener.py → gajim/common/dbus/location.py - gajim/music_track_listener.py → gajim/common/dbus/music_track.py - + gajim/common/dbus/screensaver.py - gajim/gui_interface.py - gajim/roster_window.py - − gajim/screensaver_listener.py Changes: ===================================== gajim/common/dbus/__init__.py ===================================== ===================================== gajim/common/location_listener.py → gajim/common/dbus/location.py ===================================== @@ -24,7 +24,7 @@ gi.require_version('Geoclue', '2.0') from gi.repository import Geoclue from gi.repository import GLib -log = logging.getLogger('gajim.c.location_listener') +log = logging.getLogger('gajim.c.dbus.location') class LocationListener: ===================================== gajim/music_track_listener.py → gajim/common/dbus/music_track.py ===================================== @@ -24,7 +24,7 @@ import logging from gi.repository import GObject from gi.repository import Gio, GLib -log = logging.getLogger('gajim.music_track_listener') +log = logging.getLogger('gajim.c.dbus.music_track') MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.' ===================================== gajim/common/dbus/screensaver.py ===================================== @@ -0,0 +1,103 @@ +# Copyright (C) 2018 André Apitzsch <git AT apitzsch.eu> +# +# 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 logging + +from gi.repository import Gio + +from gajim.common import app + +log = logging.getLogger('gajim.c.dbus.screensaver') + + +class ScreensaverListener: + _instance = None + + @classmethod + def get(cls): + if cls._instance is None: + cls._instance = cls() + return cls._instance + + def __init__(self): + Gio.bus_watch_name( + Gio.BusType.SESSION, + 'org.gnome.ScreenSaver', + Gio.BusNameWatcherFlags.NONE, + self._appeared, + None) + + @staticmethod + def _signal_received(_connection, _sender_name, _object_path, + interface_name, _signal_name, parameters, *_user_data): + '''Signal handler for screensaver active change''' + + log.info('Signal received: %s - %s', interface_name, parameters) + + roster = app.interface.roster + + if not parameters[0]: + for account in app.connections: + if app.account_is_connected(account) and \ + app.sleeper_state[account] == 'autoaway-forced': + # We came back online after screensaver + # autoaway + roster.send_status(account, 'online', + app.status_before_autoaway[account]) + app.status_before_autoaway[account] = '' + app.sleeper_state[account] = 'online' + return + if not app.config.get('autoaway'): + # Don't go auto away if user disabled the option + return + for account in app.connections: + if account not in app.sleeper_state or not app.sleeper_state[account]: + continue + if app.sleeper_state[account] == 'online': + if not app.account_is_connected(account): + continue + # we save our online status + app.status_before_autoaway[account] = \ + app.connections[account].status + # we go away (no auto status) [we pass True to auto param] + auto_message = app.config.get('autoaway_message') + if not auto_message: + auto_message = app.connections[account].status + else: + auto_message = auto_message.replace('$S', '%(status)s') + auto_message = auto_message.replace('$T', '%(time)s') + auto_message = auto_message % { + 'status': app.status_before_autoaway[account], + 'time': app.config.get('autoxatime')} + roster.send_status(account, 'away', auto_message, auto=True) + app.sleeper_state[account] = 'autoaway-forced' + + def _appeared(self, connection, name, _name_owner, *_user_data): + '''Set up a listener for screensaver signals''' + log.info('%s appeared', name) + connection.signal_subscribe( + 'org.gnome.ScreenSaver', + 'org.gnome.ScreenSaver', + 'ActiveChanged', + '/org/gnome/ScreenSaver', + None, + Gio.DBusSignalFlags.NONE, + self._signal_received, + None) + + +def enable(): + ScreensaverListener.get() ===================================== gajim/gui_interface.py ===================================== @@ -56,11 +56,7 @@ except Exception: from gajim.common import app from gajim.common import events - -from gajim.music_track_listener import MusicTrackListener - -if app.is_installed('GEOCLUE'): - from gajim.common import location_listener +from gajim.common import dbus from gajim import gtkgui_helpers from gajim import gui_menu_builder @@ -1118,7 +1114,7 @@ class Interface: # enable location listener if (pep_supported and app.is_installed('GEOCLUE') and app.config.get_per('accounts', account, 'publish_location')): - location_listener.enable() + dbus.location.enable() @staticmethod def show_httpupload_progress(file): @@ -2083,14 +2079,14 @@ class Interface: def enable_music_listener(self): - listener = MusicTrackListener.get() + listener = dbus.music_track.MusicTrackListener.get() if not self.music_track_changed_signal: self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) listener.start() def disable_music_listener(self): - listener = MusicTrackListener.get() + listener = dbus.music_track.MusicTrackListener.get() listener.disconnect(self.music_track_changed_signal) self.music_track_changed_signal = None listener.stop() @@ -2726,7 +2722,7 @@ class Interface: # Handle screensaver if sys.platform == 'linux': from gajim import logind_listener # pylint: disable=unused-variable - from gajim import screensaver_listener # pylint: disable=unused-variable + dbus.screensaver.enable() self.show_vcard_when_connect = [] ===================================== gajim/roster_window.py ===================================== @@ -62,7 +62,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.const import PEPEventType, AvatarSize, StyleAttr if app.is_installed('GEOCLUE'): - from gajim.common import location_listener + from gajim.common import dbus from gajim.common import ged from gajim.message_window import MessageWindowMgr @@ -3659,7 +3659,7 @@ class RosterWindow: active = widget.get_active() app.config.set_per('accounts', account, 'publish_location', active) if active: - location_listener.enable() + dbus.location.enable() else: app.connections[account].get_module('UserLocation').send(None) ===================================== gajim/screensaver_listener.py deleted ===================================== @@ -1,90 +0,0 @@ -# Copyright (C) 2018 André Apitzsch <git AT apitzsch.eu> -# -# 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 logging - -from gi.repository import Gio - -from gajim.common import app - -log = logging.getLogger('gajim.screensaver_listener') - - -def signal_received(connection, sender_name, object_path, - interface_name, signal_name, parameters, *user_data): - '''Signal handler for screensaver active change''' - - log.info('Signal received: %s - %s', interface_name, parameters) - - roster = app.interface.roster - - if not parameters[0]: - for account in app.connections: - if app.account_is_connected(account) and \ - app.sleeper_state[account] == 'autoaway-forced': - # We came back online after screensaver - # autoaway - roster.send_status(account, 'online', - app.status_before_autoaway[account]) - app.status_before_autoaway[account] = '' - app.sleeper_state[account] = 'online' - return - if not app.config.get('autoaway'): - # Don't go auto away if user disabled the option - return - for account in app.connections: - if account not in app.sleeper_state or not app.sleeper_state[account]: - continue - if app.sleeper_state[account] == 'online': - if not app.account_is_connected(account): - continue - # we save our online status - app.status_before_autoaway[account] = \ - app.connections[account].status - # we go away (no auto status) [we pass True to auto param] - auto_message = app.config.get('autoaway_message') - if not auto_message: - auto_message = app.connections[account].status - else: - auto_message = auto_message.replace('$S', '%(status)s') - auto_message = auto_message.replace('$T', '%(time)s') - auto_message = auto_message % { - 'status': app.status_before_autoaway[account], - 'time': app.config.get('autoxatime')} - roster.send_status(account, 'away', auto_message, auto=True) - app.sleeper_state[account] = 'autoaway-forced' - - -def appeared(connection, name, name_owner, *user_data): - '''Set up a listener for screensaver signals''' - log.info('%s appeared', name) - connection.signal_subscribe( - 'org.gnome.ScreenSaver', - 'org.gnome.ScreenSaver', - 'ActiveChanged', - '/org/gnome/ScreenSaver', - None, - Gio.DBusSignalFlags.NONE, - signal_received, - None) - - -Gio.bus_watch_name( - Gio.BusType.SESSION, - 'org.gnome.ScreenSaver', - Gio.BusNameWatcherFlags.NONE, - appeared, - None) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/df7f0324a33dcb76d64da728efc708048b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/df7f0324a33dcb76d64da728efc708048b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont use deprecated const
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d98ba45f by Philipp Hörist at 2018-10-25T22:47:36Z Dont use deprecated const - - - - - 1 changed file: - gajim/message_textview.py Changes: ===================================== gajim/message_textview.py ===================================== @@ -38,7 +38,7 @@ class MessageTextView(Gtk.TextView): chat/groupchat windows """ __gsignals__ = { - 'text-changed': (GObject.SIGNAL_RUN_LAST, None, (Gtk.TextBuffer,)) + 'text-changed': (GObject.SignalFlags.RUN_LAST, None, (Gtk.TextBuffer,)) } UNDO_LIMIT = 20 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d98ba45f973a12c90829c8897a7a49a45e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d98ba45f973a12c90829c8897a7a49a45e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Update feature list in appdata.xml
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 9f2a0ae7 by Daniel Brötzmann at 2018-10-25T22:23:13Z Update feature list in appdata.xml - - - - - a7624b56 by Philipp Hörist at 2018-10-25T22:23:13Z Fix error when plugin cant be loaded Fixes #9403 - - - - - 3 changed files: - .gitlab-ci.yml - data/org.gajim.Gajim.appdata.xml.in - gajim/plugins/pluginmanager.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -24,6 +24,11 @@ run-pylint: - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim +run-appdata: + stage: test + script: + - appstream-util validate data/org.gajim.Gajim.appdata.xml.in + run-build: stage: build script: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -7,32 +7,37 @@ <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-3.0</project_license> <name>Gajim</name> - <summary>A GTK+ Jabber client</summary> + <summary>A GTK+ XMPP client</summary> <description> - <p>Gajim is a chat client to be used with Jabber.org, Live Journal Talk, - Nimbuzz, Ovi, Talkonaut, and thousands of other services - run by companies and ISPs, and volunteers around the world. + <p>Gajim aims to be an easy to use and fully-featured XMPP client. + With Gajim you can chat through various XMPP services of your choice + (e.g. Jabber.org) as well as transports (e.g. Facebook, IRC). </p> - <p>If you have a few accounts on different servers, if you want to be in - contact with your friends and family all the time, then Gajim is for you. + <p>Just chat with your friends or family, easily share pictures and + thoughts or discuss the news with your groups. + </p> + <p>Gajim integrates well with your other devices: just chat and see what's + been said on your mobile device. </p> <p>Features:</p> <ul> - <li>Tabbed chat window and single window modes</li> - <li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation</li> - <li>Emojis, avatars, PEP (user activity, mood and tune)</li> - <li>Audio / video conferences</li> - <li>File transfer, room bookmarks</li> - <li>Metacontacts support</li> - <li>Trayicon, speller, extended chat history functionalities</li> - <li>TLS, GPG and End-To-End encryption support</li> - <li>Transport registration support</li> - <li>Service discovery including nodes, user search</li> - <li>Wikipedia, dictionary and search engine lookup</li> - <li>Multiple accounts support</li> - <li>XML console interface</li> - <li>Link local (bonjour / zeroconf), BOSH</li> - <li>Other features via plugins </li> + <li>Never miss a message, keep all your chat clients synchronized</li> + <li>Invite friends to group chats or join one</li> + <li>Easily send pictures, videos or other files to friends and groups</li> + <li>Chat securely with End-to-End encryption via OMEMO or PGP</li> + <li>Use your favorite emoticons, set your own profile picture</li> + <li>Keep and manage all your chat history</li> + <li>Organize your chats with tabs</li> + <li>Automatic spell-checking for your messages</li> + <li>Connect to other Messengers via Transports (Facebook, IRC, ...)</li> + <li>Lookup things on Wikipedia, dictionaries or other search engines directly from the chat window</li> + <li>Set your activity, tune, and mood to show your friends how you are feeling</li> + <li>Support for multiple accounts</li> + <li>Group multiple contacts from one friend to a single Meta-Contact</li> + <li>XML console to see what's happening on the protocol layer</li> + <li>Serverless messaging (Bonjour/Zeroconf), BOSH</li> + <li>Support for service discovery including nodes and search for users</li> + <li>Even more features via plugins</li> </ul> </description> <categories> @@ -43,7 +48,7 @@ </categories> <screenshots> <screenshot type="default"> - <image>https://gajim.org/imgs/gajim_roster.png</image> + <image>https://gajim.org/imgs/gajim_single_window_mode.png</image> <caption>Roster, list of contacts</caption> </screenshot> <screenshot> @@ -69,7 +74,7 @@ <url type="homepage">https://gajim.org/</url> <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url> <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url> - <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/home</url> + <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/Help</url> <url type="donation">https://gajim.org/dev.php#donate</url> <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url> <translation type="gettext">gajim</translation> ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -163,6 +163,8 @@ class PluginManager(metaclass=Singleton): if activate: pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, package=True) + if not pc: + continue self.add_plugin(pc[0]) plugin = self.plugins[-1] self.activate_plugin(plugin) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a812dce670022cdda0fdcaa9796d5a90… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a812dce670022cdda0fdcaa9796d5a90… 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 October 2018