Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Make some vars private
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ad38d53 by Philipp Hörist at 2018-09-11T18:00:34Z Make some vars private - - - - - 3080946e by Philipp Hörist at 2018-09-11T20:24:08Z Update pylintrc - - - - - 09c51835 by Philipp Hörist at 2018-09-11T20:25:55Z Fix pylint errors in common/modules - - - - - 30 changed files: - gajim/common/modules/__init__.py - gajim/common/modules/annotations.py - gajim/common/modules/atom.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/caps.py - gajim/common/modules/carbons.py - gajim/common/modules/date_and_time.py - gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/metacontacts.py - gajim/common/modules/misc.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/receipts.py - gajim/common/modules/register.py - gajim/common/modules/roster.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/security_labels.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dad7def794f545382b99ba53f8dda4ce5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dad7def794f545382b99ba53f8dda4ce5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch error if no translation is found
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dad7def7 by Philipp Hörist at 2018-09-11T17:37:48Z Catch error if no translation is found - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -136,7 +136,11 @@ if hasattr(locale, 'bindtextdomain'): gettext.textdomain(DOMAIN) gettext.install(DOMAIN, _localedir) -_ = gettext.translation(DOMAIN, _localedir).gettext + +try: + _ = gettext.translation(DOMAIN, _localedir).gettext +except OSError: + _ = gettext.gettext if gettext._translations: _translations = list(gettext._translations.values())[0] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad7def794f545382b99ba53f8dda4ce52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad7def794f545382b99ba53f8dda4ce52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Add mypy.ini
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7140c2d2 by Philipp Hörist at 2018-09-10T22:36:54Z Add mypy.ini - - - - - bcf2a377 by Philipp Hörist at 2018-09-10T22:37:00Z Remove unnecessary code NetworkIncomingEvent defines base_network_events and generate() already - - - - - ca9b4cb5 by Philipp Hörist at 2018-09-10T22:47:54Z Add annotations for modules/__init__.py - - - - - 2649b3d0 by Philipp Hörist at 2018-09-10T22:47:59Z Add annotations to modules/util.py - - - - - 21672fad by Philipp Hörist at 2018-09-11T17:27:10Z Refactor i18n - Make _() available, so other modules can import it from i18n, we need this because mypy cant handle _() in the builtins namespace - - - - - a34bf54c by Philipp Hörist at 2018-09-11T17:29:08Z Fix mypy error regarding _() - - - - - 19 changed files: - gajim/common/i18n.py - gajim/common/modules/__init__.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/misc.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/software_version.py - gajim/common/modules/util.py - gajim/common/modules/vcard_temp.py - + mypy.ini Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -29,45 +29,6 @@ direction_mark = '\u200E' _translations = None -def initialize(): - global _translations - try: - locale.setlocale(locale.LC_ALL, '') - except locale.Error as error: - print(error) - - initialize_lang() - set_i18n_env() - - localedir = get_locale_dir() - if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, localedir) - - gettext.install(DOMAIN, localedir) - if gettext._translations: - _translations = list(gettext._translations.values())[0] - else: - _translations = gettext.NullTranslations() - - -def set_i18n_env(): - if os.name == 'nt': - os.environ['LANG'] = LANG - - -def initialize_lang(): - global LANG - try: - # en_US, fr_FR, el_GR etc.. - default = locale.getdefaultlocale()[0] - if default is None: - # LC_ALL=C - return - LANG = default[:2] - except (ValueError, locale.Error): - pass - - def get_locale_dir(): if os.name == 'nt': return None @@ -75,9 +36,9 @@ def get_locale_dir(): path = gettext.find(DOMAIN) if path: # extract localedir from localedir/language/LC_MESSAGES/domain.mo - path, tail = os.path.split(path) - path, tail = os.path.split(path) - localedir, tail = os.path.split(path) + path = os.path.split(path)[1] + path = os.path.split(path)[1] + localedir = os.path.split(path)[1] elif os.path.exists('/app/share/run-as-flatpak'): # Check if we run as flatpak return '/app/share/locale' @@ -110,7 +71,7 @@ def paragraph_direction_mark(text): bidi = unicodedata.bidirectional(char) if bidi == 'L': return '\u200E' - elif bidi == 'AL' or bidi == 'R': + if bidi in ('AL', 'R'): return '\u200F' return '\u200E' @@ -133,14 +94,15 @@ def Q_(text): """ text = _(text) if text.startswith('?'): - qualifier, text = text.split(':', 1) + text = text.split(':', 1)[1] return text def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): """ Use as: - i18n.ngettext('leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c') + i18n.ngettext( + 'leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c') In other words this is a hack to ngettext() to support %s %d etc.. """ @@ -152,4 +114,31 @@ def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): return text -initialize() +try: + locale.setlocale(locale.LC_ALL, '') +except locale.Error as error: + print(error) + +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 + +if os.name == 'nt': + os.environ['LANG'] = LANG + +_localedir = get_locale_dir() +if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, _localedir) +gettext.textdomain(DOMAIN) + +gettext.install(DOMAIN, _localedir) +_ = gettext.translation(DOMAIN, _localedir).gettext + +if gettext._translations: + _translations = list(gettext._translations.values())[0] +else: + _translations = gettext.NullTranslations() ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -13,6 +13,9 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging +from typing import List # noqa +from typing import Dict # noqa +from typing import Any # noqa from importlib import import_module from pathlib import Path from unittest.mock import MagicMock @@ -21,8 +24,8 @@ log = logging.getLogger('gajim.c.m') ZEROCONF_MODULES = ['adhoc_commands', 'receipts', 'discovery'] -imported_modules = [] -_modules = {} +imported_modules = [] # type: List[tuple] +_modules = {} # type: Dict[str, Dict[str, Any]] for file in Path(__file__).parent.iterdir(): if file.stem == '__init__': @@ -40,30 +43,30 @@ for file in Path(__file__).parent.iterdir(): class ModuleMock: - def __init__(self, name): + def __init__(self, name: str) -> None: self._name = name # HTTPUpload, .. self.available = False # Blocking - self.blocked = [] + self.blocked = [] # type: List[Any] # Privacy Lists - self.blocked_contacts = [] - self.blocked_groups = [] + self.blocked_contacts = [] # type: List[Any] + self.blocked_groups = [] # type: List[Any] self.blocked_all = False # Delimiter self.delimiter = '::' # Bookmarks - self.bookmarks = {} + self.bookmarks = {} # type: Dict[Any, Any] # Various Modules self.supported = False - def __getattr__(self, key): + def __getattr__(self, key: str) -> MagicMock: return MagicMock() @@ -101,7 +104,7 @@ def unregister_single(con, name): del _modules[con.name][name] -def get(account, name): +def get(account: str, name: str) -> Any: try: return _modules[account][name] except KeyError: ===================================== gajim/common/modules/adhoc_commands.py ===================================== --- a/gajim/common/modules/adhoc_commands.py +++ b/gajim/common/modules/adhoc_commands.py @@ -20,11 +20,14 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging + import nbxmpp +from gajim.common import app from gajim.common import helpers +from gajim.common.i18n import _ from gajim.common.modules import dataforms -from gajim.common import app + from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.commands') @@ -556,17 +559,14 @@ class AdHocCommands: class AdHocCommandError(NetworkIncomingEvent): name = 'adhoc-command-error' - base_network_events = [] class AdHocCommandListReceived(NetworkIncomingEvent): name = 'adhoc-command-list' - base_network_events = [] class AdHocCommandActionResponse(NetworkIncomingEvent): name = 'adhoc-command-action-response' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/blocking.py ===================================== --- a/gajim/common/modules/blocking.py +++ b/gajim/common/modules/blocking.py @@ -160,7 +160,6 @@ class Blocking: class BlockingEvent(NetworkIncomingEvent): name = 'blocking' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -320,7 +320,6 @@ class Bookmarks: class BookmarksReceivedEvent(NetworkIncomingEvent): name = 'bookmarks-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -133,10 +133,6 @@ class EntityTime: class TimeResultReceivedEvent(NetworkIncomingEvent): name = 'time-result-received' - base_network_events = [] - - def generate(self): - return True def get_instance(*args, **kwargs): ===================================== gajim/common/modules/http_auth.py ===================================== --- a/gajim/common/modules/http_auth.py +++ b/gajim/common/modules/http_auth.py @@ -74,7 +74,6 @@ class HTTPAuth: class HttpAuthReceivedEvent(NetworkIncomingEvent): name = 'http-auth-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/modules/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -421,7 +421,6 @@ class UploadAbortedException(Exception): class HTTPUploadProgressEvent(NetworkIncomingEvent): name = 'httpupload-progress' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/misc.py ===================================== --- a/gajim/common/modules/misc.py +++ b/gajim/common/modules/misc.py @@ -19,6 +19,7 @@ import logging import nbxmpp from gajim.common import app +from gajim.common.i18n import _ from gajim.common.modules.date_and_time import parse_datetime log = logging.getLogger('gajim.c.m.misc') ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -219,7 +219,6 @@ class AbstractPEPData: class PEPReceivedEvent(NetworkIncomingEvent): name = 'pep-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/ping.py ===================================== --- a/gajim/common/modules/ping.py +++ b/gajim/common/modules/ping.py @@ -109,17 +109,14 @@ class Ping: class PingSentEvent(NetworkIncomingEvent): name = 'ping-sent' - base_network_events = [] class PingReplyEvent(NetworkIncomingEvent): name = 'ping-reply' - base_network_events = [] class PingErrorEvent(NetworkIncomingEvent): name = 'ping-error' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/privacylists.py ===================================== --- a/gajim/common/modules/privacylists.py +++ b/gajim/common/modules/privacylists.py @@ -445,17 +445,14 @@ class PrivacyLists: class PrivacyListsReceivedEvent(NetworkIncomingEvent): name = 'privacy-lists-received' - base_network_events = [] class PrivacyListReceivedEvent(NetworkIncomingEvent): name = 'privacy-list-received' - base_network_events = [] class PrivacyListRemovedEvent(NetworkIncomingEvent): name = 'privacy-list-removed' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -263,7 +263,6 @@ class PubSub: class PubSubConfigReceivedEvent(NetworkIncomingEvent): name = 'pubsub-config-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- a/gajim/common/modules/roster_item_exchange.py +++ b/gajim/common/modules/roster_item_exchange.py @@ -120,7 +120,6 @@ class RosterItemExchange: class RosterItemExchangeEvent(NetworkIncomingEvent): name = 'roster-item-exchange-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/search.py ===================================== --- a/gajim/common/modules/search.py +++ b/gajim/common/modules/search.py @@ -106,12 +106,10 @@ class Search: class SearchFormReceivedEvent(NetworkIncomingEvent): name = 'search-form-received' - base_network_events = [] class SearchResultReceivedEvent(NetworkIncomingEvent): name = 'search-result-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/software_version.py ===================================== --- a/gajim/common/modules/software_version.py +++ b/gajim/common/modules/software_version.py @@ -100,10 +100,6 @@ class SoftwareVersion: class VersionResultReceivedEvent(NetworkIncomingEvent): name = 'version-result-received' - base_network_events = [] - - def generate(self): - return True def get_instance(*args, **kwargs): ===================================== gajim/common/modules/util.py ===================================== --- a/gajim/common/modules/util.py +++ b/gajim/common/modules/util.py @@ -14,12 +14,15 @@ # Util module +from typing import Union + import nbxmpp from gajim.common import app -def is_self_message(message, groupchat=False): +def is_self_message(message: nbxmpp.Node, + groupchat: bool = False) -> bool: if groupchat: return False frm = message.getFrom() @@ -27,7 +30,9 @@ def is_self_message(message, groupchat=False): return frm.bareMatch(to) -def is_muc_pm(message, jid, groupchat=False): +def is_muc_pm(message: nbxmpp.Node, + jid: nbxmpp.JID, + groupchat: bool = False) -> bool: if groupchat: return False muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) @@ -41,10 +46,10 @@ def is_muc_pm(message, jid, groupchat=False): return False -def from_xs_boolean(value): +def from_xs_boolean(value: Union[str, bool]) -> bool: # Convert a xs:boolean ('true', 'false', '1', '0', '') # to a python boolean (True, False) - if value in (True, False): + if isinstance(value, bool): return value if value in ('1', 'true'): @@ -58,16 +63,16 @@ def from_xs_boolean(value): 'Cant convert %s to python boolean' % value) -def to_xs_boolean(value): +def to_xs_boolean(value: Union[bool, None]) -> str: # Convert to xs:boolean ('true', 'false') # from a python boolean (True, False) or None - if value in ('true', 'false'): - return value - if value is True: return 'true' - if value in (False, None): + if value is False: + return 'false' + + if value is None: return 'false' raise ValueError( ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -310,17 +310,14 @@ class VCardTemp: class VcardPublishedEvent(NetworkIncomingEvent): name = 'vcard-published' - base_network_events = [] class VcardNotPublishedEvent(NetworkIncomingEvent): name = 'vcard-not-published' - base_network_events = [] class VcardReceivedEvent(NetworkIncomingEvent): name = 'vcard-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== mypy.ini ===================================== --- /dev/null +++ b/mypy.ini @@ -0,0 +1,10 @@ +[mypy] +python_version = 3.5 +disallow_incomplete_defs = True + +[mypy-nbxmpp.*] +ignore_missing_imports = True + +[mypy-gi.repository.*] +ignore_missing_imports = True + View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ac31ba5b613d41441c98b4f47e4c9c55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ac31ba5b613d41441c98b4f47e4c9c55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update .gitignore
by Philipp Hörist 10 Sep '18

