Commits May 2020

commits@gajim.org

1 participants
67 discussions

[Git][gajim/gajim][master] Fix discovering local address for file transfer
by Philipp Hörist 30 May '20

30 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55e82cc6 by lovetox at 2020-05-30T21:49:23+02:00 Fix discovering local address for file transfer Fixes #10016 - - - - - 3 changed files: - gajim/common/client.py - gajim/common/jingle_transport.py - gajim/common/modules/bytestream.py Changes: ===================================== gajim/common/client.py ===================================== @@ -129,6 +129,13 @@ class Client(ConnectionHandlers): def features(self): return self._client.features + @property + def local_address(self): + address = self._client.local_address + if address is not None: + return address.to_string().split(':')[0] + return None + def set_remove_account(self, value): # Used by the RemoveAccount Assistant to make the Client # not react to any stream errors that happen while the ===================================== gajim/common/jingle_transport.py ===================================== @@ -198,16 +198,21 @@ class JingleTransportSocks5(JingleTransport): hosts = set() local_ip_cand = [] - candidate = { - 'host': self.connection.peerhost[0], - 'candidate_id': generate_id(), - 'port': port, - 'type': 'direct', - 'jid': self.ourjid, - 'priority': priority - } - hosts.add(self.connection.peerhost[0]) - local_ip_cand.append(candidate) + my_ip = self.connection.local_address + if my_ip is None: + log.warning('No local address available') + + else: + candidate = { + 'host': my_ip, + 'candidate_id': generate_id(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority + } + hosts.add(my_ip) + local_ip_cand.append(candidate) try: for addrinfo in socket.getaddrinfo(socket.gethostname(), None): ===================================== gajim/common/modules/bytestream.py ===================================== @@ -303,9 +303,15 @@ class Bytestream(BaseModule): self._account, 'ft_send_local_ips'): return + + my_ip = self._con.local_address + if my_ip is None: + log.warning('No local address available') + return + try: # The ip we're connected to server with - my_ips = [self._con.peerhost[0]] + my_ips = [my_ip] # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): if (not addr[4][0] in my_ips and @@ -333,12 +339,12 @@ class Bytestream(BaseModule): self._add_streamhosts_to_query(query, sender, port, add_hosts) def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): - if not app.is_installed('UPNP'): + my_ip = self._con.local_address + if my_ip is None or not app.is_installed('UPNP'): + log.warning('No local address available') self._con.connection.send(iq) return - my_ip = self._con.peerhost[0] - # check if we are connected with an IPv4 address try: socket.inet_aton(my_ip) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55e82cc6e5b0b0ba820f7834862c52d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55e82cc6e5b0b0ba820f7834862c52d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Server Info: Remove list header
by Philipp Hörist 30 May '20

30 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 69a0456d by André Apitzsch at 2020-05-30T20:32:30+02:00 Server Info: Remove list header Information is already provided by tab title. - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -78,7 +78,6 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): self.feature_listbox = Gtk.ListBox() self.feature_listbox.set_name('ServerInfo') self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self.feature_listbox.set_header_func(self.header_func, 'Features') self._ui.features_scrolled.add(self.feature_listbox) for feature in self.get_features(): self.add_feature(feature) @@ -90,15 +89,6 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): if event.keyval == Gdk.KEY_Escape: self.destroy() - @staticmethod - def header_func(row, before, user_data): - if before: - row.set_header(None) - else: - label = Gtk.Label(label=user_data) - label.set_halign(Gtk.Align.START) - row.set_header(label) - def _add_connection_info(self): # Connection type client = app.connections[self.account].connection View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/69a0456dfcf33c6a797ff3b3977ef851… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/69a0456dfcf33c6a797ff3b3977ef851… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Feature: Remove list header
by Philipp Hörist 30 May '20

