Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Revert "Windows: Add GooCanvas to build"
by Philipp Hörist 17 Aug '19

17 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 45d800bf by Philipp Hörist at 2019-08-17T11:18:52Z Revert "Windows: Add GooCanvas to build" This reverts commit 811f3d50208c47916f4814b26ab00f6106117c0e - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -85,7 +85,6 @@ function install_deps { mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-hunspell \ - mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/45d800bfe59417e82961002f94c1e36ad9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/45d800bfe59417e82961002f94c1e36ad9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Add GooCanvas to build
by Philipp Hörist 17 Aug '19

17 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 811f3d50 by Philipp Hörist at 2019-08-17T11:16:33Z Windows: Add GooCanvas to build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -85,6 +85,7 @@ function install_deps { mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-hunspell \ + mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/811f3d50208c47916f4814b26ab00f6106… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/811f3d50208c47916f4814b26ab00f6106… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Focus close button on muc-info page
by Philipp Hörist 17 Aug '19

17 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 197dfa5c by Philipp Hörist at 2019-08-17T11:11:46Z Groupchat: Focus close button on muc-info page This prevents one of the labels getting focus on page switch - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -563,6 +563,10 @@ class GroupchatControl(ChatControlBase): if name == 'groupchat': transition = Gtk.StackTransitionType.SLIDE_UP self.msg_textview.grab_focus() + if name == 'muc-info': + # Set focus on the close button, otherwise one of the selectable labels + # of the GroupchatInfo box gets focus, which means it is fully selected + self.xml.info_close_button.grab_focus() self.xml.stack.set_visible_child_full(name, transition) def _get_current_page(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/197dfa5c15f3d5f678e661659d7f6504df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/197dfa5c15f3d5f678e661659d7f6504df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Refactor MUC disco info cache
by Philipp Hörist 17 Aug '19

17 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: de1866a6 by Philipp Hörist at 2019-08-17T10:53:44Z Refactor MUC disco info cache - Store disco info in cache database - Remove MucCapsCache, the DiscoInfo object supports all the methods - - - - - 01be1d6f by Philipp Hörist at 2019-08-17T10:54:46Z Discovery: Refactor disco_muc() - Use everywhere disco_muc() - Cache results with set_last_disco_info() - Raise muc-disco-update event after every successful disco - Raise muc-join-failed when disco is not successful before join - - - - - f54a1677 by Philipp Hörist at 2019-08-17T10:55:27Z Adapt to nbxmpp changes - - - - - cf14c04d by Philipp Hörist at 2019-08-17T10:55:27Z Raise required nbxmpp version to 0.9.92 - - - - - 17 changed files: - gajim/common/caps_cache.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/logger.py - gajim/common/modules/discovery.py - gajim/common/modules/iq.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/dialog_messages.py - gajim/gajim.py - gajim/groupchat_control.py - gajim/gtk/groupchat_config.py - gajim/gtk/groupchat_join.py - gajim/gtk/start_chat.py - setup.cfg - test/no_gui/unit/test_caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -29,8 +29,6 @@ through ClientCaps objects which are hold by contact instances. import logging -import nbxmpp -from nbxmpp.const import Affiliation from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER_5) @@ -52,15 +50,13 @@ FAKED = 3 # allow NullClientCaps to behave as it has a cached item ################################################################################ capscache = None -muc_caps_cache = None + def initialize(logger): """ Initialize this module """ global capscache - global muc_caps_cache capscache = CapsCache(logger) - muc_caps_cache = MucCapsCache() def client_supports(client_caps, requested_feature): lookup_item = client_caps.get_cache_lookup_strategy() @@ -333,87 +329,3 @@ class CapsCache: key = (hash_method, hash_) if key in self.__cache: del self.__cache[key] - - -class MucCapsCache: - - def __init__(self): - self.cache = {} - - def append(self, info): - if nbxmpp.NS_MUC not in info.features: - # Not a MUC, don't cache info - return - - self.cache[info.jid] = info - - def is_cached(self, jid): - return jid in self.cache - - def supports(self, jid, feature): - if jid in self.cache: - if feature in self.cache[jid].features: - return True - return False - - def has_mam(self, jid): - try: - if nbxmpp.NS_MAM_2 in self.cache[jid].features: - return True - if nbxmpp.NS_MAM_1 in self.cache[jid].features: - return True - return False - except (KeyError, AttributeError): - return False - - def get_mam_namespace(self, jid): - try: - if nbxmpp.NS_MAM_2 in self.cache[jid].features: - return nbxmpp.NS_MAM_2 - if nbxmpp.NS_MAM_1 in self.cache[jid].features: - return nbxmpp.NS_MAM_1 - except (KeyError, AttributeError): - return - - def is_subject_change_allowed(self, jid, affiliation): - allowed = True - if affiliation in (Affiliation.OWNER, Affiliation.ADMIN): - return allowed - - if jid in self.cache: - for form in self.cache[jid].dataforms: - try: - allowed = form['muc#roominfo_changesubject'].value - except KeyError: - pass - return allowed - - def is_open(self, jid): - return 'muc_membersonly' not in self.cache[jid].features - - def is_password_protected(self, jid): - return 'muc_unsecured' not in self.cache[jid].features - - def is_anonymous(self, jid): - return 'muc_nonanonymous' not in self.cache[jid].features - - def is_persistent(self, jid): - return 'muc_temporary' not in self.cache[jid].features - - def get_room_infos(self, jid): - room_info = {} - if jid in self.cache: - for form in self.cache[jid].dataforms: - try: - room_info['name'] = form['muc#roomconfig_roomname'].value - except KeyError: - room_info['name'] = None - try: - room_info['desc'] = form['muc#roominfo_description'].value - except KeyError: - room_info['desc'] = None - try: - room_info['lang'] = form['muc#roominfo_lang'].value - except KeyError: - room_info['lang'] = None - return room_info or None ===================================== gajim/common/contacts.py ===================================== @@ -188,11 +188,10 @@ class Contact(CommonContact): if name: return name - cache = caps_cache.muc_caps_cache.cache - if self.jid in cache: - name = cache[self.jid].muc_room_name - if name: - return name + disco_info = app.logger.get_last_disco_info(self.jid) + if disco_info is not None: + if disco_info.muc_room_name: + return disco_info.muc_room_name return self.jid.split('@')[0] def get_shown_groups(self): ===================================== gajim/common/helpers.py ===================================== @@ -65,7 +65,6 @@ from gi.repository import GLib import precis_i18n.codec # pylint: disable=unused-import from gajim.common import app -from gajim.common import caps_cache from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ @@ -1087,10 +1086,11 @@ def update_optional_features(account=None): # Give plugins the possibility to add their features app.plugin_manager.extension_point('update_caps', account_) - app.caps_hash[account_] = compute_caps_hash(DiscoInfo( - None, None, [app.gajim_identity], - app.gajim_common_features + features, - []), compare=False) + disco_info = DiscoInfo(None, + [app.gajim_identity], + app.gajim_common_features + features, + []) + app.caps_hash[account_] = compute_caps_hash(disco_info, compare=False) # re-send presence with new hash connected = app.connections[account_].connected if connected > 1 and app.SHOW_LIST[connected] != 'invisible': @@ -1334,9 +1334,9 @@ def call_counter(func): return helper def get_sync_threshold(jid, archive_info): - cache = caps_cache.muc_caps_cache + disco_info = app.logger.get_last_disco_info(jid) if archive_info is None or archive_info.sync_threshold is None: - if cache.supports(jid, 'muc#roomconfig_membersonly'): + if disco_info is not None and disco_info.muc_is_members_only: threshold = app.config.get('private_room_sync_threshold') else: threshold = app.config.get('public_room_sync_threshold') ===================================== gajim/common/logger.py ===================================== @@ -38,8 +38,10 @@ from collections import namedtuple from gi.repository import GLib from nbxmpp.protocol import Node +from nbxmpp.protocol import Iq from nbxmpp.structs import DiscoInfo from nbxmpp.modules.dataforms import extend_form +from nbxmpp.modules.discovery import parse_disco_info from gajim.common import exceptions from gajim.common import app @@ -105,6 +107,11 @@ CACHE_SQL_STATEMENT = ''' data TEXT, last_seen INTEGER ); + CREATE TABLE last_seen_disco_info( + jid TEXT PRIMARY KEY UNIQUE, + disco_info TEXT, + last_seen INTEGER + ); CREATE TABLE roster_entry( account_jid_id INTEGER, jid_id INTEGER, @@ -120,7 +127,7 @@ CACHE_SQL_STATEMENT = ''' group_name TEXT, PRIMARY KEY (account_jid_id, jid_id, group_name) ); - PRAGMA user_version=2; + PRAGMA user_version=3; ''' log = logging.getLogger('gajim.c.logger') @@ -170,6 +177,17 @@ def caps_decoder(dict_): dataforms=dataforms) +def _convert_disco_info(disco_info): + return parse_disco_info(Iq(node=disco_info)) + +def _adapt_disco_info(disco_info): + return str(disco_info.stanza) + +sqlite.register_converter('disco_info', _convert_disco_info) + +sqlite.register_adapter(DiscoInfo, _adapt_disco_info) + + class Logger: def __init__(self): self._jid_ids = {} @@ -179,6 +197,8 @@ class Logger: self._log_db_path = configpaths.get('LOG_DB') self._cache_db_path = configpaths.get('CACHE_DB') + self._disco_info_cache = {} + self._create_databases() self._migrate_databases() self._connect_databases() @@ -299,6 +319,16 @@ class Logger: ] self._execute_multiple(con, statements) + if self._get_user_version(con) < 3: + statements = [ + '''CREATE TABLE last_seen_disco_info( + jid TEXT PRIMARY KEY UNIQUE, + disco_info TEXT, + last_seen INTEGER)''', + 'PRAGMA user_version=3' + ] + self._execute_multiple(con, statements) + @staticmethod def _execute_multiple(con, statements): """ @@ -341,8 +371,10 @@ class Logger: app.ged.raise_event(event, None, str(error)) def _connect_databases(self): - self._con = self._connect( - self._log_db_path, timeout=20.0, isolation_level='IMMEDIATE') + self._con = self._connect(self._log_db_path, + timeout=20.0, + isolation_level='IMMEDIATE', + detect_types=sqlite.PARSE_COLNAMES) self._con.row_factory = self.namedtuple_factory @@ -1465,3 +1497,55 @@ class Logger: self._con.execute(sql, tuple(kwargs.values()) + (jid_id,)) log.info('Set message archive info: %s %s', jid, kwargs) self._timeout_commit() + + def get_last_disco_info(self, jid): + """ + Get last disco info from jid + + :param jid: The jid + + """ + + if jid in self._disco_info_cache: + return self._disco_info_cache[jid] + + sql = '''SELECT disco_info as "disco_info [disco_info]", last_seen FROM + last_seen_disco_info + WHERE jid = ?''' + row = self._con.execute(sql, (str(jid),)).fetchone() + if row is None: + return None + + disco_info = row.disco_info._replace(timestamp=row.last_seen) + self._disco_info_cache[jid] = disco_info + return disco_info + + def set_last_disco_info(self, jid, disco_info): + """ + Get last disco info from jid + + :param jid: The jid + + :param disco_info: A DiscoInfo object + + """ + + log.info('Save disco info from %s', jid) + + disco_exists = self.get_last_disco_info(jid) is not None + if disco_exists: + sql = '''UPDATE last_seen_disco_info SET + disco_info = ?, last_seen = ? + WHERE jid = ?''' + + self._con.execute(sql, (disco_info, disco_info.timestamp, str(jid))) + + else: + sql = '''INSERT INTO last_seen_disco_info + (jid, disco_info, last_seen) + VALUES (?, ?, ?)''' + + self._con.execute(sql, (str(jid), disco_info, disco_info.timestamp)) + + self._disco_info_cache[jid] = disco_info + self._timeout_commit() ===================================== gajim/common/modules/discovery.py ===================================== @@ -19,10 +19,9 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result from gajim.common import app -from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule -from gajim.common.connection_handlers_events import InformationEvent +from gajim.common.nec import NetworkEvent class Discovery(BaseModule): @@ -197,39 +196,27 @@ class Discovery(BaseModule): self._con.connection.send(iq) raise nbxmpp.NodeProcessed - def disco_muc(self, jid, callback, update=False): + def disco_muc(self, jid, callback=None): if not app.account_is_connected(self._account): return - if muc_caps_cache.is_cached(jid) and not update: - callback() - return - self._log.info('Request MUC info %s', jid) + self._log.info('Request MUC info for %s', jid) self.disco_info(jid, - callback=self._muc_info_response, + callback=self._muc_info_received, user_data=callback) - def _muc_info_response(self, result, callback): - if is_error_result(result): - if result.condition == 'item-not-found': - # Groupchat does not exist - self._log.info('MUC does not exist: %s', result.jid) - callback() - else: - self._log.info('MUC disco error: %s', result) - app.nec.push_incoming_event( - InformationEvent( - None, - dialog_name='unable-join-groupchat', - kwargs={ - 'server': result.jid, - 'error': str(result)})) - return - + def _muc_info_received(self, result, callback): self._log.info('MUC info received: %s', result.jid) - muc_caps_cache.append(result) - callback() + if not is_error_result(result): + app.logger.set_last_disco_info(result.jid, result) + app.nec.push_incoming_event(NetworkEvent( + 'muc-disco-update', + account=self._account, + room_jid=result.jid)) + + if callback is not None: + callback(result) def get_instance(*args, **kwargs): ===================================== gajim/common/modules/iq.py ===================================== @@ -15,7 +15,6 @@ # Iq handler import nbxmpp -from nbxmpp.const import Error from nbxmpp.structs import StanzaHandler from gajim.common import app @@ -37,13 +36,13 @@ class Iq(BaseModule): def _iq_error_received(self, _con, _stanza, properties): self._log.info('Error: %s', properties.error) - if properties.error.type in (Error.JID_MALFORMED, - Error.FORBIDDEN, - Error.NOT_ACCEPTABLE): + if properties.error.condition in ('jid-malformed', + 'forbidden', + 'not-acceptable'): sid = self._get_sid(properties.id) file_props = FilesProp.getFileProp(self._account, sid) if file_props: - if properties.error.type == Error.JID_MALFORMED: + if properties.error.condition == 'jid-malformed': file_props.error = -3 else: file_props.error = -4 @@ -52,11 +51,11 @@ class Iq(BaseModule): conn=self._con, jid=properties.jid.getBare(), file_props=file_props, - error_msg=properties.error.message)) + error_msg=properties.error.get_text())) self._con.get_module('Bytestream').disconnect_transfer(file_props) raise nbxmpp.NodeProcessed - if properties.error.type == Error.ITEM_NOT_FOUND: + if properties.error.condition == 'item-not-found': sid = self._get_sid(properties.id) file_props = FilesProp.getFileProp(self._account, sid) if file_props: ===================================== gajim/common/modules/mam.py ===================================== @@ -26,7 +26,6 @@ from gajim.common.nec import NetworkIncomingEvent from gajim.common.const import ArchiveState from gajim.common.const import KindConstant from gajim.common.const import SyncThreshold -from gajim.common.caps_cache import muc_caps_cache from gajim.common.helpers import get_sync_threshold from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.misc import parse_oob @@ -112,7 +111,8 @@ class MAM(BaseModule): if properties.type.is_groupchat: archive_jid = properties.jid.getBare() - namespace = muc_caps_cache.get_mam_namespace(archive_jid) + disco_info = app.logger.get_last_disco_info(archive_jid) + namespace = disco_info.mam_namespace timestamp = properties.timestamp if namespace is None: # MUC History @@ -536,10 +536,12 @@ class MAM(BaseModule): def _get_archive_query(self, query_id, jid=None, start=None, end=None, with_=None, after=None, max_=70): # Muc archive query? - namespace = muc_caps_cache.get_mam_namespace(jid) - if namespace is None: + disco_info = app.logger.get_last_disco_info(jid) + if disco_info is None: # Query to our own archive namespace = self.archiving_namespace + else: + namespace = disco_info.mam_namespace iq = nbxmpp.Iq('set', to=jid) query = iq.addChild('query', namespace=namespace) ===================================== gajim/common/modules/message.py ===================================== @@ -25,7 +25,6 @@ from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict -from gajim.common.caps_cache import muc_caps_cache from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message @@ -293,8 +292,8 @@ class Message(BaseModule): message_id=event.message_id) def _check_for_mam_compliance(self, room_jid, stanza_id): - namespace = muc_caps_cache.get_mam_namespace(room_jid) - if stanza_id is None and namespace == nbxmpp.NS_MAM_2: + disco_info = app.logger.get_last_disco_info(room_jid) + if stanza_id is None and disco_info.mam_namespace == nbxmpp.NS_MAM_2: self._log.warning('%s announces mam:2 without stanza-id', room_jid) def _get_unique_id(self, properties): @@ -306,8 +305,9 @@ class Message(BaseModule): return None, None if properties.type.is_groupchat: - namespace = muc_caps_cache.get_mam_namespace( + disco_info = app.logger.get_last_disco_info( properties.jid.getBare()) + namespace = disco_info.mam_namespace archive = properties.jid else: namespace = self._con.get_module('MAM').archiving_namespace ===================================== gajim/common/modules/muc.py ===================================== @@ -20,12 +20,10 @@ import logging from datetime import datetime from datetime import timedelta from datetime import timezone -from functools import partial import nbxmpp from nbxmpp.const import InviteType from nbxmpp.const import PresenceType -from nbxmpp.const import Error from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result @@ -41,7 +39,6 @@ from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_sync_threshold from gajim.common.helpers import to_user_string from gajim.common import idle -from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data from gajim.common.modules.base import BaseModule @@ -145,7 +142,20 @@ class MUC(BaseModule): self._muc_data[muc_data.jid] = muc_data self._con.get_module('Discovery').disco_muc( - muc_data.jid, partial(self._join, muc_data)) + muc_data.jid, + callback=self._on_disco_result) + + def _on_disco_result(self, result): + if is_error_result(result): + self._log.info('Disco %s failed: %s', result.jid, result.get_text()) + app.nec.push_incoming_event( + NetworkEvent('muc-join-failed', + account=self._account, + room_jid=result.jid.getBare(), + error=result)) + return + + self._join(self._get_muc_data(result.jid)) def _join(self, muc_data): show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) @@ -228,8 +238,7 @@ class MUC(BaseModule): account=self._account, room_jid=result.jid)) - self._con.get_module('Discovery').disco_muc( - result.jid, partial(self._on_disco_update, result.jid), update=True) + self._con.get_module('Discovery').disco_muc(result.jid) # If this is an automatic room creation try: @@ -245,12 +254,6 @@ class MUC(BaseModule): for jid in invites: self.invite(result.jid, jid) - def _on_disco_update(self, room_jid): - app.nec.push_incoming_event(NetworkEvent( - 'muc-disco-update', - account=self._account, - room_jid=room_jid)) - def update_presence(self, auto=False): mucs = self.get_mucs_with_state([MUCJoinedState.JOINED, MUCJoinedState.JOINING]) @@ -291,7 +294,8 @@ class MUC(BaseModule): status=self._con.status) def _add_history_query(self, muc_x, room_jid): - if muc_caps_cache.has_mam(room_jid): + disco_info = app.logger.get_last_disco_info(room_jid) + if disco_info.has_mam: # The room is MAM capable dont get MUC History muc_x.setTag('history', {'maxchars': '0'}) else: @@ -322,23 +326,27 @@ class MUC(BaseModule): return if muc_data.state == MUCJoinedState.JOINING: - if properties.error.type == Error.CONFLICT: + if properties.error.condition == 'conflict': muc_data.nick += '_' self._log.info('Nickname conflict: %s change to %s', muc_data.jid, muc_data.nick) self._join(muc_data) - elif properties.error.type == Error.NOT_AUTHORIZED: + elif properties.error.condition == 'not-authorized': self._raise_muc_event('muc-password-required', properties) else: - self._raise_muc_event('muc-join-failed', properties) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + app.nec.push_incoming_event( + NetworkEvent('muc-join-failed', + account=self._account, + room_jid=room_jid, + error=properties.error)) elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: app.nec.push_incoming_event( NetworkEvent('muc-captcha-error', account=self._account, room_jid=room_jid, - error_text=properties.error.message)) + error_text=properties.error.get_text())) self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) ===================================== gajim/dialog_messages.py ===================================== @@ -104,11 +104,6 @@ messages = { '%(error_msg)s'), ErrorDialog), - 'unable-join-groupchat': Message( - _('Unable to Join Group Chat'), - '%(server)s\n%(error)s', - ErrorDialog), - 'gstreamer-error': Message( _('GStreamer Error'), _('Error: %(error)s\nDebug: %(debug)s'), ===================================== gajim/gajim.py ===================================== @@ -26,7 +26,7 @@ from distutils.version import LooseVersion as V from gajim.common import i18n -_MIN_NBXMPP_VER = "0.9.91" +_MIN_NBXMPP_VER = "0.9.92" _MIN_GTK_VER = "3.22.0" _MIN_CAIRO_VER = "1.14.0" ===================================== gajim/groupchat_control.py ===================================== @@ -53,7 +53,6 @@ from gajim import message_control from gajim import vcard from gajim.common.const import AvatarSize -from gajim.common.caps_cache import muc_caps_cache from gajim.common import events from gajim.common import app from gajim.common import helpers @@ -371,6 +370,10 @@ class GroupchatControl(ChatControlBase): def room_name(self): return self.contact.get_shown_name() + @property + def disco_info(self): + return app.logger.get_last_disco_info(self.contact.jid) + def add_actions(self): super().add_actions() actions = [ @@ -421,8 +424,10 @@ class GroupchatControl(ChatControlBase): self.parent_win.window.add_action(act) # Enable notify on all for private rooms - members_only = muc_caps_cache.supports(self.contact.jid, - 'muc#roomconfig_membersonly') + members_only = False + if self.disco_info is not None: + members_only = self.disco_info.muc_is_members_only + value = app.config.get_per( 'rooms', self.contact.jid, 'notify_on_all_messages', members_only) @@ -486,12 +491,9 @@ class GroupchatControl(ChatControlBase): role.is_visitor) # Change Subject - subject = False - if contact is not None: - subject = muc_caps_cache.is_subject_change_allowed( - self.room_jid, contact.affiliation) + subject_change = self._is_subject_change_allowed() self._get_action('change-subject-').set_enabled(self.is_connected and - subject) + subject_change) # Change Nick self._get_action('change-nickname-').set_enabled(self.is_connected) @@ -517,7 +519,9 @@ class GroupchatControl(ChatControlBase): self.sendfile_button.set_tooltip_text(tooltip_text) # Upload Avatar - vcard_support = muc_caps_cache.supports(self.room_jid, nbxmpp.NS_VCARD) + vcard_support = False + if self.disco_info is not None: + vcard_support = self.disco_info.supports(nbxmpp.NS_VCARD) self._get_action('upload-avatar-').set_enabled( self.is_connected and vcard_support and @@ -537,6 +541,19 @@ class GroupchatControl(ChatControlBase): self._get_action('print-status-').set_state( GLib.Variant.new_boolean(value)) + def _is_subject_change_allowed(self): + contact = app.contacts.get_gc_contact( + self.account, self.room_jid, self.nick) + if contact is None: + return False + + if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): + return True + + if self.disco_info is None: + return False + return self.disco_info.muc_subjectmod + def _get_action(self, name): win = self.parent_win.window return win.lookup_action(name + self.control_id) @@ -623,14 +640,13 @@ class GroupchatControl(ChatControlBase): self.update_actions() # After the room has been created, reevaluate threshold - if muc_caps_cache.has_mam(self.contact.jid): + if self.disco_info.has_mam: archive_info = app.logger.get_archive_infos(self.contact.jid) threshold = helpers.get_sync_threshold(self.contact.jid, archive_info) win.change_action_state('choose-sync-%s' % self.control_id, GLib.Variant('s', str(threshold))) - def _connect_window_state_change(self, parent_win): if self._state_change_handler_id is None: id_ = parent_win.window.connect('notify::is-maximized', @@ -643,8 +659,7 @@ class GroupchatControl(ChatControlBase): self.leave() def _on_information(self, action, param): - disco_info = muc_caps_cache.cache[self.contact.jid] - self._muc_info_box.set_from_disco_info(disco_info) + self._muc_info_box.set_from_disco_info(self.disco_info) if self._subject_data is not None: self._muc_info_box.set_subject(self._subject_data.subject) self._muc_info_box.set_author(self._subject_data.nickname, @@ -1386,7 +1401,7 @@ class GroupchatControl(ChatControlBase): changes.append(_('A setting not related to privacy has been ' 'changed')) app.connections[self.account].get_module('Discovery').disco_muc( - self.room_jid, self.update_actions, update=True) + self.room_jid) if StatusCode.CONFIG_ROOM_LOGGING in event.status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) @@ -1479,7 +1494,7 @@ class GroupchatControl(ChatControlBase): GLib.source_remove(self.autorejoin) self.autorejoin = None - if muc_caps_cache.has_mam(self.room_jid): + if self.disco_info.has_mam: # Request MAM con = app.connections[self.account] con.get_module('MAM').request_archive_on_muc_join( @@ -1925,17 +1940,14 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_muc_join_failed(self, event): - self.xml.error_label.set_text(event.properties.error.message) + self.xml.error_label.set_text(event.error.get_text()) self._show_page('error') self.autorejoin = False @event_filter(['account', 'room_jid']) def _on_presence_error(self, event): - error_type = event.properties.error.type - error_message = event.properties.error.message - - self.add_info_message( - 'Error %s: %s' % (error_type.value, error_message)) + error_message = event.properties.error.get_text() + self.add_info_message('Error: %s' % error_message) def add_contact_to_roster(self, nick): contact = app.contacts.get_gc_contact(self.account, ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -22,7 +22,6 @@ from gi.repository import Gtk from gajim.common import app from gajim.common.i18n import _ from gajim.common.const import MUCUser -from gajim.common.caps_cache import muc_caps_cache from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dataform import DataFormWidget @@ -53,7 +52,8 @@ class GroupchatConfig(Gtk.ApplicationWindow): self._ui.add_button.set_sensitive(True) self._ui.add_button.set_tooltip_text('') - visible = muc_caps_cache.supports(jid, nbxmpp.NS_REGISTER) + disco_info = app.logger.get_last_disco_info(self.jid) + visible = disco_info.supports(nbxmpp.NS_REGISTER) self._ui.reserved_name_column.set_visible(visible) self._ui.info_button.set_sensitive(False) ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -73,17 +73,14 @@ class GroupchatJoin(Gtk.ApplicationWindow): self.add(self._main_box) self.show_all() - self._disco_muc(jid) + con = app.connections[self.account] + con.get_module('Discovery').disco_muc( + jid, callback=self._disco_info_received) def _on_page_changed(self, stack, _param): name = stack.get_visible_child_name() self._join_button.set_sensitive(name == 'info') - def _disco_muc(self, jid): - con = app.connections[self.account] - con.get_module('Discovery').disco_info( - jid, callback=self._disco_info_received) - @ensure_not_destroyed def _disco_info_received(self, result): if is_error_result(result): ===================================== gajim/gtk/start_chat.py ===================================== @@ -14,6 +14,7 @@ import locale from enum import IntEnum +from functools import partial from gi.repository import Gdk from gi.repository import Gtk @@ -275,11 +276,11 @@ class StartChatDialog(Gtk.ApplicationWindow): def _disco_muc(self, account, jid): self._ui.stack.set_visible_child_name('progress') con = app.connections[account] - con.get_module('Discovery').disco_info( - jid, callback=self._disco_info_received, user_data=account) + con.get_module('Discovery').disco_muc( + jid, callback=partial(self._disco_info_received, account)) @ensure_not_destroyed - def _disco_info_received(self, result, account): + def _disco_info_received(self, account, result): if is_error_result(result): self._set_error(result) ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = cssutils>=1.0.2 keyring - nbxmpp>=0.9.91 + nbxmpp>=0.9.92 precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.14.0 ===================================== test/no_gui/unit/test_caps_cache.py ===================================== @@ -61,7 +61,7 @@ class TestCapsCache(CommonCapsTest): def test_set_and_store(self): ''' Test client_caps update gets logged into db ''' - disco_info = DiscoInfo(None, None, self.identities, self.features, []) + disco_info = DiscoInfo(None, self.identities, self.features, []) item = self.cc[self.client_caps] item.set_and_store(disco_info) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/623177a86d6adb87b6aa739f156e433b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/623177a86d6adb87b6aa739f156e433b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Raise version to 0.9.92
by Philipp Hörist 17 Aug '19

17 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7a12742a by Philipp Hörist at 2019-08-17T10:51:46Z Raise version to 0.9.92 - - - - - 1 changed file: - nbxmpp/__init__.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -15,4 +15,4 @@ from .client import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.9.91" +__version__ = "0.9.92" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7a12742aefb0b4e1e3fb5bf8ac… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7a12742aefb0b4e1e3fb5bf8ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: DiscoInfo: Add stanza attribute
by Philipp Hörist 17 Aug '19

17 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0c33075e by Philipp Hörist at 2019-08-15T17:43:16Z DiscoInfo: Add stanza attribute Make stanza object available in DiscoInfo and derive some propertys from it - - - - - 18c9fd5a by Philipp Hörist at 2019-08-16T15:39:56Z DiscoInfo: Add timestamp attribute - - - - - 2f4a79e0 by Philipp Hörist at 2019-08-16T15:40:04Z DiscoInfo: Add serialize() method - - - - - d56945cc by Philipp Hörist at 2019-08-17T10:46:28Z Use error_factory() everywhere - - - - - 6 changed files: - nbxmpp/const.py - nbxmpp/modules/discovery.py - nbxmpp/modules/iq.py - nbxmpp/modules/message.py - nbxmpp/modules/presence.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -255,36 +255,6 @@ class Role(Enum): return self == Role.NONE -class Error(Enum): - BAD_REQUEST = 'bad-request' - CONFLICT = 'conflict' - FEATURE_NOT_IMPLEMENTED = 'feature-not-implemented' - FORBIDDEN = 'forbidden' - GONE = 'gone' - INTERNAL_SERVER_ERROR = 'internal-server-error' - ITEM_NOT_FOUND = 'item-not-found' - JID_MALFORMED = 'jid-malformed' - NOT_ACCEPTABLE = 'not-acceptable' - NOT_ALLOWED = 'not-allowed' - NOT_AUTHORIZED = 'not-authorized' - PAYMENT_REQUIRED = 'payment-required' - RECIPIENT_UNAVAILABLE = 'recipient-unavailable' - REDIRECT = 'redirect' - REGISTRATION_REQUIRED = 'registration-required' - REMOTE_SERVER_NOT_FOUND = 'remote-server-not-found' - REMOTE_SERVER_TIMEOUT = 'remote-server-timeout' - RESOURCE_CONSTRAINT = 'resource-constraint' - SERVICE_UNAVAILABLE = 'service-unavailable' - SUBSCRIPTION_REQUIRED = 'subscription-required' - UNDEFINED_CONDITION = 'undefined-condition' - UNEXPECTED_REQUEST = 'unexpected-request' - POLICY_VIOLATION = 'policy-violation' - UNKNOWN_ERROR = 'unknown-error' - - def __str__(self): - return self.value - - class BookmarkStoreType(Enum): PUBSUB = 'pubsub' PRIVATE = 'private' ===================================== nbxmpp/modules/discovery.py ===================================== @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +import time import logging from nbxmpp.protocol import Iq @@ -63,11 +64,14 @@ class Discovery: return parse_disco_items(stanza) -def parse_disco_info(stanza): +def parse_disco_info(stanza, timestamp=None): idenities = [] features = [] dataforms = [] + if timestamp is None: + timestamp = time.time() + query = stanza.getQuery() for node in query.getTags('identity'): attrs = node.getAttrs() @@ -89,11 +93,11 @@ def parse_disco_info(stanza): for node in query.getTags('x', namespace=NS_DATA): dataforms.append(extend_form(node)) - return DiscoInfo(jid=stanza.getFrom(), - node=query.getAttr('node'), + return DiscoInfo(stanza=stanza, identities=idenities, features=features, - dataforms=dataforms) + dataforms=dataforms, + timestamp=timestamp) def parse_disco_items(stanza): ===================================== nbxmpp/modules/iq.py ===================================== @@ -21,7 +21,7 @@ from nbxmpp.protocol import Error as ErrorStanza from nbxmpp.protocol import ERR_BAD_REQUEST from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler -from nbxmpp.structs import ErrorProperties +from nbxmpp.util import error_factory from nbxmpp.const import IqType log = logging.getLogger('nbxmpp.m.iq') @@ -57,4 +57,4 @@ class BaseIq: properties.query = stanza.getQuery() if properties.type.is_error: - properties.error = ErrorProperties(stanza) + properties.error = error_factory(stanza) ===================================== nbxmpp/modules/message.py ===================================== @@ -19,8 +19,8 @@ import logging from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler -from nbxmpp.structs import ErrorProperties from nbxmpp.structs import StanzaIDData +from nbxmpp.util import error_factory from nbxmpp.const import MessageType log = logging.getLogger('nbxmpp.m.message') @@ -50,7 +50,7 @@ class BaseMessage: properties.stanza_id = StanzaIDData(id=id_, by=by) if properties.type.is_error: - properties.error = ErrorProperties(stanza) + properties.error = error_factory(stanza) @staticmethod def _process_message_after_base(_con, stanza, properties): ===================================== nbxmpp/modules/presence.py ===================================== @@ -21,7 +21,7 @@ from nbxmpp.protocol import Error as ErrorStanza from nbxmpp.protocol import ERR_BAD_REQUEST from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler -from nbxmpp.structs import ErrorProperties +from nbxmpp.util import error_factory from nbxmpp.const import PresenceType from nbxmpp.const import PresenceShow @@ -46,7 +46,7 @@ class BasePresence: properties.status = stanza.getStatus() if properties.type.is_error: - properties.error = ErrorProperties(stanza) + properties.error = error_factory(stanza) own_jid = self._client.get_bound_jid() properties.self_presence = own_jid == properties.jid ===================================== nbxmpp/structs.py ===================================== @@ -29,7 +29,6 @@ from nbxmpp.const import MessageType from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode from nbxmpp.const import PresenceType -from nbxmpp.const import Error from nbxmpp.const import LOCATION_DATA from nbxmpp.const import AdHocStatus @@ -119,13 +118,13 @@ DiscoItem = namedtuple('DiscoItem', 'jid name node') DiscoItem.__new__.__defaults__ = (None, None) -class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms')): +class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): __slots__ = [] - def __new__(cls, jid, node, identities, features, dataforms): - return super(DiscoInfo, cls).__new__(cls, jid, node, identities, - features, dataforms) + def __new__(cls, stanza, identities, features, dataforms, timestamp=None): + return super(DiscoInfo, cls).__new__(cls, stanza, identities, + features, dataforms, timestamp) def get_caps_hash(self): try: @@ -150,6 +149,29 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' def supports(self, feature): return feature in self.features + def serialize(self): + if self.stanza is None: + raise ValueError('Unable to serialize DiscoInfo, no stanza found') + return str(self.stanza) + + @property + def node(self): + try: + query = self.stanza.getQuery() + except Exception: + return None + + if query is not None: + return query.getAttr('node') + return None + + @property + def jid(self): + try: + return self.stanza.getFrom() + except Exception: + return None + @property def mam_namespace(self): if NS_MAM_2 in self.features: @@ -185,7 +207,7 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' @property def muc_room_name(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roomconfig_roomname') + return self._get_form_value(NS_MUC_INFO, 'muc#roomconfig_roomname') @property def muc_description(self): @@ -625,20 +647,3 @@ class PresenceProperties: return self.muc_user.role except Exception: return None - - -class ErrorProperties: - def __init__(self, stanza): - for child in stanza.getTag('error').getChildren(): - if child.getNamespace() == NS_STANZAS: - try: - self.type = Error(child.name) - except ValueError: - self.type = Error('unknown-error') - break - self.legacy_code = stanza.getErrorCode() - self.legacy_type = stanza.getErrorType() - self.message = stanza.getErrorMsg() - - def __str__(self): - return '%s %s' % (self.type, self.message) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ecfed11e600c6e9d9be64ffd7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ecfed11e600c6e9d9be64ffd7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatControl: Set search column for roster
by Philipp Hörist 16 Aug '19