10 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6ac31ba5 by Philipp Hörist at 2018-09-10T22:03:12Z Update .gitignore - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ po/stamp-it stamp-h1 Makefile __pycache__/ +.mypy_cache/ build/ dist/ gajim.egg-info/ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ac31ba5b613d41441c98b4f47e4c9c559… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ac31ba5b613d41441c98b4f47e4c9c559… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add debug output for NetworkMonitor
by Philipp Hörist 10 Sep '18

10 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0fba2b8a by Philipp Hörist at 2018-09-10T18:27:22Z Add debug output for NetworkMonitor - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2500,6 +2500,7 @@ class Interface: # same state, not only on change. return self.network_state = connected + log.debug('NetworkMonitor state change: %s', connected) if connected: for connection in app.connections.values(): if connection.connected <= 0 and connection.time_to_reconnect: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0fba2b8a58fe47d406a2b4f58fbfa6abd9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0fba2b8a58fe47d406a2b4f58fbfa6abd9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix subscribing to contact
by Philipp Hörist 09 Sep '18

09 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f82cd95f by Philipp Hörist at 2018-09-09T15:43:17Z Fix subscribing to contact Fixes #9321 - - - - - 1 changed file: - gajim/common/modules/presence.py Changes: ===================================== gajim/common/modules/presence.py ===================================== --- a/gajim/common/modules/presence.py +++ b/gajim/common/modules/presence.py @@ -52,6 +52,9 @@ class Presence: return log.info('Received from %s', stanza.getFrom()) + if nbxmpp.isErrorNode(stanza): + log.info('Error:\n%s', stanza) + app.nec.push_incoming_event( NetworkEvent('raw-pres-received', conn=self._con, @@ -166,7 +169,7 @@ class Presence: item.addChild('group').setData(group) self._con.connection.send(iq) - self.send_presence(jid, 'subscribe', msg) + self.send_presence(jid, 'subscribe', status=msg) def get_presence(self, to=None, typ=None, priority=None, show=None, status=None, nick=None, caps=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f82cd95f2c0bcd1dd6ee1f0c0aedcc1abf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f82cd95f2c0bcd1dd6ee1f0c0aedcc1abf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Request blocking list on connect
by Philipp Hörist 09 Sep '18