30 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e096557e by André Apitzsch at 2020-05-30T11:49:22+02:00 Feature: Remove list header Information is already provided by window title. - - - - - 1 changed file: - gajim/gtk/features.py Changes: ===================================== gajim/gtk/features.py ===================================== @@ -48,7 +48,6 @@ class Features(Gtk.ApplicationWindow): self.feature_listbox = Gtk.ListBox() self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self.feature_listbox.set_header_func(self._header_func, _('Features')) grid.attach(self.feature_listbox, 0, 0, 1, 1) @@ -65,15 +64,6 @@ class Features(Gtk.ApplicationWindow): self.show_all() - @staticmethod - def _header_func(row, before, user_data): - if before: - row.set_header(None) - else: - label = Gtk.Label(label=user_data) - label.set_halign(Gtk.Align.START) - row.set_header(label) - def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e096557ec3755fad047b5df232a600d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e096557ec3755fad047b5df232a600d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Feature: Fix keyring availability check
by Philipp Hörist 30 May '20

30 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 07fc1dfa by André at 2020-05-30T11:49:07+02:00 Feature: Fix keyring availability check - - - - - 1 changed file: - gajim/gtk/features.py Changes: ===================================== gajim/gtk/features.py ===================================== @@ -23,7 +23,6 @@ import os import sys from collections import namedtuple -import gi from gi.repository import Gtk from gi.repository import Gdk @@ -137,11 +136,10 @@ class Features(Gtk.ApplicationWindow): 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)'), + _('Requires: gnome-keyring or kwallet'), _('Windows Credential Vault is used for secure password ' 'storage'), - None), + app.config.get('use_keyring')), Feature(_('Spell Checker'), app.is_installed('GSPELL'), _('Enables Gajim to spell check your messages while ' @@ -160,14 +158,9 @@ class Features(Gtk.ApplicationWindow): @staticmethod def _some_keyring_available(): - if os.name == 'nt': - return True - try: - gi.require_version('Secret', '1') - from gi.repository import Secret # pylint: disable=unused-import - except (ValueError, ImportError): - return False - return True + import keyring + backends = keyring.backend.get_all_keyring() + return any(keyring.core.recommended(backend) for backend in backends) @staticmethod def _idle_available(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07fc1dfa0d7c60baba91b9fda691a12f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07fc1dfa0d7c60baba91b9fda691a12f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Expose local address
by Philipp Hörist 30 May '20

30 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: fe0542ee by lovetox at 2020-05-30T11:47:17+02:00 Client: Expose local address - - - - - 3 changed files: - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/tcp.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -112,6 +112,7 @@ class Client(Observable): self._peer_certificate_errors = None self._con = None + self._local_address = None self._mode = Mode.CLIENT self._ping_source_id = None @@ -237,6 +238,10 @@ class Client(Observable): self.state = state self._xmpp_state_machine() + @property + def local_address(self): + return self._local_address + @property def connection_types(self): return list(self._allowed_con_types or [ConnectionType.DIRECT_TLS, @@ -411,8 +416,9 @@ class Client(Observable): # Alias for backwards compat return self.send_stanza(stanza) - def _on_connected(self, _connection, _signal_name): + def _on_connected(self, connection, _signal_name): self.set_state(StreamState.CONNECTED) + self._local_address = connection.local_address def _on_disconnected(self, _connection, _signal_name): self.state = StreamState.DISCONNECTED ===================================== nbxmpp/connection.py ===================================== @@ -53,6 +53,7 @@ class Connection(Observable): self._client_cert = client_cert self._address = address + self._local_address = None self._state = None self._state = TCPState.DISCONNECTED @@ -63,6 +64,10 @@ class Connection(Observable): self._ignore_tls_errors = ignore_tls_errors self._ignored_tls_errors = ignored_tls_errors + @property + def local_address(self): + return self._local_address + @property def peer_certificate(self): return (self._peer_certificate, self._peer_certificate_errors) ===================================== nbxmpp/tcp.py ===================================== @@ -127,6 +127,8 @@ class TCPConnection(Connection): self._con.set_graceful_disconnect(True) self._con.get_socket().set_keepalive(True) + self._local_address = self._con.get_local_address() + self.state = TCPState.CONNECTED use_proxy = self._address.proxy is not None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/fe0542eedee09a2902c45034… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/fe0542eedee09a2902c45034… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve shortcut behaviour on MacOS
by Philipp Hörist 28 May '20

28 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e6df65e by André Apitzsch at 2020-05-28T22:43:55+02:00 Improve shortcut behaviour on MacOS Part of #8787. - - - - - 2 changed files: - gajim/application.py - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/application.py ===================================== @@ -568,12 +568,10 @@ class GajimApplication(Gtk.Application): 'win.close-tab': ['<Control>w'], 'win.move-tab-up': ['<Control><Shift>Page_Up'], 'win.move-tab-down': ['<Control><Shift>Page_Down'], - 'win.switch-next-tab': ['<Alt>Right'], - 'win.switch-prev-tab': ['<Alt>Left'], - 'win.switch-next-unread-tab-right': ['<Control>Tab', - '<Control>Page_Down'], - 'win.switch-next-unread-tab-left': ['<Control>ISO_Left_Tab', - '<Control>Page_Up'], + 'win.switch-next-tab': ['<Control>Page_Down'], + 'win.switch-prev-tab': ['<Control>Page_Up'], + 'win.switch-next-unread-tab-right': ['<Control>Tab'], + 'win.switch-next-unread-tab-left': ['<Control>ISO_Left_Tab'], 'win.switch-tab-1': ['<Alt>1', '<Alt>KP_1'], 'win.switch-tab-2': ['<Alt>2', '<Alt>KP_2'], 'win.switch-tab-3': ['<Alt>3', '<Alt>KP_3'], ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -116,14 +116,14 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><alt>Left <ctrl>Page_Up</property> + <property name="accelerator"><ctrl>Page_Up</property> <property name="title" translatable="yes">Switch to the previous tab</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><alt>Right <ctrl>Page_Down</property> + <property name="accelerator"><ctrl>Page_Down</property> <property name="title" translatable="yes">Switch to the next tab</property> </object> </child> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e6df65eb84a78d981b5461942944ac3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e6df65eb84a78d981b5461942944ac3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor idle status
by Philipp Hörist 28 May '20

28 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 25b8fd98 by lovetox at 2020-05-28T22:31:07+02:00 Refactor idle status - - - - - 6d445bd1 by lovetox at 2020-05-28T22:33:31+02:00 Caps: Fix EntityCapsTask precondition check - - - - - 13 changed files: - gajim/application.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/idle.py - gajim/common/modules/caps.py - gajim/common/modules/muc.py - gajim/common/modules/vcard_avatars.py - gajim/gui_interface.py - gajim/roster_window.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/application.py ===================================== @@ -173,8 +173,6 @@ class GajimApplication(Gtk.Application): self.connect('command-line', self._handle_remote_options) self.connect('startup', self._startup) self.connect('activate', self._activate) - if sys.platform not in ('win32', 'darwin'): - self.connect("notify::screensaver-active", self._screensaver_active) self.interface = None @@ -604,46 +602,3 @@ class GajimApplication(Gtk.Application): elif event.feature == Namespace.BLOCKING: action = '%s-blocking' % event.account self.lookup_action(action).set_enabled(True) - - def _screensaver_active(self, _application, _param): - '''Signal handler for screensaver active change''' - - active = self.get_property('screensaver-active') - - roster = app.interface.roster - - if not active: - for account in app.connections: - if app.account_is_available(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_available(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' ===================================== gajim/common/app.py ===================================== @@ -118,15 +118,6 @@ block_signed_in_notifications = {} # type: Dict[str, bool] # type of each connection (ssl, tls, tcp, ...) con_types = {} # type: Dict[str, Optional[str]] -# whether we pass auto away / xa or not -#'off': don't use sleeper for this account -#'online': online and use sleeper -#'autoaway': autoaway and use sleeper -#'autoxa': autoxa and use sleeper -sleeper_state = {} # type: Dict[str, str] - -status_before_autoaway = {} # type: Dict[str, str] - proxy65_manager = None cert_store = None ===================================== gajim/common/client.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import sys import logging import nbxmpp @@ -34,6 +35,8 @@ from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource from gajim.common.helpers import get_ignored_ssl_errors +from gajim.common.helpers import get_idle_status_message +from gajim.common.idle import Monitor from gajim.common.i18n import _ from gajim.common.connection_handlers import ConnectionHandlers @@ -68,6 +71,9 @@ class Client(ConnectionHandlers): self._state = ClientState.DISCONNECTED self._status = 'online' self._status_message = '' + self._idle_status = 'online' + self._idle_status_enabled = True + self._idle_status_message = '' self._reconnect = True self._reconnect_timer_source = None @@ -84,6 +90,13 @@ class Client(ConnectionHandlers): self._create_client() + self._idle_handler_id = Monitor.connect('state-changed', + self._idle_state_changed) + + if sys.platform not in ('win32', 'darwin'): + self._screensaver_handler_id = app.app.connect( + 'notify::screensaver-active', self._screensaver_state_changed) + ConnectionHandlers.__init__(self) def _set_state(self, state): @@ -100,6 +113,8 @@ class Client(ConnectionHandlers): @property def status_message(self): + if self._idle_status_active(): + return self._idle_status_message return self._status_message @property @@ -328,13 +343,15 @@ class Client(ConnectionHandlers): # This returns the bare jid return nbxmpp.JID(app.get_jid_from_account(self._account)) - def change_status(self, show, msg, auto=False): - if not msg: - msg = '' + def change_status(self, show, message): + if not message: + message = '' + + self._idle_status_enabled = show == 'online' + self._status_message = message if show != 'offline': self._status = show - self._status_message = msg if self._state.is_disconnecting: log.warning('Can\'t change status while ' @@ -367,7 +384,7 @@ class Client(ConnectionHandlers): if show == 'offline': presence = self.get_module('Presence').get_presence( typ='unavailable', - status=msg, + status=message, caps=False) self.send_stanza(presence) @@ -376,18 +393,21 @@ class Client(ConnectionHandlers): destroy_client=True) return - self._priority = app.get_priority(self._account, show) + self.update_presence() + def update_presence(self): + status, message, idle = self.get_presence_state() + self._priority = app.get_priority(self._account, status) self.get_module('Presence').send_presence( priority=self._priority, - show=show, - status=msg, - idle_time=auto) + show=status, + status=message, + idle_time=idle) - self.get_module('MUC').update_presence(auto=auto) + self.get_module('MUC').update_presence() app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show=show)) + OurShowEvent(None, conn=self, show=status)) def get_module(self, name): return modules.get(self._account, name) @@ -407,10 +427,13 @@ class Client(ConnectionHandlers): def _send_first_presence(self): self._priority = app.get_priority(self._account, self._status) + self._status, message, idle = self.get_presence_state() + self.get_module('Presence').send_presence( priority=self._priority, show=self._status, - status=self._status_message) + status=message, + idle_time=idle) self._set_client_available() @@ -507,12 +530,6 @@ class Client(ConnectionHandlers): def _schedule_reconnect(self): self._set_state(ClientState.RECONNECT_SCHEDULED) - if app.status_before_autoaway[self._account]: - # We were auto away. So go back online - self._status_message = app.status_before_autoaway[self._account] - app.status_before_autoaway[self._account] = '' - self._status = 'online' - log.info("Reconnect to %s in 3s", self._account) self._reconnect_timer_source = GLib.timeout_add_seconds( 3, self.connect) @@ -534,8 +551,53 @@ class Client(ConnectionHandlers): GLib.source_remove(self._reconnect_timer_source) self._reconnect_timer_source = None + def _idle_state_changed(self, monitor): + state = monitor.state.value + + if monitor.is_awake(): + self._idle_status = state + self._idle_status_message = '' + if self._state.is_available and self._idle_status_enabled: + self._status = state + self.update_presence() + return + + if not app.config.get(f'auto{state}'): + return + + if (state in ('away', 'xa') and self._status == 'online' or + state == 'xa' and self._idle_status == 'away'): + + self._idle_status = state + self._idle_status_message = get_idle_status_message( + state, self._status_message) + if self._state.is_available and self._idle_status_enabled: + self._status = state + self.update_presence() + + def _idle_status_active(self): + if not Monitor.is_available(): + return False + + if not self._idle_status_enabled: + return False + + return self._idle_status != 'online' + + def get_presence_state(self): + if self._idle_status_active(): + return self._idle_status, self._idle_status_message, True + return self._status, self._status_message, False + + @staticmethod + def _screensaver_state_changed(application, _param): + active = application.get_property('screensaver-active') + Monitor.set_extended_away(active) + def cleanup(self): self._destroyed = True + Monitor.disconnect(self._idle_handler_id) + app.app.disconnect(self._screensaver_handler_id) if self._client is not None: # cleanup() is called before nbmxpp.Client has disconnected, # when we disable the account. So we need to unregister ===================================== gajim/common/config.py ===================================== @@ -213,7 +213,6 @@ class Config: 'scroll_roster_to_last_message': [opt_bool, True, _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], - 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', _('Valid URI schemes. Only schemes in this list will be accepted as \'real\' URI (mailto and xmpp are handled separately).'), True], 'shell_like_completion': [opt_bool, False, _('If enabled, completion in group chats will be like a shell auto-completion.')], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], ===================================== gajim/common/const.py ===================================== @@ -120,11 +120,11 @@ class ButtonAction(Enum): SUGGESTED = 'suggested-action' @unique -class IdleState(IntEnum): - UNKNOWN = 0 - XA = 1 - AWAY = 2 - AWAKE = 3 +class IdleState(Enum): + UNKNOWN = 'unknown' + XA = 'xa' + AWAY = 'away' + AWAKE = 'online' @unique ===================================== gajim/common/helpers.py ===================================== @@ -1659,3 +1659,17 @@ def get_ignored_ssl_errors(account): ignore_ssl_errors = app.config.get_per( 'accounts', account, 'ignore_ssl_errors').split() return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} + + +def get_idle_status_message(state, status_message): + message = app.config.get(f'auto{state}_message') + if not message: + message = status_message + else: + message = message.replace('$S', '%(status)s') + message = message.replace('$T', '%(time)s') + message = message % { + 'status': status_message, + 'time': app.config.get(f'auto{state}time') + } + return message ===================================== gajim/common/idle.py ===================================== @@ -26,6 +26,7 @@ import ctypes.util import logging from gi.repository import Gio from gi.repository import GLib +from gi.repository import GObject from gajim.common.const import IdleState @@ -36,6 +37,7 @@ class DBusGnomeIdleMonitor: def __init__(self): self.last_idle_time = 0 + self._extended_away = False log.debug('Connecting to D-Bus') self.dbus_gnome_proxy = Gio.DBusProxy.new_for_bus_sync( @@ -75,13 +77,18 @@ class DBusGnomeIdleMonitor: return self.last_idle_time + def set_extended_away(self, state): + self._extended_away = state + def is_extended_away(self): - return False + return self._extended_away class XssIdleMonitor: def __init__(self): + self._extended_away = False + class XScreenSaverInfo(ctypes.Structure): _fields_ = [ ('window', ctypes.c_ulong), @@ -140,6 +147,9 @@ class XssIdleMonitor: return info return int(self.xss_info_p.contents.idle / 1000) + def set_extended_away(self, state): + self._extended_away = state + def is_extended_away(self): return False @@ -193,18 +203,33 @@ class WindowsIdleMonitor: return True -class IdleMonitor: +class IdleMonitor(GObject.GObject): + + __gsignals__ = { + 'state-changed': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, # return value + () # arguments + )} + def __init__(self): + GObject.GObject.__init__(self) self.set_interval() self._state = IdleState.AWAKE self._idle_monitor = self._get_idle_monitor() + if self.is_available(): + GLib.timeout_add_seconds(1, self._poll) + def set_interval(self, away_interval=60, xa_interval=120): log.info('Set interval: away: %s, xa: %s', away_interval, xa_interval) self._away_interval = away_interval self._xa_interval = xa_interval + def set_extended_away(self, state): + self._idle_monitor.set_extended_away(state) + def is_available(self): return self._idle_monitor is not None @@ -226,7 +251,8 @@ class IdleMonitor: def is_unknown(self): return self.state == IdleState.UNKNOWN - def _get_idle_monitor(self): + @staticmethod + def _get_idle_monitor(): if sys.platform == 'win32': return WindowsIdleMonitor() @@ -244,28 +270,33 @@ class IdleMonitor: def get_idle_sec(self): return self._idle_monitor.get_idle_sec() - def poll(self): + def _poll(self): """ Check to see if we should change state """ - if not self.is_available(): - return False - if self._idle_monitor.is_extended_away(): log.info('Extended Away: Screensaver or Locked Screen') - self._state = IdleState.XA + self._set_state(IdleState.XA) return True idle_time = self.get_idle_sec() # xa is stronger than away so check for xa first if idle_time > self._xa_interval: - self._state = IdleState.XA + self._set_state(IdleState.XA) elif idle_time > self._away_interval: - self._state = IdleState.AWAY + self._set_state(IdleState.AWAY) else: - self._state = IdleState.AWAKE + self._set_state(IdleState.AWAKE) return True + def _set_state(self, state): + if self._state == state: + return + + self._state = state + log.info('State changed: %s', state) + self.emit('state-changed') + Monitor = IdleMonitor() ===================================== gajim/common/modules/caps.py ===================================== @@ -214,7 +214,6 @@ class EntityCapsTask(Task): if muc is None or not muc.state.is_joined: self.set_obsolete() return False - return True return client.state.is_available ===================================== gajim/common/modules/muc.py ===================================== @@ -297,21 +297,24 @@ class MUC(BaseModule): account=self._account, room_jid=result.jid)) - def update_presence(self, auto=False): + def update_presence(self): mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, MUCJoinedState.JOINING]) + + status, message, idle = self._con.get_presence_state() for muc_data in mucs: self._con.get_module('Presence').send_presence( muc_data.occupant_jid, - show=self._con.status, - status=self._con.status_message, - idle_time=auto) + show=status, + status=message, + idle_time=idle) def change_nick(self, room_jid, new_nick): + status, message, _idle = self._con.get_presence_state() self._con.get_module('Presence').send_presence( '%s/%s' % (room_jid, new_nick), - show=self._con.status, - status=self._con.status_message) + show=status, + status=message) def _on_error_presence(self, _con, _stanza, properties): room_jid = properties.jid.getBare() ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -220,11 +220,7 @@ class VCardAvatars(BaseModule): self._log.debug('Avatar already advertised') return - self._con.get_module('Presence').send_presence( - priority=self._con.priority, - show=self._con.status, - status=self._con.status_message) - + self._con.update_presence() self.avatar_advertised = True def add_update_node(self, node): ===================================== gajim/gui_interface.py ===================================== @@ -823,16 +823,6 @@ class Interface: pep_supported = obj.conn.get_module('PEP').supported - if not idle.Monitor.is_unknown() and obj.conn.status in ('online', 'chat'): - # we go online or free for chat, so we activate auto status - app.sleeper_state[account] = 'online' - elif not ((idle.Monitor.is_away() and obj.conn.status == 'away') or \ - (idle.Monitor.is_xa() and obj.conn.status == 'xa')): - # If we are autoaway/xa and come back after a disconnection, do - # nothing - # Else disable autoaway - app.sleeper_state[account] = 'off' - if obj.conn.get_module('MAM').available: obj.conn.get_module('MAM').request_archive_on_signin() @@ -1535,77 +1525,6 @@ class Interface: ### Other Methods ################################################################################ - def read_sleepy(self): - """ - Check idle status and change that status if needed - """ - if not idle.Monitor.poll(): - # idle detection is not supported in that OS - return False # stop looping in vain - - for account in app.connections: - if account not in app.sleeper_state or \ - not app.sleeper_state[account]: - continue - if idle.Monitor.is_awake(): - if app.sleeper_state[account] in ('autoaway', 'autoxa'): - # we go online - self.roster.send_status(account, 'online', - app.status_before_autoaway[account]) - app.status_before_autoaway[account] = '' - app.sleeper_state[account] = 'online' - if app.sleeper_state[account] == 'idle': - # we go to the previous state - status = app.connections[account].status - self.roster.send_status(account, status, - app.status_before_autoaway[account]) - app.status_before_autoaway[account] = '' - app.sleeper_state[account] = 'off' - elif idle.Monitor.is_away() and app.config.get('autoaway'): - if app.sleeper_state[account] == 'online': - # we save out online status - app.status_before_autoaway[account] = \ - app.connections[account].status_message - # 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('autoawaytime') - } - self.roster.send_status(account, 'away', auto_message, - auto=True) - app.sleeper_state[account] = 'autoaway' - elif app.sleeper_state[account] == 'off': - # we save out online status - app.status_before_autoaway[account] = \ - app.connections[account].status - status = app.connections[account].status - self.roster.send_status(account, status, - app.status_before_autoaway[account], auto=True) - app.sleeper_state[account] = 'idle' - elif idle.Monitor.is_xa() and \ - app.sleeper_state[account] in ('online', 'autoaway', - 'autoaway-forced') and app.config.get('autoxa'): - # we go extended away [we pass True to auto param] - auto_message = app.config.get('autoxa_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') - } - self.roster.send_status(account, 'xa', auto_message, auto=True) - app.sleeper_state[account] = 'autoxa' - return True # renew timeout (loop for ever) - @staticmethod def create_account(account, username, @@ -1685,9 +1604,7 @@ class Interface: app.nicks[account] = app.config.get_per( 'accounts', account, 'name') app.block_signed_in_notifications[account] = True - app.sleeper_state[account] = 'off' app.last_message_time[account] = {} - app.status_before_autoaway[account] = '' # refresh roster if len(app.connections) >= 2: # Do not merge accounts if only one exists @@ -1727,9 +1644,7 @@ class Interface: del app.automatic_rooms[account] del app.to_be_removed[account] del app.newly_added[account] - del app.sleeper_state[account] del app.last_message_time[account] - del app.status_before_autoaway[account] if len(app.connections) >= 2: # Do not merge accounts if only one exists self.roster.regroup = app.config.get('mergeaccounts') @@ -1980,8 +1895,6 @@ class Interface: GLib.timeout_add_seconds(timeout, self.process_connections) else: GLib.timeout_add(timeout, self.process_connections) - GLib.timeout_add_seconds(app.config.get( - 'check_idle_every_foo_seconds'), self.read_sleepy) def remote_init(): if app.config.get('remote_control'): @@ -2107,9 +2020,7 @@ class Interface: app.to_be_removed[a] = [] app.nicks[a] = app.config.get_per('accounts', a, 'name') app.block_signed_in_notifications[a] = True - app.sleeper_state[a] = 0 app.last_message_time[a] = {} - app.status_before_autoaway[a] = '' if sys.platform not in ('win32', 'darwin'): logind.enable() ===================================== gajim/roster_window.py ===================================== @@ -52,7 +52,6 @@ from gajim import gui_menu_builder from gajim.common import app from gajim.common import helpers -from gajim.common import idle from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n from gajim.common.helpers import save_roster_position @@ -2058,7 +2057,7 @@ class RosterWindow: def set_connecting_state(self, account): self.set_state(account, 'connecting') - def send_status(self, account, status, txt, auto=False): + def send_status(self, account, status, txt): if status != 'offline': app.config.set_per('accounts', account, 'last_status', status) app.config.set_per('accounts', account, 'last_status_msg', @@ -2066,7 +2065,7 @@ class RosterWindow: if not app.account_is_available(account): self.set_connecting_state(account) - self.send_status_continue(account, status, txt, auto) + self.send_status_continue(account, status, txt) def send_pep(self, account, pep_dict): connection = app.connections[account] @@ -2101,18 +2100,11 @@ class RosterWindow: if ctrl: ctrl.update_all_pep_types() - def send_status_continue(self, account, status, txt, auto): - if app.account_is_available(account): - if status == 'online' and not idle.Monitor.is_unknown(): - app.sleeper_state[account] = 'online' - elif app.sleeper_state[account] not in ('autoaway', 'autoxa') or \ - status == 'offline': - app.sleeper_state[account] = 'off' - + def send_status_continue(self, account, status, txt): if status == 'offline': self.delete_pep(app.get_jid_from_account(account), account) - app.connections[account].change_status(status, txt, auto) + app.connections[account].change_status(status, txt) def chg_contact_status(self, contact, show, status, account): """ ===================================== test/lib/gajim_mocks.py ===================================== @@ -34,9 +34,7 @@ class MockConnection(Mock, ConnectionHandlers): app.to_be_removed[account] = [] app.nicks[account] = app.config.get_per('accounts', account, 'name') app.block_signed_in_notifications[account] = True - app.sleeper_state[account] = 0 app.last_message_time[account] = {} - app.status_before_autoaway[account] = '' app.connections[account] = self View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f7c0f2d3f98b7b4d5be7c6254731ac4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f7c0f2d3f98b7b4d5be7c6254731ac4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Change look of DND status
by Philipp Hörist 27 May '20

27 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1cff6a34 by lovetox at 2020-05-27T22:26:49+02:00 Change look of DND status - - - - - f7c0f2d3 by lovetox at 2020-05-27T22:26:49+02:00 Change color of XA status - - - - - 2 changed files: - gajim/gtk/avatar.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -97,22 +97,35 @@ def add_status_to_avatar(surface, show): width = width / scale height = height / scale - clip_size = width / 6.5 + clip_radius = width / 5.5 + center_x = width - clip_radius + center_y = height - clip_radius + context.set_source_rgb(255, 255, 255) context.set_operator(cairo.Operator.CLEAR) - context.arc(width - clip_size, height - clip_size, clip_size, 0, 2 * pi) + context.arc(center_x, center_y, clip_radius, 0, 2 * pi) context.fill() css_color = get_css_show_class(show) color = convert_rgb_string_to_float( app.css_config.get_value(css_color, StyleAttr.COLOR)) - show_size = width / 6.5 - show_radius = show_size * 0.80 + + show_radius = clip_radius * 0.75 + context.set_source_rgb(*color) context.set_operator(cairo.Operator.OVER) - context.arc(width - show_size, height - show_size, show_radius, 0, 2 * pi) + context.arc(center_x, center_y, show_radius, 0, 2 * pi) context.fill() + if show == 'dnd': + line_length = clip_radius / 2 + context.move_to(center_x - line_length, center_y) + context.line_to(center_x + line_length, center_y) + + context.set_source_rgb(255, 255, 255) + context.set_line_width(clip_radius / 4) + context.stroke() + return context.get_target() ===================================== gajim/gtk/util.py ===================================== @@ -677,9 +677,9 @@ def generate_account_badge(account): def get_css_show_class(show): if show in ('online', 'chat'): return '.gajim-status-online' - if show in ('away', 'xa'): + if show == 'away': return '.gajim-status-away' - if show == 'dnd': + if show in ('dnd', 'xa'): return '.gajim-status-dnd' # 'offline', 'not in roster', 'requested' return '.gajim-status-offline' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/12d9b099057ce56bd694eb8345c4e32… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/12d9b099057ce56bd694eb8345c4e32… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Add None check
by Philipp Hörist 26 May '20

26 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ab9c8f04 by lovetox at 2020-05-26T22:26:04+02:00 MUC: Add None check - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -161,7 +161,8 @@ class MUC(BaseModule): self._log.warning(stanza) raise NodeProcessed - if (properties.muc_user.role.is_none and + if (properties.muc_user is not None and + properties.muc_user.role.is_none and not properties.type.is_unavailable): self._log.warning('Malformed Stanza') self._log.warning(stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ab9c8f040aec946386f6c876… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ab9c8f040aec946386f6c876… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Add check for another case of malformed presence
by Philipp Hörist 26 May '20

26 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 123d35d6 by lovetox at 2020-05-26T22:24:20+02:00 MUC: Add check for another case of malformed presence - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -161,6 +161,12 @@ class MUC(BaseModule): self._log.warning(stanza) raise NodeProcessed + if (properties.muc_user.role.is_none and + not properties.type.is_unavailable): + self._log.warning('Malformed Stanza') + self._log.warning(stanza) + raise NodeProcessed + def _process_groupchat_message(self, _client, stanza, properties): properties.from_muc = True properties.muc_jid = properties.jid.copy() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/123d35d638b72ba7314ce0ee… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/123d35d638b72ba7314ce0ee… 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 May 2020