16 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ff6073f by Daniel Brötzmann at 2019-08-16T18:46:00Z GroupchatControl: Set search column for roster - - - - - 623177a8 by Daniel Brötzmann at 2019-08-16T18:46:15Z GroupchatControl: Add custom search func for roster - - - - - 2 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -432,6 +432,7 @@ <property name="can_focus">True</property> <property name="border_width">1</property> <property name="headers_visible">False</property> + <property name="search_column">1</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> ===================================== gajim/groupchat_control.py ===================================== @@ -257,6 +257,8 @@ class GroupchatControl(ChatControlBase): self.setup_seclabel() + self.list_treeview.set_search_equal_func(self._search_func) + # Send file self.sendfile_button = self.xml.get_object('sendfile_button') self.sendfile_button.set_action_name('win.send-file-' + \ @@ -609,6 +611,10 @@ class GroupchatControl(ChatControlBase): desc = app.css_config.get_font('.gajim-group-row') renderer.set_property('font-desc', desc) + @staticmethod + def _search_func(model, _column, search_text, iter_): + return search_text.lower() not in model[iter_][1].lower() + @event_filter(['account', 'room_jid']) def _on_disco_update(self, _event): if self.parent_win is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3ad1d9955637b8a3d019ba2c2a99f4e57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3ad1d9955637b8a3d019ba2c2a99f4e57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 10 commits: Fix some typos
by Philipp Hörist 16 Aug '19