09 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 43270400 by Philipp Hörist at 2018-09-09T14:50:55Z Request blocking list on connect - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -580,11 +580,9 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, # ask our VCard self.get_module('VCardTemp').request_vcard() - # Get bookmarks self.get_module('Bookmarks').get_bookmarks() - - # Get annotations from private namespace self.get_module('Annotations').get_annotations() + self.get_module('Blocking').get_blocking_list() # Inform GUI we just signed in app.nec.push_incoming_event(SignedInEvent(None, conn=self)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/432704005d2bd161d7400b16594ce9b53c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/432704005d2bd161d7400b16594ce9b53c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Builder class
by Philipp Hörist 09 Sep '18

09 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4970519 by Philipp Hörist at 2018-09-09T13:29:55Z Add Builder class - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -31,6 +31,47 @@ _icon_theme.append_search_path(configpaths.get('ICONS')) log = logging.getLogger('gajim.gtk.util') +class Builder: + def __init__(self, filename=None, widget=None): + self._builder = Gtk.Builder() + self._builder.set_translation_domain(i18n.DOMAIN) + + file_path = os.path.join(configpaths.get('GUI'), filename) + + if sys.platform == "win32": + # This is a workaround for non working translation on Windows + tree = ET.parse(file_path) + for node in tree.iter(): + if 'translatable' in node.attrib: + node.text = _(node.text) + xml_text = ET.tostring(tree.getroot(), + encoding='unicode', + method='xml') + + if widget is not None: + self._builder.add_objects_from_string(xml_text, [widget]) + else: + # Workaround + # https://gitlab.gnome.org/GNOME/pygobject/issues/255 + Gtk.Builder.__mro__[1].add_from_string( + self._builder, xml_text, len(xml_text.encode("utf-8"))) + else: + if widget is not None: + self._builder.add_objects_from_file(file_path, [widget]) + else: + self._builder.add_from_file(file_path) + + def __getattr__(self, name): + try: + return getattr(self._builder, name) + except AttributeError: + return self._builder.get_object(name) + + +def get_builder(file_name, widget=None): + return Builder(file_name, widget) + + def load_icon(icon_name, widget, size=16, pixbuf=False, flags=Gtk.IconLookupFlags.FORCE_SIZE): @@ -49,37 +90,6 @@ def load_icon(icon_name, widget, size=16, pixbuf=False, log.error('Unable to load icon %s: %s', icon_name, str(e)) -def get_builder(file_name, widget=None): - file_path = os.path.join(configpaths.get('GUI'), file_name) - - builder = Gtk.Builder() - builder.set_translation_domain(i18n.DOMAIN) - - if sys.platform == "win32": - # This is a workaround for non working translation on Windows - tree = ET.parse(file_path) - for node in tree.iter(): - if 'translatable' in node.attrib: - node.text = _(node.text) - xml_text = ET.tostring(tree.getroot(), - encoding='unicode', - method='xml') - - if widget is not None: - builder.add_objects_from_string(xml_text, [widget]) - else: - # Workaround - # https://gitlab.gnome.org/GNOME/pygobject/issues/255 - Gtk.Builder.__mro__[1].add_from_string( - builder, xml_text, len(xml_text.encode("utf-8"))) - else: - if widget is not None: - builder.add_objects_from_file(file_path, [widget]) - else: - builder.add_from_file(file_path) - return builder - - def get_iconset_name_for(name): if name == 'not in roster': name = 'notinroster' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4970519654ef08a3c13fb84bc4ccf9a21… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4970519654ef08a3c13fb84bc4ccf9a21… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix fallback for bookmark name
by Philipp Hörist 08 Sep '18

