Commits January 2019

commits@gajim.org

1 participants
85 discussions

[Git][gajim/gajim][master] 2 commits: Dont fail on users leaving a group chat
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 633795b7 by Philipp Hörist at 2019-01-05T18:17:34Z Dont fail on users leaving a group chat Fixes #9527 - - - - - 19c45510 by Philipp Hörist at 2019-01-05T18:17:34Z MUC: Fix printing status/show - rename config values to something more appropriate - - - - - 4 changed files: - gajim/common/config.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/config.py ===================================== @@ -235,8 +235,8 @@ class Config: 'show_location_in_roster': [opt_bool, True, '', True], 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes their status and/or their status message.')], - 'print_join_leave_in_mucs': [opt_bool, False, _('Default Setting: Show a status message for every join or leave in a group chat')], - 'print_status_in_mucs': [opt_bool, False, _('Default Setting: Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], + 'print_join_left_default': [opt_bool, False, _('Default Setting: Show a status message for every join or leave in a group chat')], + 'print_status_muc_default': [opt_bool, False, _('Default Setting: Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'restored_messages_small': [opt_bool, True, _('If true, restored messages will use a smaller font than the default one.')], ===================================== gajim/common/modules/muc.py ===================================== @@ -226,10 +226,16 @@ class MUC: # handled by the opened ChatControl break - # We remove the contact from the MUC, but there could be - # a PrivateChatControl open, so we update the contacts presence - contact.presence = properties.type - app.contacts.remove_gc_contact(self._account, contact) + if contact is None: + # If contact is None, its probably that a user left from a not + # insync MUC, can happen on older servers + log.warning('Unknown contact left groupchat: %s', + properties.jid) + else: + # We remove the contact from the MUC, but there could be + # a PrivateChatControl open, so we update the contacts presence + contact.presence = properties.type + app.contacts.remove_gc_contact(self._account, contact) log.info('User %s left', properties.jid) self._raise_muc_event('muc-user-left', properties) raise nbxmpp.NodeProcessed ===================================== gajim/groupchat_control.py ===================================== @@ -397,7 +397,7 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_notify_on_all_messages) self.parent_win.window.add_action(act) - status_default = app.config.get('print_status_in_mucs') + status_default = app.config.get('print_status_muc_default') value = app.config.get_per('rooms', self.contact.jid, 'print_status', status_default) @@ -407,7 +407,7 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_print_status) self.parent_win.window.add_action(act) - join_default = app.config.get('print_join_leave_in_mucs') + join_default = app.config.get('print_join_left_default') value = app.config.get_per('rooms', self.contact.jid, 'print_join_left', join_default) @@ -2008,8 +2008,9 @@ class GroupchatControl(ChatControlBase): #Group Chat: We have been removed from the room message = _('{nick} has been removed from the room{by}{reason}') + join_default = app.config.get('print_join_left_default') print_join_left = app.config.get_per( - 'rooms', self.room_jid, 'print_join_left') + 'rooms', self.room_jid, 'print_join_left', join_default) if StatusCode.REMOVED_ERROR in status_codes: # Handle 333 before 307, some MUCs add both @@ -2060,8 +2061,9 @@ class GroupchatControl(ChatControlBase): return nick = event.properties.muc_nickname + join_default = app.config.get('print_join_left_default') print_join_left = app.config.get_per( - 'rooms', self.room_jid, 'print_join_left') + 'rooms', self.room_jid, 'print_join_left', join_default) self.add_contact_to_roster(nick) ===================================== gajim/gtk/preferences.py ===================================== @@ -161,10 +161,10 @@ class Preferences(Gtk.ApplicationWindow): self._ui.sync_threshold_combobox.set_id_column(0) self._ui.sync_threshold_combobox.set_active_id(str(public_threshold)) - st = app.config.get('print_join_leave_in_mucs') + st = app.config.get('print_join_left_default') self._ui.join_leave_checkbutton.set_active(st) - st = app.config.get('print_status_in_mucs') + st = app.config.get('print_status_muc_default') self._ui.status_change_checkbutton.set_active(st) # Displayed chat state notifications @@ -620,10 +620,10 @@ class Preferences(Gtk.ApplicationWindow): app.config.set('public_room_sync_threshold', int(active)) def _on_join_leave_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'print_join_leave_in_mucs') + self.on_checkbutton_toggled(widget, 'print_join_left_default') def _on_status_change_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'print_status_in_mucs') + self.on_checkbutton_toggled(widget, 'print_status_muc_default') def on_show_chatstate_in_tabs_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_chatstate_in_tabs') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a91f5f2c4914b597c9833894c8a31c6ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a91f5f2c4914b597c9833894c8a31c6ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Bonjour (pybonjour) on macOS
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a91f5f2c by Sebastiaan Lokhorst at 2019-01-05T17:37:09Z Fix Bonjour (pybonjour) on macOS - - - - - 2 changed files: - README.md - gajim/common/app.py Changes: ===================================== README.md ===================================== @@ -17,7 +17,7 @@ - python3-pil (pillow) for support of webp avatars - python3-gnupg to enable GPG encryption -- For zeroconf (bonjour) you need python3-dbus +- For zeroconf you need python3-dbus on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working ===================================== gajim/common/app.py ===================================== @@ -220,12 +220,14 @@ def detect_dependencies(): # ZEROCONF try: - if os.name == 'nt': - import pybonjour # pylint: disable=unused-variable - _dependencies['PYBONJOUR'] = True - else: - import dbus # pylint: disable=unused-variable - _dependencies['PYTHON-DBUS'] = True + import pybonjour # pylint: disable=unused-variable + _dependencies['PYBONJOUR'] = True + except Exception: + pass + + try: + import dbus # pylint: disable=unused-variable + _dependencies['PYTHON-DBUS'] = True except Exception: pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a91f5f2c4914b597c9833894c8a31c6ba0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a91f5f2c4914b597c9833894c8a31c6ba0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bump copyright year
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 468d8bd4 by André Apitzsch at 2019-01-05T16:35:00Z Bump copyright year - - - - - 5 changed files: - README.md - data/gajim-history-manager.1 - data/gajim-remote.1 - data/gajim.1 - gajim/gtk/about.py Changes: ===================================== README.md ===================================== @@ -86,7 +86,7 @@ Execute gajim with --verbose That is all, **enjoy**! -(C) 2003-2018 +(C) 2003-2019 The Gajim Team [https://gajim.org](https://gajim.org) ===================================== data/gajim-history-manager.1 ===================================== @@ -46,7 +46,7 @@ and .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2018 Gajim Team +Copyright (C) 2003-2019 Gajim Team .Pp .Nm 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. ===================================== data/gajim-remote.1 ===================================== @@ -89,7 +89,7 @@ and .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2018 Gajim Team +Copyright (C) 2003-2019 Gajim Team .Pp .Nm 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. ===================================== data/gajim.1 ===================================== @@ -93,7 +93,7 @@ and with contributions and patches merged from many individuals around the world. See the About Dialog for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2018 Gajim Team +Copyright (C) 2003-2019 Gajim Team .Pp .Nm 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/gtk/about.py ===================================== @@ -33,7 +33,7 @@ class AboutDialog(Gtk.AboutDialog): self.set_transient_for(app.interface.roster.window) self.set_name('Gajim') self.set_version(app.version) - self.set_copyright('Copyright © 2003-2018 Gajim Team') + self.set_copyright('Copyright © 2003-2019 Gajim Team') self.set_license_type(Gtk.License.GPL_3_0_ONLY) self.set_website('https://gajim.org/') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/468d8bd4729d0204dbb4afeac6ec2843f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/468d8bd4729d0204dbb4afeac6ec2843f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove obsolete dbus plugin
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58d7096a by André Apitzsch at 2019-01-05T15:46:36Z Remove obsolete dbus plugin - - - - - 4 changed files: - − plugins/dbus_plugin/__init__.py - − plugins/dbus_plugin/dbus_plugin.png - − plugins/dbus_plugin/manifest.ini - − plugins/dbus_plugin/plugin.py Changes: ===================================== plugins/dbus_plugin/__init__.py deleted ===================================== @@ -1 +0,0 @@ -from .plugin import DBusPlugin ===================================== plugins/dbus_plugin/dbus_plugin.png deleted ===================================== Binary files a/plugins/dbus_plugin/dbus_plugin.png and /dev/null differ ===================================== plugins/dbus_plugin/manifest.ini deleted ===================================== @@ -1,10 +0,0 @@ -[info] -name: D-Bus Support -short_name: dbus -version: 0.1.1 -description: D-Bus support. Based on remote_control module from - Gajim core but uses new events handling system. -authors = Mateusz Biliński <mateusz(a)bilinski.it> -homepage = http://blog.bilinski.it - - ===================================== plugins/dbus_plugin/plugin.py deleted ===================================== @@ -1,718 +0,0 @@ -# -*- coding: utf-8 -*- - -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2006 Andrew Sayman <lorien420(a)myrealbox.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Copyright (C) 2007 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2008 Mateusz Biliński <mateusz(a)bilinski.it> -## -## 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/>. -## -''' -D-BUS Support plugin. - -Based on gajim/remote_control.py - -:author: Mateusz Biliński <mateusz(a)bilinski.it> -:since: 8th August 2008 -:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> -:license: GPL -''' -import os -# import new # depricated in python3; use types instead -import types - -import gobject - - -from gajim.common import dbus_support -if dbus_support.supported: - import dbus - if dbus_support: - INTERFACE = 'org.gajim.dbusplugin.RemoteInterface' - OBJ_PATH = '/org/gajim/dbusplugin/RemoteObject' - SERVICE = 'org.gajim.dbusplugin' - - import dbus.service - # type mapping - - # in most cases it is a utf-8 string - DBUS_STRING = dbus.String - - # general type (for use in dicts, where all values should have the same type) - DBUS_BOOLEAN = dbus.Boolean - DBUS_DOUBLE = dbus.Double - DBUS_INT32 = dbus.Int32 - # dictionary with string key and binary value - DBUS_DICT_SV = lambda : dbus.Dictionary({}, signature="sv") - # dictionary with string key and value - DBUS_DICT_SS = lambda : dbus.Dictionary({}, signature="ss") - # empty type (there is no equivalent of None on D-Bus, but historically gajim - # used 0 instead) - DBUS_NONE = lambda : dbus.Int32(0) - - def get_dbus_struct(obj): - ''' recursively go through all the items and replace - them with their casted dbus equivalents - ''' - if obj is None: - return DBUS_NONE() - if isinstance(obj, (unicode, str)): - return DBUS_STRING(obj) - if isinstance(obj, int): - return DBUS_INT32(obj) - if isinstance(obj, float): - return DBUS_DOUBLE(obj) - if isinstance(obj, bool): - return DBUS_BOOLEAN(obj) - if isinstance(obj, (list, tuple)): - result = dbus.Array([get_dbus_struct(i) for i in obj], - signature='v') - if result == []: - return DBUS_NONE() - return result - if isinstance(obj, dict): - result = DBUS_DICT_SV() - for key, value in obj.items(): - result[DBUS_STRING(key)] = get_dbus_struct(value) - if result == {}: - return DBUS_NONE() - return result - # unknown type - return DBUS_NONE() - - class SignalObject(dbus.service.Object): - ''' Local object definition for /org/gajim/dbus/RemoteObject. - (This docstring is not be visible, - because the clients can access only the remote object.)''' - - def __init__(self, bus_name): - self.first_show = True - self.vcard_account = None - - # register our dbus API - dbus.service.Object.__init__(self, bus_name, OBJ_PATH) - - @dbus.service.signal(INTERFACE, signature='av') - def Roster(self, account_and_data): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def AccountPresence(self, status_and_account): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def ContactPresence(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def ContactAbsence(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def ContactStatus(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def NewMessage(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def Subscribe(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def Subscribed(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def Unsubscribed(self, account_and_jid): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def NewAccount(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def VcardInfo(self, account_and_vcard): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def LastStatusTime(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def OsInfo(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def GCPresence(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def GCMessage(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def RosterInfo(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def NewGmail(self, account_and_array): - pass - - @dbus.service.signal(INTERFACE, signature='av') - def EntityTime(self, account_and_array): - pass - - def raise_signal(self, signal, arg): - '''raise a signal, with a single argument of unspecified type - Instead of obj.raise_signal("Foo", bar), use obj.Foo(bar).''' - getattr(self, signal)(arg) - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='s') - def get_status(self, account): - '''Returns status (show to be exact) which is the global one - unless account is given''' - if not account: - # If user did not ask for account, returns the global status - return DBUS_STRING(helpers.get_global_show()) - # return show for the given account - index = gajim.connections[account].connected - return DBUS_STRING(gajim.SHOW_LIST[index]) - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='s') - def get_status_message(self, account): - '''Returns status which is the global one - unless account is given''' - if not account: - # If user did not ask for account, returns the global status - return DBUS_STRING(str(helpers.get_global_status())) - # return show for the given account - status = gajim.connections[account].status - return DBUS_STRING(status) - - def _get_account_and_contact(self, account, jid): - '''get the account (if not given) and contact instance from jid''' - connected_account = None - contact = None - accounts = gajim.contacts.get_accounts() - # if there is only one account in roster, take it as default - # if user did not ask for account - if not account and len(accounts) == 1: - account = accounts[0] - if account: - if gajim.connections[account].connected > 1: # account is connected - connected_account = account - contact = gajim.contacts.get_contact_with_highest_priority(account, - jid) - else: - for account in accounts: - contact = gajim.contacts.get_contact_with_highest_priority(account, - jid) - if contact and gajim.connections[account].connected > 1: - # account is connected - connected_account = account - break - if not contact: - contact = jid - - return connected_account, contact - - def _get_account_for_groupchat(self, account, room_jid): - '''get the account which is connected to groupchat (if not given) - or check if the given account is connected to the groupchat''' - connected_account = None - accounts = gajim.contacts.get_accounts() - # if there is only one account in roster, take it as default - # if user did not ask for account - if not account and len(accounts) == 1: - account = accounts[0] - if account: - if gajim.connections[account].connected > 1 and \ - room_jid in gajim.gc_connected[account] and \ - gajim.gc_connected[account][room_jid]: - # account and groupchat are connected - connected_account = account - else: - for account in accounts: - if gajim.connections[account].connected > 1 and \ - room_jid in gajim.gc_connected[account] and \ - gajim.gc_connected[account][room_jid]: - # account and groupchat are connected - connected_account = account - break - return connected_account - - @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') - def send_file(self, file_path, jid, account): - '''send file, located at 'file_path' to 'jid', using account - (optional) 'account' ''' - jid = self._get_real_jid(jid, account) - connected_account, contact = self._get_account_and_contact(account, jid) - - if connected_account: - if file_path[:7] == 'file://': - file_path=file_path[7:] - if os.path.isfile(file_path): # is it file? - gajim.interface.instances['file_transfers'].send_file( - connected_account, contact, file_path) - return DBUS_BOOLEAN(True) - return DBUS_BOOLEAN(False) - - def _send_message(self, jid, message, keyID, account, type = 'chat', - subject = None): - '''can be called from send_chat_message (default when send_message) - or send_single_message''' - if not jid or not message: - return DBUS_BOOLEAN(False) - if not keyID: - keyID = '' - - connected_account, contact = self._get_account_and_contact(account, jid) - if connected_account: - connection = gajim.connections[connected_account] - connection.send_message(jid, message, keyID, type, subject) - return DBUS_BOOLEAN(True) - return DBUS_BOOLEAN(False) - - @dbus.service.method(INTERFACE, in_signature='ssss', out_signature='b') - def send_chat_message(self, jid, message, keyID, account): - '''Send chat 'message' to 'jid', using account (optional) 'account'. - if keyID is specified, encrypt the message with the PGP key ''' - jid = self._get_real_jid(jid, account) - return self._send_message(jid, message, keyID, account) - - @dbus.service.method(INTERFACE, in_signature='sssss', out_signature='b') - def send_single_message(self, jid, subject, message, keyID, account): - '''Send single 'message' to 'jid', using account (optional) 'account'. - if keyID is specified, encrypt the message with the PGP key ''' - jid = self._get_real_jid(jid, account) - return self._send_message(jid, message, keyID, account, type, subject) - - @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') - def send_groupchat_message(self, room_jid, message, account): - '''Send 'message' to groupchat 'room_jid', - using account (optional) 'account'.''' - if not room_jid or not message: - return DBUS_BOOLEAN(False) - connected_account = self._get_account_for_groupchat(account, room_jid) - if connected_account: - connection = gajim.connections[connected_account] - connection.send_gc_message(room_jid, message) - return DBUS_BOOLEAN(True) - return DBUS_BOOLEAN(False) - - @dbus.service.method(INTERFACE, in_signature='ss', out_signature='b') - def open_chat(self, jid, account): - '''Shows the tabbed window for new message to 'jid', using account - (optional) 'account' ''' - if not jid: - raise MissingArgument - return DBUS_BOOLEAN(False) - jid = self._get_real_jid(jid, account) - try: - jid = helpers.parse_jid(jid) - except Exception: - # Jid is not conform, ignore it - return DBUS_BOOLEAN(False) - - if account: - accounts = [account] - else: - accounts = gajim.connections.keys() - if len(accounts) == 1: - account = accounts[0] - connected_account = None - first_connected_acct = None - for acct in accounts: - if gajim.connections[acct].connected > 1: # account is online - contact = gajim.contacts.get_first_contact_from_jid(acct, jid) - if gajim.interface.msg_win_mgr.has_window(jid, acct): - connected_account = acct - break - # jid is in roster - elif contact: - connected_account = acct - break - # we send the message to jid not in roster, because account is - # specified, or there is only one account - elif account: - connected_account = acct - elif first_connected_acct is None: - first_connected_acct = acct - - # if jid is not a conntact, open-chat with first connected account - if connected_account is None and first_connected_acct: - connected_account = first_connected_acct - - if connected_account: - gajim.interface.new_chat_from_jid(connected_account, jid) - # preserve the 'steal focus preservation' - win = gajim.interface.msg_win_mgr.get_window(jid, - connected_account).window - if win.get_property('visible'): - win.window.present() - return DBUS_BOOLEAN(True) - return DBUS_BOOLEAN(False) - - @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') - def change_status(self, status, message, account): - ''' change_status(status, message, account). account is optional - - if not specified status is changed for all accounts. ''' - if status not in ('offline', 'online', 'chat', - 'away', 'xa', 'dnd', 'invisible'): - return DBUS_BOOLEAN(False) - if account: - gobject.idle_add(gajim.interface.roster.send_status, account, - status, message) - else: - # account not specified, so change the status of all accounts - for acc in gajim.contacts.get_accounts(): - if not gajim.config.get_per('accounts', acc, - 'sync_with_global_status'): - continue - gobject.idle_add(gajim.interface.roster.send_status, acc, - status, message) - return DBUS_BOOLEAN(False) - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def show_next_pending_event(self): - '''Show the window(s) with next pending event in tabbed/group chats.''' - if gajim.events.get_nb_events(): - gajim.interface.systray.handle_first_event() - - @dbus.service.method(INTERFACE, in_signature='', out_signature='as') - def list_accounts(self): - '''list register accounts''' - result = gajim.contacts.get_accounts() - result_array = dbus.Array([], signature='s') - if result and len(result) > 0: - for account in result: - result_array.append(DBUS_STRING(account)) - return result_array - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='a{ss}') - def account_info(self, account): - '''show info on account: resource, jid, nick, prio, message''' - result = DBUS_DICT_SS() - if account in gajim.connections: - # account is valid - con = gajim.connections[account] - index = con.connected - result['status'] = DBUS_STRING(gajim.SHOW_LIST[index]) - result['name'] = DBUS_STRING(con.name) - result['jid'] = DBUS_STRING(gajim.get_jid_from_account(con.name)) - result['message'] = DBUS_STRING(con.status) - result['priority'] = DBUS_STRING(unicode(con.priority)) - result['resource'] = DBUS_STRING(unicode(gajim.config.get_per( - 'accounts', con.name, 'resource'))) - return result - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='aa{sv}') - def list_contacts(self, account): - '''list all contacts in the roster. If the first argument is specified, - then return the contacts for the specified account''' - result = dbus.Array([], signature='aa{sv}') - accounts = gajim.contacts.get_accounts() - if len(accounts) == 0: - return result - if account: - accounts_to_search = [account] - else: - accounts_to_search = accounts - for acct in accounts_to_search: - if acct in accounts: - for jid in gajim.contacts.get_jid_list(acct): - item = self._contacts_as_dbus_structure( - gajim.contacts.get_contacts(acct, jid)) - if item: - result.append(item) - return result - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def toggle_roster_appearance(self): - ''' shows/hides the roster window ''' - win = gajim.interface.roster.window - if win.get_property('visible'): - gobject.idle_add(win.hide) - else: - win.present() - # preserve the 'steal focus preservation' - if self._is_first(): - win.window.present() - else: - win.window.present_with_time(long(time())) - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def toggle_ipython(self): - ''' shows/hides the ipython window ''' - win = gajim.ipython_window - if win: - if win.window.is_visible(): - gobject.idle_add(win.hide) - else: - win.show_all() - win.present() - else: - gajim.interface.create_ipython_window() - - @dbus.service.method(INTERFACE, in_signature='', out_signature='a{ss}') - def prefs_list(self): - prefs_dict = DBUS_DICT_SS() - def get_prefs(data, name, path, value): - if value is None: - return - key = '' - if path is not None: - for node in path: - key += node + '#' - key += name - prefs_dict[DBUS_STRING(key)] = DBUS_STRING(value) - gajim.config.foreach(get_prefs) - return prefs_dict - - @dbus.service.method(INTERFACE, in_signature='', out_signature='b') - def prefs_store(self): - try: - gajim.interface.save_config() - except Exception: - return DBUS_BOOLEAN(False) - return DBUS_BOOLEAN(True) - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='b') - def prefs_del(self, key): - if not key: - return DBUS_BOOLEAN(False) - key_path = key.split('#', 2) - if len(key_path) != 3: - return DBUS_BOOLEAN(False) - if key_path[2] == '*': - gajim.config.del_per(key_path[0], key_path[1]) - else: - gajim.config.del_per(key_path[0], key_path[1], key_path[2]) - return DBUS_BOOLEAN(True) - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='b') - def prefs_put(self, key): - if not key: - return DBUS_BOOLEAN(False) - key_path = key.split('#', 2) - if len(key_path) < 3: - subname, value = key.split('=', 1) - gajim.config.set(subname, value) - return DBUS_BOOLEAN(True) - subname, value = key_path[2].split('=', 1) - gajim.config.set_per(key_path[0], key_path[1], subname, value) - return DBUS_BOOLEAN(True) - - @dbus.service.method(INTERFACE, in_signature='ss', out_signature='b') - def add_contact(self, jid, account): - if account: - if account in gajim.connections and \ - gajim.connections[account].connected > 1: - # if given account is active, use it - AddNewContactWindow(account = account, jid = jid) - else: - # wrong account - return DBUS_BOOLEAN(False) - else: - # if account is not given, show account combobox - AddNewContactWindow(account = None, jid = jid) - return DBUS_BOOLEAN(True) - - @dbus.service.method(INTERFACE, in_signature='ss', out_signature='b') - def remove_contact(self, jid, account): - jid = self._get_real_jid(jid, account) - accounts = gajim.contacts.get_accounts() - - # if there is only one account in roster, take it as default - if account: - accounts = [account] - contact_exists = False - for account in accounts: - contacts = gajim.contacts.get_contacts(account, jid) - if contacts: - gajim.connections[account].unsubscribe(jid) - for contact in contacts: - gajim.interface.roster.remove_contact(contact, account) - gajim.contacts.remove_jid(account, jid) - contact_exists = True - return DBUS_BOOLEAN(contact_exists) - - def _is_first(self): - if self.first_show: - self.first_show = False - return True - return False - - def _get_real_jid(self, jid, account = None): - '''get the real jid from the given one: removes xmpp: or get jid from nick - if account is specified, search only in this account - ''' - if account: - accounts = [account] - else: - accounts = gajim.connections.keys() - if jid.startswith('xmpp:'): - return jid[5:] # len('xmpp:') = 5 - nick_in_roster = None # Is jid a nick ? - for account in accounts: - # Does jid exists in roster of one account ? - if gajim.contacts.get_contacts(account, jid): - return jid - if not nick_in_roster: - # look in all contact if one has jid as nick - for jid_ in gajim.contacts.get_jid_list(account): - c = gajim.contacts.get_contacts(account, jid_) - if c[0].name == jid: - nick_in_roster = jid_ - break - if nick_in_roster: - # We have not found jid in roster, but we found is as a nick - return nick_in_roster - # We have not found it as jid nor as nick, probably a not in roster jid - return jid - - def _contacts_as_dbus_structure(self, contacts): - ''' get info from list of Contact objects and create dbus dict ''' - if not contacts: - return None - prim_contact = None # primary contact - for contact in contacts: - if prim_contact is None or contact.priority > prim_contact.priority: - prim_contact = contact - contact_dict = DBUS_DICT_SV() - contact_dict['name'] = DBUS_STRING(prim_contact.name) - contact_dict['show'] = DBUS_STRING(prim_contact.show) - contact_dict['jid'] = DBUS_STRING(prim_contact.jid) - if prim_contact.keyID: - keyID = None - if len(prim_contact.keyID) == 8: - keyID = prim_contact.keyID - elif len(prim_contact.keyID) == 16: - keyID = prim_contact.keyID[8:] - if keyID: - contact_dict['openPGP'] = keyID - contact_dict['resources'] = dbus.Array([], signature='(sis)') - for contact in contacts: - resource_props = dbus.Struct((DBUS_STRING(contact.resource), - dbus.Int32(contact.priority), DBUS_STRING(contact.status))) - contact_dict['resources'].append(resource_props) - contact_dict['groups'] = dbus.Array([], signature='(s)') - for group in prim_contact.groups: - contact_dict['groups'].append((DBUS_STRING(group),)) - return contact_dict - - @dbus.service.method(INTERFACE, in_signature='', out_signature='s') - def get_unread_msgs_number(self): - return DBUS_STRING(str(gajim.events.get_nb_events())) - - @dbus.service.method(INTERFACE, in_signature='s', out_signature='b') - def start_chat(self, account): - if not account: - # error is shown in gajim-remote check_arguments(..) - return DBUS_BOOLEAN(False) - app.app.activate_action('start-chat') - return DBUS_BOOLEAN(True) - - @dbus.service.method(INTERFACE, in_signature='ss', out_signature='') - def send_xml(self, xml, account): - if account: - gajim.connections[account].send_stanza(xml) - else: - for acc in gajim.contacts.get_accounts(): - gajim.connections[acc].send_stanza(xml) - - @dbus.service.method(INTERFACE, in_signature='ssss', out_signature='') - def join_room(self, room_jid, nick, password, account): - if not account: - # get the first connected account - accounts = gajim.connections.keys() - for acct in accounts: - if gajim.account_is_connected(acct): - account = acct - break - if not account: - return - if not nick: - gajim.interface.join_gc_minimal(account, room_jid) - else: - gajim.interface.join_gc_room(account, room_jid, nick, password) - -from gajim.common import app -from gajim.common import helpers -from time import time -from gajim.dialogs import AddNewContactWindow, JoinGroupchatWindow - -from gajim.plugins import GajimPlugin -from gajim.plugins.helpers import log_calls, log -from gajim.common import ged - -class DBusPlugin(GajimPlugin): - - @log_calls('DBusPlugin') - def init(self): - self.description = _('D-Bus support.' - ' Based on remote_control module from' - '\nGajim core but uses new events handling system.') - self.config_dialog = None - #self.gui_extension_points = {} - #self.config_default_values = {} - - self.events_names = ['Roster', 'AccountPresence', 'ContactPresence', - 'ContactAbsence', 'ContactStatus', 'NewMessage', - 'Subscribe', 'Subscribed', 'Unsubscribed', - 'NewAccount', 'VcardInfo', 'LastStatusTime', - 'OsInfo', 'GCPresence', 'GCMessage', 'RosterInfo', - 'NewGmail', 'EntityTime'] - - self.signal_object = None - - self.events_handlers = {} - self._set_handling_methods() - - @log_calls('DBusPlugin') - def activate(self): - session_bus = dbus_support.session_bus.SessionBus() - - bus_name = dbus.service.BusName(SERVICE, bus=session_bus) - self.signal_object = SignalObject(bus_name) - - @log_calls('DBusPlugin') - def deactivate(self): - self.signal_object.remove_from_connection() - self.signal_object = None - - @log_calls('DBusPlugin') - def _set_handling_methods(self): - for event_name in self.events_names: - setattr(self, event_name, - types.MethodType( - self._generate_handling_method(event_name), - self)) - self.events_handlers[event_name] = (ged.POSTCORE, - getattr(self, event_name)) - - def _generate_handling_method(self, event_name): - def handler(self, arg): - #print "Handler of event %s called"%(event_name) - if self.signal_object: - getattr(self.signal_object, event_name)(get_dbus_struct(arg)) - - return handler View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58d7096acaac59f0308cf2503bebecedfc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58d7096acaac59f0308cf2503bebecedfc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Better determine language cross platform
by Philipp Hörist 05 Jan '19

05 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d200e94f by Philipp Hörist at 2019-01-05T15:27:11Z Better determine language cross platform - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -69,6 +69,22 @@ def iter_locale_dirs(): if locale_dir.is_dir(): yield str(locale_dir) +def get_default_lang(): + if os.name == "nt": + import ctypes + windll = ctypes.windll.kernel32 + lang = locale.windows_locale[windll.GetUserDefaultUILanguage()] + return lang[:2] + + if sys.platform == "darwin": + from AppKit import NSLocale + return NSLocale.currentLocale().languageCode() + + default = locale.getdefaultlocale()[0] + if default is not None: + return default[:2] + return 'en' + def initialize_direction_mark(): from gi.repository import Gtk @@ -137,15 +153,13 @@ try: except locale.Error as error: print(error) -if os.name == 'nt': - try: - # en_US, fr_FR, el_GR etc.. - default = locale.getdefaultlocale()[0] - if default is not None: - LANG = default[:2] - except (ValueError, locale.Error): - pass - os.environ['LANG'] = LANG +try: + LANG = get_default_lang() + print('Found default language: %s' % LANG) +except Exception as error: + print('Failed to determine default language') + import traceback + traceback.print_exc() # Search for the translation in all locale dirs for dir_ in iter_locale_dirs(): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d200e94fbacb7db1b271d013dd39b40d15… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d200e94fbacb7db1b271d013dd39b40d15… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont send chatstates when cycling MUC nicks
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4aca2eea by Philipp Hörist at 2019-01-04T14:21:55Z Dont send chatstates when cycling MUC nicks - Add ability to enable/disable the whole module so it doesnt try to send chatstates when we are offline - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/modules/chatstates.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -823,8 +823,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): con = app.connections[self.account] con.get_module('Chatstate').set_keyboard_activity(self.contact) if not textview.has_text(): - con.get_module('Chatstate').set_chatstate(self.contact, - Chatstate.ACTIVE) + con.get_module('Chatstate').set_chatstate_delayed(self.contact, + Chatstate.ACTIVE) return con.get_module('Chatstate').set_chatstate(self.contact, Chatstate.COMPOSING) ===================================== gajim/common/connection.py ===================================== @@ -622,6 +622,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('Ping').remove_timeout() if self.connection is None: if not reconnect: + self.get_module('Chatstate').enabled = False self._sm_resume_data = {} self._disconnect() app.nec.push_incoming_event(OurShowEvent( @@ -668,6 +669,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._set_reconnect_timer() else: + self.get_module('Chatstate').enabled = False self._sm_resume_data = {} self._disconnect() app.nec.push_incoming_event(OurShowEvent( @@ -1388,6 +1390,7 @@ class Connection(CommonConnection, ConnectionHandlers): # state of all contacts app.nec.push_incoming_event(OurShowEvent( None, conn=self, show='offline')) + self.get_module('Chatstate').enabled = False def _on_resume_successful(self): # Connection was successful, reset sm resume data @@ -1422,6 +1425,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.retrycount = 0 self._discover_server() self._set_send_timeouts() + self.get_module('Chatstate').enabled = True def _set_send_timeouts(self): if app.config.get_per('accounts', self.name, 'keep_alives_enabled'): ===================================== gajim/common/modules/chatstates.py ===================================== @@ -16,11 +16,13 @@ from typing import Any from typing import Dict # pylint: disable=unused-import +from typing import List # pylint: disable=unused-import from typing import Optional from typing import Tuple import time import logging +from functools import wraps import nbxmpp from gi.repository import GLib @@ -41,6 +43,15 @@ INACTIVE_AFTER = 60 PAUSED_AFTER = 5 +def ensure_enabled(func): + @wraps(func) + def func_wrapper(self, *args, **kwargs): + if not self.enabled: + return + return func(self, *args, **kwargs) + return func_wrapper + + def parse_chatstate(stanza: nbxmpp.Message) -> Optional[str]: if parse_delay(stanza) is not None: return None @@ -60,13 +71,39 @@ class Chatstate: self.handlers = [ ('presence', self._presence_received), ] + + # Our current chatstate with a specific contact self._chatstates = {} # type: Dict[str, State] + self._last_keyboard_activity = {} # type: Dict[str, float] self._last_mouse_activity = {} # type: Dict[str, float] + self._timeout_id = None + self._delay_timeout_ids = {} # type: Dict[str, str] + self._blocked = [] # type: List[str] + self._enabled = False + + @property + def enabled(self): + return self._enabled + + @enabled.setter + def enabled(self, value): + if self._enabled == value: + return + log.info('Chatstate module %s', 'enabled' if value else 'disabled') + self._enabled = value - self._timeout_id = GLib.timeout_add_seconds( - 2, self._check_last_interaction) + if value: + self._timeout_id = GLib.timeout_add_seconds( + 2, self._check_last_interaction) + else: + self.cleanup() + self._chatstates = {} + self._last_keyboard_activity = {} + self._last_mouse_activity = {} + self._blocked = [] + @ensure_enabled def _presence_received(self, _con: ConnectionT, stanza: nbxmpp.Presence) -> None: @@ -135,6 +172,7 @@ class Chatstate: account=self._account, contact=contact)) + @ensure_enabled def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: setting = app.config.get('outgoing_chat_state_notifications') if setting in ('composing_only', 'disabled'): @@ -183,6 +221,7 @@ class Chatstate: return GLib.SOURCE_CONTINUE + @ensure_enabled def set_active(self, jid: str) -> None: self._last_mouse_activity[jid] = time.time() setting = app.config.get('outgoing_chat_state_notifications') @@ -207,7 +246,36 @@ class Chatstate: self.set_active(contact.jid) return 'active' + @ensure_enabled + def block_chatstates(self, contact: ContactT, block: bool) -> None: + # Block sending chatstates to a contact + # Used for example if we cycle through the MUC nick list, which + # produces a lot of text-changed signals from the textview. This + # Would lead to sending ACTIVE -> COMPOSING -> ACTIVE ... + if block: + self._blocked.append(contact.jid) + else: + self._blocked.remove(contact.jid) + + @ensure_enabled + def set_chatstate_delayed(self, contact: ContactT, state: State) -> None: + # Used when we go from Composing -> Active after deleting all text + # from the Textview. We delay the Active state because maybe the + # User starts writing again. + self.remove_delay_timeout(contact) + self._delay_timeout_ids[contact.jid] = GLib.timeout_add_seconds( + 2, self.set_chatstate, contact, state) + + @ensure_enabled def set_chatstate(self, contact: ContactT, state: State) -> None: + # Dont send chatstates to ourself + if self._con.get_own_jid().bareMatch(contact.jid): + return + + if contact.jid in self._blocked: + return + + self.remove_delay_timeout(contact) current_state = self._chatstates.get(contact.jid) setting = app.config.get('outgoing_chat_state_notifications') if setting == 'disabled': @@ -255,10 +323,6 @@ class Chatstate: if current_state == state: return - # Dont send chatstates to ourself - if self._con.get_own_jid().bareMatch(contact.jid): - return - log.info('Send: %-10s - %s', state, contact.jid) event_attrs = {'account': self._account, @@ -275,6 +339,7 @@ class Chatstate: self._chatstates[contact.jid] = state + @ensure_enabled def set_mouse_activity(self, contact: ContactT) -> None: self._last_mouse_activity[contact.jid] = time.time() setting = app.config.get('outgoing_chat_state_notifications') @@ -283,11 +348,25 @@ class Chatstate: if self._chatstates.get(contact.jid) == State.INACTIVE: self.set_chatstate(contact, State.ACTIVE) + @ensure_enabled def set_keyboard_activity(self, contact: ContactT) -> None: self._last_keyboard_activity[contact.jid] = time.time() + def remove_delay_timeout(self, contact): + timeout = self._delay_timeout_ids.get(contact.jid) + if timeout is not None: + GLib.source_remove(timeout) + del self._delay_timeout_ids[contact.jid] + + def remove_all_delay_timeouts(self): + for timeout in self._delay_timeout_ids.values(): + GLib.source_remove(timeout) + self._delay_timeout_ids = {} + def cleanup(self): - GLib.source_remove(self._timeout_id) + self.remove_all_delay_timeouts() + if self._timeout_id is not None: + GLib.source_remove(self._timeout_id) def get_instance(*args: Any, **kwargs: Any) -> Tuple[Chatstate, str]: ===================================== gajim/groupchat_control.py ===================================== @@ -1620,6 +1620,9 @@ class GroupchatControl(ChatControlBase): self.is_connected = False ChatControlBase.got_disconnected(self) + con = app.connections[self.account] + con.get_module('Chatstate').remove_delay_timeout(self.contact) + contact = app.contacts.get_groupchat_contact(self.account, self.room_jid) if contact is not None: @@ -2550,6 +2553,9 @@ class GroupchatControl(ChatControlBase): else: start_iter.backward_chars(len(begin)) + con = app.connections[self.account] + con.get_module('Chatstate').block_chatstates(self.contact, True) + message_buffer.delete(start_iter, end_iter) # get a shell-like completion # if there's more than one nick for this completion, complete @@ -2579,6 +2585,9 @@ class GroupchatControl(ChatControlBase): else: completion = self.nick_hits[0] message_buffer.insert_at_cursor(completion + add) + + con.get_module('Chatstate').block_chatstates(self.contact, False) + self.last_key_tabs = True return True self.last_key_tabs = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4aca2eeae2e38a49916e81b65e49951197… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4aca2eeae2e38a49916e81b65e49951197… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use custom link handler in AboutDialog
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4bd14bc5 by Philipp Hörist at 2019-01-04T10:56:23Z Use custom link handler in AboutDialog Fixes #9525 - - - - - 1 changed file: - gajim/gtk/about.py Changes: ===================================== gajim/gtk/about.py ===================================== @@ -14,10 +14,12 @@ import nbxmpp +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GObject from gajim.common import app +from gajim.common.helpers import launch_browser_mailer from gajim.common.i18n import _ from gajim.common.const import DEVS_CURRENT from gajim.common.const import DEVS_PAST @@ -65,3 +67,25 @@ class AboutDialog(Gtk.AboutDialog): 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) self.show() + self.connect('activate-link', self._on_activate_link) + # See https://gitlab.gnome.org/GNOME/gtk/issues/1561 + self._connect_link_handler(self) + + @staticmethod + def _on_activate_link(_label, uri): + # We have to use this, because the default GTK handler + # is not cross-platform compatible + launch_browser_mailer(None, uri) + return Gdk.EVENT_STOP + + def _connect_link_handler(self, parent): + def _find_child(parent_): + if not hasattr(parent_, 'get_children'): + return + + for child in parent_.get_children(): + if isinstance(child, Gtk.Label): + if 'href' in child.get_label(): + child.connect('activate-link', self._on_activate_link) + _find_child(child) + _find_child(parent) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4bd14bc51d0647a48c3d495bbbe7f0ab5f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4bd14bc51d0647a48c3d495bbbe7f0ab5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add some default options
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67318a49 by Philipp Hörist at 2019-01-04T08:00:12Z Preferences: Add some default options - Option to set default sync threshold - Option to set default show join/leave - Option to set default show status message change - - - - - 4 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/groupchat_control.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/config.py ===================================== @@ -235,6 +235,8 @@ class Config: 'show_location_in_roster': [opt_bool, True, '', True], 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes their status and/or their status message.')], + 'print_join_leave_in_mucs': [opt_bool, False, _('Default Setting: Show a status message for every join or leave in a group chat')], + 'print_status_in_mucs': [opt_bool, False, _('Default Setting: Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'restored_messages_small': [opt_bool, True, _('If true, restored messages will use a smaller font than the default one.')], @@ -719,6 +721,11 @@ class Config: room = self.get_per('rooms', room, 'notify_on_all_messages') return all_ or room + def get_options(self, optname, return_type=str): + options = self.get(optname).split(',') + options = [return_type(option.strip()) for option in options] + return options + def _init_options(self): for opt in self.__options[0]: self.__options[1][opt] = self.__options[0][opt][Option.VAL] ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -179,6 +179,14 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkListStore" id="sync_threshold_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkListStore" id="systray_combobox_liststore"> <columns>  @@ -702,10 +710,104 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <placeholder/> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Group Chat Settings</property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkCheckButton" id="join_leave_checkbutton"> + <property name="label" translatable="yes">Show join/leave (Default)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If join/leave status messages are shown in the group chat. This setting can be overridden in the groupchat menu.</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_join_leave_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">The default sync threshold for new public group chats. This setting can be overridden in the groupchat menu.</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Default Sync Threshold</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <property name="mnemonic_widget">outgoing_chat_states_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="sync_threshold_combobox"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="model">sync_threshold_liststore</property> + <signal name="changed" handler="_on_sync_threshold_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="status_change_checkbutton"> + <property name="label" translatable="yes">Show status changes (Default)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If status change messages are shown in the group chat. This setting can be overridden in the groupchat menu.</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_status_change_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> <packing> ===================================== gajim/groupchat_control.py ===================================== @@ -397,7 +397,9 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_notify_on_all_messages) self.parent_win.window.add_action(act) - value = app.config.get_per('rooms', self.contact.jid, 'print_status') + status_default = app.config.get('print_status_in_mucs') + value = app.config.get_per('rooms', self.contact.jid, + 'print_status', status_default) act = Gio.SimpleAction.new_stateful( 'print-status-' + self.control_id, @@ -405,7 +407,9 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_print_status) self.parent_win.window.add_action(act) - value = app.config.get_per('rooms', self.contact.jid, 'print_join_left') + join_default = app.config.get('print_join_leave_in_mucs') + value = app.config.get_per('rooms', self.contact.jid, + 'print_join_left', join_default) act = Gio.SimpleAction.new_stateful( 'print-join-left-' + self.control_id, ===================================== gajim/gtk/preferences.py ===================================== @@ -24,6 +24,7 @@ from gajim.common import helpers from gajim.common import config as c_config from gajim.common import idle from gajim.common.i18n import _ +from gajim.common.i18n import ngettext from gajim import message_control @@ -147,6 +148,25 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('show_subject_on_join') self._ui.subject_on_join_checkbutton.set_active(st) + + # Group chat settings + threshold_model = self._ui.sync_threshold_combobox.get_model() + for day in app.config.get_options('threshold_options'): + if day == '0': + label = _('No threshold') + else: + label = ngettext('%s day' % day, '%s days' % day, int(day)) + threshold_model.append([day, label]) + public_threshold = app.config.get('public_room_sync_threshold') + self._ui.sync_threshold_combobox.set_id_column(0) + self._ui.sync_threshold_combobox.set_active_id(str(public_threshold)) + + st = app.config.get('print_join_leave_in_mucs') + self._ui.join_leave_checkbutton.set_active(st) + + st = app.config.get('print_status_in_mucs') + self._ui.status_change_checkbutton.set_active(st) + # Displayed chat state notifications st = app.config.get('show_chatstate_in_tabs') self._ui.show_chatstate_in_tabs.set_active(st) @@ -595,6 +615,16 @@ class Preferences(Gtk.ApplicationWindow): def on_subject_on_join_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_subject_on_join') + def _on_sync_threshold_changed(self, widget): + active = widget.get_active_id() + app.config.set('public_room_sync_threshold', int(active)) + + def _on_join_leave_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'print_join_leave_in_mucs') + + def _on_status_change_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'print_status_in_mucs') + def on_show_chatstate_in_tabs_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_chatstate_in_tabs') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/67318a49e5532392f654b62493922ad4a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/67318a49e5532392f654b62493922ad4a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix parsing payload
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3952ae1d by Philipp Hörist at 2019-01-04T06:44:57Z Fix parsing payload - - - - - 2 changed files: - nbxmpp/modules/iq.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/iq.py ===================================== @@ -48,10 +48,10 @@ class BaseIq: properties.jid = stanza.getFrom() properties.id = stanza.getID() - payloads = stanza.getPayload() - for payload in payloads: - if payload.getName() != 'error': - properties.payload = payload + childs = stanza.getChildren() + for child in childs: + if child.getName() != 'error': + properties.payload = child break properties.query = stanza.getQuery() ===================================== nbxmpp/structs.py ===================================== @@ -167,6 +167,8 @@ class PresenceProperties: self.jid = None self.resource = None self.id = None + self.payload = None + self.query = None self.nickname = None self.self_presence = False self.self_bare = False View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3952ae1d4c00b79ca6e423d397… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3952ae1d4c00b79ca6e423d397… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Set from to own jid if attr is not present
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 02eaaa7d by Philipp Hörist at 2019-01-04T06:31:52Z Set from to own jid if attr is not present - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -519,6 +519,9 @@ class XMPPDispatcher(PlugIn): log.warning('Message addressed to someone else: %s', stanza) return + if stanza.getFrom() is None: + stanza.setFrom(own_jid.getBare()) + # Unwrap carbon try: stanza, properties.carbon_type = unwrap_carbon(stanza, own_jid) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/02eaaa7da60f13e7949ee22e20… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/02eaaa7da60f13e7949ee22e20… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2019