16 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cc7fa92b by Daniel Brötzmann at 2019-08-16T16:24:35Z Fix some typos - - - - - d465073e by Daniel Brötzmann at 2019-08-16T16:43:21Z Remove obsolete confirm_custom_status setting - - - - - 0ee804f5 by Daniel Brötzmann at 2019-08-16T16:43:32Z Remove obsolete muc_autorejoin_on_kick setting - - - - - a7abfb2f by Daniel Brötzmann at 2019-08-16T16:43:32Z Remove obsolete trayicon_blink setting - - - - - bbe6209f by Daniel Brötzmann at 2019-08-16T16:43:32Z Remove obsolete last_emoticons_dir setting - - - - - ece96c72 by Daniel Brötzmann at 2019-08-16T16:43:33Z Remove obsolete hide_avatar_of_transport setting - - - - - a7400573 by Daniel Brötzmann at 2019-08-16T16:43:33Z Remove obsolete attach_notifications_to_systray setting - - - - - 29f638cb by Daniel Brötzmann at 2019-08-16T16:43:33Z Remove obsolete allow_no_log_for setting - - - - - 35c3fb5c by Daniel Brötzmann at 2019-08-16T16:44:34Z Remove obsolete warn_when_insecure_password setting - - - - - 3ad1d995 by Daniel Brötzmann at 2019-08-16T16:46:25Z Remove obsolete dont_ack_subscription setting - - - - - 2 changed files: - gajim/command_system/implementation/standard.py - gajim/common/config.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -330,7 +330,7 @@ class StandardGroupChatCommands(CommandContainer): 'reason': reason}}) @command(raw=True, empty=True) - @doc(_("Kick user by a nick from a group chat")) + @doc(_("Kick user from group chat by nickname")) def kick(self, who, reason): if not who in app.contacts.get_nick_list(self.account, self.room_jid): raise CommandError(_("Nickname not found")) ===================================== gajim/common/config.py ===================================== @@ -171,7 +171,6 @@ class Config: 'restore_lines': [opt_int, 10, _('Number of messages from chat history to be restored when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to automatically rejoin a group chat you were disconnected from. Set to 0 to disable automatic rejoining.')], - 'muc_autorejoin_on_kick': [opt_bool, False, _('Should automatic rejoin be activated when you were kicked from a group chat?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP (previously sent messages).')], @@ -194,10 +193,8 @@ class Config: 'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.')], 'notify_on_all_muc_messages': [opt_bool, False], 'trayicon_notification_on_events': [opt_bool, True, _('Notify of events in the notification area.')], - 'trayicon_blink': [opt_bool, True, _('If disabled, Gajim will display a static event icon instead of the blinking status icon in the notification area when notifying about an event.')], 'last_save_dir': [opt_str, ''], 'last_send_dir': [opt_str, ''], - 'last_emoticons_dir': [opt_str, ''], 'last_sounds_dir': [opt_str, ''], 'tabs_position': [opt_str, 'top'], 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], @@ -234,7 +231,6 @@ class Config: 'print_status_muc_default': [opt_bool, False, _('Default Setting: Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Store XHTML messages in chat history instead of plain text messages.')], - 'hide_avatar_of_transport': [opt_bool, False, _('Don\'t show avatar for the transport itself.')], 'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show contact list window in the system taskbar.')], 'use_urgency_hint': [opt_bool, True, _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.')], 'notification_timeout': [opt_int, 5], @@ -252,14 +248,12 @@ class Config: 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.')], 'confirm_metacontacts': [opt_str, '', _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.')], 'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')], - 'confirm_custom_status': [opt_str, '', _('Show a confirmation dialog for a custom status? Empty string means never show the dialog.')], 'enable_negative_priority': [opt_bool, False, _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'show_contacts_number': [opt_bool, True, _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.')], 'treat_incoming_messages': [opt_str, 'chat', _('Can be empty, \'chat\' or \'normal\'. If not empty, all incoming messages are treated as if they were of this type.')], '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.')], - 'attach_notifications_to_systray': [opt_bool, False, _('If enabled, notification windows from notification-daemon will be attached to the notification area icon.')], '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: shttp:// 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.')], @@ -321,7 +315,7 @@ class Config: 'autoconnect': [opt_bool, False, '', True], 'autoconnect_as': [opt_str, 'online', _('Status to be used automatically when connecting. Can be \'online\', \'chat\', \'away\', \'xa\', \'dnd\' or \'invisible\'. NOTE: This option is used only if \'restore_last_status\' is disabled.'), True], 'restore_last_status': [opt_bool, False, _('If enabled, the last status will be restored.')], - 'autoauth': [opt_bool, False, _('If enabled, Contacts requesting authorization will be accepted automatically.')], + 'autoauth': [opt_bool, False, _('If enabled, contacts requesting authorization will be accepted automatically.')], 'active': [opt_bool, True, _('If disabled, this account will be disabled and will not appear in the contact list window.'), True], 'proxy': [opt_str, '', '', True], 'keyid': [opt_str, '', '', True], @@ -332,7 +326,6 @@ class Config: 'authentication_mechanisms': [opt_str, '', _('List of authentication mechanisms to try (space separated). Can contain \'ANONYMOUS\', \'EXTERNAL\', \'GSSAPI\', \'SCRAM-SHA-1-PLUS\', \'SCRAM-SHA-1\', \'DIGEST-MD5\', \'PLAIN\', \'X-MESSENGER-OAUTH2\' or \'XEP-0078\'.')], 'action_when_plaintext_connection': [opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\' or \'disconnect\'.')], 'warn_when_insecure_ssl_connection': [opt_bool, True, _('Show a warning dialog before using standard SSL library.')], - 'warn_when_insecure_password': [opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.')], 'ignore_ssl_errors': [opt_str, '', _('List of SSL errors to ignore (space separated).')], 'use_srv': [opt_bool, True, '', True], 'use_custom_host': [opt_bool, False, '', True], @@ -340,7 +333,6 @@ class Config: 'custom_host': [opt_str, '', '', True], 'sync_with_global_status': [opt_bool, False, ], 'no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you do not want to store chat history. You can also add the name of an account to disable storing chat history for this account.')], - 'allow_no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you accept to not store chat history if your contact does not want to.')], 'attached_gpg_keys': [opt_str, ''], 'keep_alives_enabled': [opt_bool, True, _('If enabled, a whitespace is sent after inactivity (keep alive).')], 'ping_alives_enabled': [opt_bool, True, _('If enabled, an XMPP ping is sent after inactivity (ping alive).')], @@ -351,7 +343,6 @@ class Config: # try for 1 minutes before giving up (aka. timeout after those seconds) 'try_connecting_for_foo_secs': [opt_int, 60], 'http_auth': [opt_str, 'ask'], # yes, no, ask - 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround.')], # proxy65 for FT 'file_transfer_proxies': [opt_str, ''], 'use_ft_proxies': [opt_bool, False, _('If enabled, Gajim will use your IP and proxies defined in \'file_transfer_proxies\' option for file transfers.'), True], @@ -477,7 +468,7 @@ class Config: 'contact_connected': [False, 'connected.wav'], 'contact_disconnected': [False, 'disconnected.wav'], 'message_sent': [False, 'sent.wav'], - 'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in \'muc_highlight_words\' your nickname is mentioned.')], + 'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in \'muc_highlight_words\' or your nickname is mentioned.')], 'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any group chat message arrives.')], } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7207b824927ebf9cbc2a958b4dd0ef174… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7207b824927ebf9cbc2a958b4dd0ef174… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] update translations
by Yann Leboulanger 15 Aug '19