08 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a20cb59 by Philipp Hörist at 2018-09-08T21:55:31Z Fix fallback for bookmark name - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -305,10 +305,11 @@ class Bookmarks: None, account=self._account)) def get_name_from_bookmark(self, jid): + fallback = jid.split('@')[0] try: - return self.bookmarks[jid]['name'] + return self.bookmarks[jid]['name'] or fallback except KeyError: - return jid.split('@')[0] + return fallback def purge_pubsub_bookmarks(self): log.info('Purge/Delete Bookmarks on PubSub, ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a20cb5997e635d12ccc5d72080ac0c38a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a20cb5997e635d12ccc5d72080ac0c38a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve speed of groupchat roster
by Philipp Hörist 08 Sep '18

08 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27dd36cc by Philipp Hörist at 2018-09-08T18:49:26Z Improve speed of groupchat roster - Save reference to contact in a dict instead of iterating the whole model - Sort roster only once after all contacts have been added to the roster - Speed up get_gc_contact() Fixes #9334 - - - - - 2 changed files: - gajim/common/contacts.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -643,10 +643,10 @@ class GC_Contacts(): return list(self._rooms[room_jid].keys()) def get_gc_contact(self, room_jid, nick): - nick_list = self.get_nick_list(room_jid) - if not nick in nick_list: + try: + return self._rooms[room_jid][nick] + except KeyError: return None - return self._rooms[room_jid][nick] def is_gc_contact(self, jid): """ ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -399,11 +399,15 @@ class GroupchatControl(ChatControlBase): hpaned_position = app.config.get('gc-hpaned-position') self.hpaned.set_position(hpaned_position) + # Holds the Gtk.TreeRowReference for each contact + self._contact_refs = {} + # Holds the Gtk.TreeRowReference for each role + self._role_refs = {} + #status_image, shown_nick, type, nickname, avatar self.columns = [Gtk.Image, str, str, str, Gtk.Image] self.model = Gtk.TreeStore(*self.columns) self.model.set_sort_func(Column.NICK, self.tree_compare_iters) - self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) # columns column = Gtk.TreeViewColumn() @@ -1297,16 +1301,11 @@ class GroupchatControl(ChatControlBase): app.interface.roster.draw_contact(self.room_jid, self.account) def get_contact_iter(self, nick): - role_iter = self.model.get_iter_first() - while role_iter: - user_iter = self.model.iter_children(role_iter) - while user_iter: - if nick == self.model[user_iter][Column.NICK]: - return user_iter - else: - user_iter = self.model.iter_next(user_iter) - role_iter = self.model.iter_next(role_iter) - return None + try: + ref = self._contact_refs[nick] + return self.model.get_iter(ref.get_path()) + except KeyError: + return None def print_old_conversation(self, text, contact='', tim=None, xhtml = None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): @@ -1606,6 +1605,9 @@ class GroupchatControl(ChatControlBase): app.gc_connected[self.account][self.room_jid] = True ChatControlBase.got_connected(self) + + # Sort model and assign it to treeview + self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) self.list_treeview.set_model(self.model) self.list_treeview.expand_all() # We don't redraw the whole banner here, because only icon change @@ -1621,7 +1623,12 @@ class GroupchatControl(ChatControlBase): def got_disconnected(self): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) + + self.model.set_sort_column_id(Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, + Gtk.SortType.ASCENDING) self.list_treeview.set_model(None) + self._contact_refs = {} + self._role_refs = {} self.model.clear() nick_list = app.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: @@ -2028,7 +2035,7 @@ class GroupchatControl(ChatControlBase): self.update_actions() def add_contact_to_roster(self, nick, show, role, affiliation, status, - jid='', avatar_sha=None): + jid='', avatar_sha=None): role_name = helpers.get_uf_role(role, plural=True) resource = '' @@ -2042,43 +2049,57 @@ class GroupchatControl(ChatControlBase): name = nick + # Add Contact + gc_contact = app.contacts.create_gc_contact( + room_jid=self.room_jid, account=self.account, + name=nick, show=show, status=status, role=role, + affiliation=affiliation, jid=j, resource=resource, + avatar_sha=avatar_sha) + app.contacts.add_gc_contact(self.account, gc_contact) + + # Create Role role_iter = self.get_role_iter(role) if not role_iter: - image = gtkgui_helpers.get_image_from_icon_name('closed', self.scale_factor) - role_iter = self.model.append(None, - [image, role, 'role', role_name, None] + [None] * self.nb_ext_renderers) + image = gtkgui_helpers.get_image_from_icon_name('closed', + self.scale_factor) + ext_columns = [None] * self.nb_ext_renderers + row = [image, role, 'role', role_name, None] + ext_columns + role_iter = self.model.append(None, row) + self._role_refs[role] = Gtk.TreeRowReference( + self.model, self.model.get_path(role_iter)) self.draw_all_roles() - iter_ = self.model.append(role_iter, [None, nick, 'contact', name, None] + \ - [None] * self.nb_ext_renderers) - if not nick in app.contacts.get_nick_list(self.account, - self.room_jid): - gc_contact = app.contacts.create_gc_contact( - room_jid=self.room_jid, account=self.account, - name=nick, show=show, status=status, role=role, - affiliation=affiliation, jid=j, resource=resource, - avatar_sha=avatar_sha) - app.contacts.add_gc_contact(self.account, gc_contact) - else: - gc_contact = app.contacts.get_gc_contact(self.account, self.room_jid, nick) + + # Avatar + image = None + if app.config.get('show_avatars_in_roster'): + surface = app.interface.get_avatar( + avatar_sha, AvatarSize.ROSTER, self.scale_factor) + image = Gtk.Image.new_from_surface(surface) + + # Add to model + ext_columns = [None] * self.nb_ext_renderers + row = [image, nick, 'contact', name, None] + ext_columns + iter_ = self.model.append(role_iter, row) + self._contact_refs[nick] = Gtk.TreeRowReference( + self.model, self.model.get_path(iter_)) + self.draw_contact(nick) - self.draw_avatar(gc_contact) - if nick == self.nick: # we became online + if nick == self.nick: # we became online self.got_connected() if self.list_treeview.get_model(): - self.list_treeview.expand_row((self.model.get_path(role_iter)), False) + self.list_treeview.expand_row( + (self.model.get_path(role_iter)), False) if self.is_continued: self.draw_banner_text() return iter_ def get_role_iter(self, role): - role_iter = self.model.get_iter_first() - while role_iter: - role_name = self.model[role_iter][Column.NICK] - if role == role_name: - return role_iter - role_iter = self.model.iter_next(role_iter) - return None + try: + ref = self._role_refs[role] + return self.model.get_iter(ref.get_path()) + except KeyError: + return None def remove_contact(self, nick): """ @@ -2087,13 +2108,20 @@ class GroupchatControl(ChatControlBase): iter_ = self.get_contact_iter(nick) if not iter_: return - gc_contact = app.contacts.get_gc_contact(self.account, self.room_jid, - nick) + gc_contact = app.contacts.get_gc_contact( + self.account, self.room_jid, nick) if gc_contact: app.contacts.remove_gc_contact(self.account, gc_contact) + parent_iter = self.model.iter_parent(iter_) + if parent_iter is None: + # This is not a child, should never happen + return self.model.remove(iter_) + del self._contact_refs[nick] if self.model.iter_n_children(parent_iter) == 0: + role = self.model[parent_iter][Column.NICK] + del self._role_refs[role] self.model.remove(parent_iter) def _message_sent(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27dd36cca3464e35f6343cf7f65fd78ea6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27dd36cca3464e35f6343cf7f65fd78ea6… 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