15 Aug '19

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7207b824 by Yann Leboulanger at 2019-08-15T11:09:13Z update translations - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7207b824927ebf9cbc2a958b4dd0ef174d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7207b824927ebf9cbc2a958b4dd0ef174d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatInfo: Apply some text styling
by Philipp Hörist 15 Aug '19

15 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 564068c2 by Daniel Brötzmann at 2019-08-15T08:13:02Z GroupchatInfo: Apply some text styling - - - - - 6c9c4c1a by Daniel Brötzmann at 2019-08-15T08:13:30Z ChatBanners: Unify display of contact name - - - - - 7 changed files: - gajim/chat_control.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/gui/groupchat_info_scrolled.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/groupchat_info.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -732,8 +732,6 @@ class ChatControl(ChatControlBase): status = contact.status if status is not None: - banner_name_label.set_ellipsize(Pango.EllipsizeMode.END) - self.banner_status_label.set_ellipsize(Pango.EllipsizeMode.END) status_reduced = helpers.reduce_chars_newlines(status, max_lines=1) else: status_reduced = '' ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -364,15 +364,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="hbox3004"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="avatar_image"> @@ -395,17 +394,22 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="row_spacing">2</property> + <property name="row_spacing">3</property> + <property name="column_spacing">3</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="name">ChatControl-BannerNameLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><span weight="heavy" size="large">Contact name</span></property> - <property name="use_markup">True</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label">Contact name</property> + <property name="ellipsize">end</property> <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -418,12 +422,16 @@ <property name="name">ChatControl-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> <property name="label">label</property> - <property name="use_markup">True</property> <property name="selectable">True</property> + <property name="ellipsize">end</property> <property name="xalign">0</property> <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -115,19 +115,21 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="hbox3024"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> <object class="GtkImage" id="gc_banner_status_image"> + <property name="width_request">48</property> + <property name="height_request">48</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -136,10 +138,15 @@ <property name="name">GroupChatControl-BannerNameLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><span weight="heavy" size="large">room jid</span></property> - <property name="use_markup">True</property> + <property name="hexpand">True</property> + <property name="label">Group Chat Name</property> <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -8,22 +8,6 @@ <property name="halign">center</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="name_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Name</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> <child> <object class="GtkLabel" id="address_label"> <property name="visible">True</property> @@ -88,22 +72,6 @@ <property name="top_attach">4</property> </packing> </child> - <child> - <object class="GtkLabel" id="name"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="max_width_chars">40</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> <child> <object class="GtkLabel" id="address"> <property name="visible">True</property> @@ -206,16 +174,17 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> + <property name="halign">center</property> <property name="valign">start</property> <property name="label" translatable="yes">Configuration</property> <style> - <class name="dim-label"/> + <class name="bold16"/> </style> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">9</property> + <property name="width">2</property> </packing> </child> <child> @@ -307,7 +276,24 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkLabel" id="name"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">40</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -9,11 +9,6 @@ .gajim-state-tab-muc-msg { color: rgb(0, 0, 205) } -.gajim-banner { - font-size: 13pt; - font-weight: 700 - } - .chatcontrol-actionbar-button { padding: 0px 5px 0px 5px; @@ -43,8 +38,6 @@ .chatcontrol-separator {margin-bottom: 5px;} -#SubjectPopover box { padding: 10px; } - .link-button { min-height: 0px } /* VCardWindow */ ===================================== gajim/groupchat_control.py ===================================== @@ -280,6 +280,7 @@ class GroupchatControl(ChatControlBase): self.banner_actionbar = self.xml.get_object('banner_actionbar') self.hide_roster_button = Gtk.Button.new_from_icon_name( 'go-next-symbolic', Gtk.IconSize.MENU) + self.hide_roster_button.set_valign(Gtk.Align.CENTER) self.hide_roster_button.connect('clicked', lambda *args: self.show_roster()) self.banner_actionbar.pack_end(self.hide_roster_button) @@ -1072,7 +1073,7 @@ class GroupchatControl(ChatControlBase): if self.is_connected: if self.contact.avatar_sha: surface = app.interface.get_avatar(self.contact, - AvatarSize.ROSTER, + AvatarSize.CHAT, self.scale_factor) banner_status_img.set_from_surface(surface) return @@ -1103,7 +1104,6 @@ class GroupchatControl(ChatControlBase): Draw the text in the fat line at the top of the window that houses the room jid """ - self.name_label.set_ellipsize(Pango.EllipsizeMode.END) self.name_label.set_text(self.room_name) def _nec_update_avatar(self, obj): ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -144,7 +144,6 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): has_name = bool(info.muc_name) self._ui.name.set_text(info.muc_name or '') self._ui.name.set_visible(has_name) - self._ui.name_label.set_visible(has_name) # Set description has_desc = bool(info.muc_description) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/05cad259e3d5209f17df15602528d706e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/05cad259e3d5209f17df15602528d706e… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits