Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Flatpak: portal is used to access home directory
by Philipp Hörist 26 May '18

26 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13e838b4 by André Apitzsch at 2018-05-26T13:16:01+02:00 Flatpak: portal is used to access home directory - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -12,7 +12,6 @@ "--socket=x11", "--socket=wayland", "--socket=pulseaudio", - "--filesystem=home", "--system-talk-name=org.freedesktop.GeoClue2", "--system-talk-name=org.freedesktop.login1", "--talk-name=org.gnome.ScreenSaver", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13e838b4c9c17331ac10811bea5e802c63… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13e838b4c9c17331ac10811bea5e802c63… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove python3-avahi dependency
by Philipp Hörist 25 May '18

25 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c70b883f by Philipp Hörist at 2018-05-25T22:37:28+02:00 Remove python3-avahi dependency - - - - - 2 changed files: - README.md - org.gajim.Gajim.json Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ - python3-pil (pillow) for support of webp avatars - python3-crypto to enable End to end encryption - python3-gnupg to enable GPG encryption -- For zeroconf (bonjour) you need dbus-glib, python-avahi +- For zeroconf (bonjour) you need python3-dbus - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required. ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -247,34 +247,6 @@ } ] }, - /* Zeroconf support */ - { - "name": "avahi", - "cleanup": [ - "/bin", - "/lib/avahi", - "/share/avahi", - "avahi.mo" - ], - "config-opts": [ - "--with-distro=none", - "--disable-qt3", - "--disable-qt4", - "--disable-libdaemon", - "--disable-pygtk", - "--disable-gdbm", - "--disable-mono", - "--disable-monodoc", - "--disable-manpages" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/lathiat/avahi/archive/v0.7.tar.gz", - "sha256": "fd45480cef0559b3eab965ea3ad4fe2d7a8f27db32c851a032ee0b487c378329" - } - ] - }, /* OMEMO support */ { "name": "protobuf", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c70b883fdd8fed870ddc7686aef8dbf761… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c70b883fdd8fed870ddc7686aef8dbf761… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Get rid of python-avahi
by Philipp Hörist 25 May '18

25 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2d6e7d2e by lovetox at 2018-05-23T11:47:13+02:00 Get rid of python-avahi - - - - - 5 changed files: - gajim/common/app.py - gajim/common/zeroconf/zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py - + gajim/common/zeroconf/zeroconf_avahi_const.py - gajim/features_window.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -145,7 +145,7 @@ gajim_optional_features = {} caps_hash = {} _dependencies = { - 'AVAHI': False, + 'PYTHON-DBUS': False, 'PYBONJOUR': False, 'PYCRYPTO': False, 'PYGPG': False, @@ -166,7 +166,7 @@ def is_installed(dependency): return _dependencies['PYGPG'] and _dependencies['GPG_BINARY'] if dependency == 'ZEROCONF': # Alias for checking zeroconf libs - return _dependencies['AVAHI'] or _dependencies['PYBONJOUR'] + return _dependencies['PYTHON-DBUS'] or _dependencies['PYBONJOUR'] return _dependencies[dependency] def is_flatpak(): @@ -184,8 +184,8 @@ def detect_dependencies(): import pybonjour _dependencies['PYBONJOUR'] = True else: - import avahi - _dependencies['AVAHI'] = True + import dbus + _dependencies['PYTHON-DBUS'] = True except Exception: pass ===================================== gajim/common/zeroconf/zeroconf.py ===================================== --- a/gajim/common/zeroconf/zeroconf.py +++ b/gajim/common/zeroconf/zeroconf.py @@ -38,7 +38,7 @@ class ConstantRI(IntEnum): def test_avahi(): try: - import avahi + import dbus except ImportError: return False return True ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -26,11 +26,11 @@ except ImportError: pass from gajim.common.zeroconf.zeroconf import Constant, ConstantRI +from gajim.common.zeroconf.zeroconf_avahi_const import * class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, disconnected_CB, error_CB, name, host, port): - self.avahi = None self.domain = None # specific domain to browse self.stype = '_presence._tcp' self.port = port # listening port that gets announced @@ -81,7 +81,7 @@ class Zeroconf: # synchronous resolving self.server.ResolveService( int(interface), int(protocol), name, stype, - domain, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), + domain, Protocol.UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved_callback, error_handler=self.error_callback1) @@ -116,8 +116,8 @@ class Zeroconf: stype, domain, dbus.UInt32(0)) self.service_browser = dbus.Interface(self.bus.get_object( - self.avahi.DBUS_NAME, object_path), - self.avahi.DBUS_INTERFACE_SERVICE_BROWSER) + DBUS_NAME, object_path), + DBUS_INTERFACE_SERVICE_BROWSER) self.service_browser.connect_to_signal('ItemNew', self.new_service_callback) self.service_browser.connect_to_signal('ItemRemove', @@ -146,6 +146,30 @@ class Zeroconf: txt_dict[key] = val return txt_dict + @staticmethod + def string_to_byte_array(s): + s = s.encode('utf-8') + r = [] + + for c in s: + r.append(dbus.Byte(c)) + + return r + + def dict_to_txt_array(self, txt_dict): + l = [] + + for k,v in txt_dict.items(): + if isinstance(k, str): + k = k.encode('utf-8') + + if isinstance(v, str): + v = v.encode('utf-8') + + l.append(self.string_to_byte_array("%s=%s" % (k,v))) + + return l + def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): log.debug('Service data for service %s in domain %s on %i.%i:' @@ -222,22 +246,19 @@ class Zeroconf: def server_state_changed_callback(self, state, error): log.debug('server state changed to %s' % state) - if state == self.avahi.SERVER_RUNNING: + if state == ServerState.RUNNING: self.create_service() - elif state in (self.avahi.SERVER_COLLISION, - self.avahi.SERVER_REGISTERING): + elif state in (ServerState.COLLISION, + ServerState.REGISTERING): self.disconnect() self.entrygroup.Reset() - elif state == self.avahi.CLIENT_FAILURE: - # does it ever go here? - log.debug('CLIENT FAILURE') def entrygroup_state_changed_callback(self, state, error): # the name is already present, so recreate - if state == self.avahi.ENTRY_GROUP_COLLISION: + if state == EntryGroup.COLLISION: log.debug('zeroconf.py: local name collision') self.service_add_fail_callback('Local name collision') - elif state == self.avahi.ENTRY_GROUP_FAILURE: + elif state == EntryGroup.FAILURE: self.disconnect() self.entrygroup.Reset() log.debug('zeroconf.py: ENTRY_GROUP_FAILURE reached(that' @@ -252,15 +273,15 @@ class Zeroconf: return show def avahi_txt(self): - return self.avahi.dict_to_txt_array(self.txt) + return self.dict_to_txt_array(self.txt) def create_service(self): try: if not self.entrygroup: # create an EntryGroup for publishing self.entrygroup = dbus.Interface(self.bus.get_object( - self.avahi.DBUS_NAME, self.server.EntryGroupNew()), - self.avahi.DBUS_INTERFACE_ENTRY_GROUP) + DBUS_NAME, self.server.EntryGroupNew()), + DBUS_INTERFACE_ENTRY_GROUP) self.entrygroup.connect_to_signal('StateChanged', self.entrygroup_state_changed_callback) @@ -284,8 +305,8 @@ class Zeroconf: self.txt = txt log.debug('Publishing service %s of type %s' % (self.name, self.stype)) - self.entrygroup.AddService(self.avahi.IF_UNSPEC, - self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype, '', + self.entrygroup.AddService(Interface.UNSPEC, + Protocol.UNSPEC, dbus.UInt32(0), self.name, self.stype, '', '', dbus.UInt16(self.port), self.avahi_txt(), reply_handler=self.service_added_callback, error_handler=self.service_add_fail_callback) @@ -304,7 +325,7 @@ class Zeroconf: return False state = self.server.GetState() - if state == self.avahi.SERVER_RUNNING: + if state == ServerState.RUNNING: if self.create_service(): self.announced = True return True @@ -314,7 +335,7 @@ class Zeroconf: if self.announced == False: return False try: - if self.entrygroup.GetState() != self.avahi.ENTRY_GROUP_FAILURE: + if self.entrygroup.GetState() != EntryGroup.FAILURE: self.entrygroup.Reset() self.entrygroup.Free() # .Free() has mem leaks @@ -345,6 +366,9 @@ class Zeroconf: def connect_dbus(self): try: import dbus + from dbus.mainloop.glib import DBusGMainLoop + main_loop = DBusGMainLoop(set_as_default=True) + dbus.set_default_main_loop(main_loop) except ImportError: log.debug('Error: python-dbus needs to be installed. No ' 'zeroconf support.') @@ -368,19 +392,12 @@ class Zeroconf: def connect_avahi(self): if not self.connect_dbus(): return False - try: - import avahi - self.avahi = avahi - except ImportError: - log.debug('Error: python-avahi needs to be installed. No ' - 'zeroconf support.') - return False if self.server: return True try: - self.server = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, - self.avahi.DBUS_PATH_SERVER), self.avahi.DBUS_INTERFACE_SERVER) + self.server = dbus.Interface(self.bus.get_object(DBUS_NAME, + DBUS_PATH_SERVER), DBUS_INTERFACE_SERVER) self.server.connect_to_signal('StateChanged', self.server_state_changed_callback) except Exception as e: @@ -400,21 +417,21 @@ class Zeroconf: # start browsing if self.domain is None: # Explicitly browse .local - self.browse_domain(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, - 'local') + self.browse_domain( + Interface.UNSPEC, Protocol.UNSPEC, 'local') # Browse for other browsable domains self.domain_browser = dbus.Interface(self.bus.get_object( - self.avahi.DBUS_NAME, self.server.DomainBrowserNew( - self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, '', - self.avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0))), - self.avahi.DBUS_INTERFACE_DOMAIN_BROWSER) + DBUS_NAME, self.server.DomainBrowserNew( + Interface.UNSPEC, Protocol.UNSPEC, '', + DomainBrowser.BROWSE, dbus.UInt32(0))), + DBUS_INTERFACE_DOMAIN_BROWSER) self.domain_browser.connect_to_signal('ItemNew', self.new_domain_callback) self.domain_browser.connect_to_signal('Failure', self.error_callback) else: - self.browse_domain(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, - self.domain) + self.browse_domain( + Interface.UNSPEC, Protocol.UNSPEC, self.domain) return True @@ -452,7 +469,7 @@ class Zeroconf: ri = val[Constant.RESOLVED_INFO][0] self.server.ResolveService(int(ri[ConstantRI.INTERFACE]), int(ri[ConstantRI.PROTOCOL]), val[Constant.BARE_NAME], self.stype, val[Constant.DOMAIN], - self.avahi.PROTO_UNSPEC, dbus.UInt32(0), + Protocol.UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved_all_callback, error_handler=self.error_callback) @@ -472,8 +489,8 @@ class Zeroconf: txt = self.avahi_txt() if self.connected and self.entrygroup: - self.entrygroup.UpdateServiceTxt(self.avahi.IF_UNSPEC, - self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype, '', + self.entrygroup.UpdateServiceTxt(Interface.UNSPEC, + Protocol.UNSPEC, dbus.UInt32(0), self.name, self.stype, '', txt, reply_handler=self.service_updated_callback, error_handler=self.error_callback) return True ===================================== gajim/common/zeroconf/zeroconf_avahi_const.py ===================================== --- /dev/null +++ b/gajim/common/zeroconf/zeroconf_avahi_const.py @@ -0,0 +1,66 @@ +# +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from enum import IntEnum + + +DBUS_NAME = "org.freedesktop.Avahi" +DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server" +DBUS_PATH_SERVER = "/" +DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup" +DBUS_INTERFACE_DOMAIN_BROWSER = DBUS_NAME + ".DomainBrowser" +DBUS_INTERFACE_SERVICE_TYPE_BROWSER = DBUS_NAME + ".ServiceTypeBrowser" +DBUS_INTERFACE_SERVICE_BROWSER = DBUS_NAME + ".ServiceBrowser" +DBUS_INTERFACE_ADDRESS_RESOLVER = DBUS_NAME + ".AddressResolver" +DBUS_INTERFACE_HOST_NAME_RESOLVER = DBUS_NAME + ".HostNameResolver" +DBUS_INTERFACE_SERVICE_RESOLVER = DBUS_NAME + ".ServiceResolver" +DBUS_INTERFACE_RECORD_BROWSER = DBUS_NAME + ".RecordBrowser" + + +class ServerState(IntEnum): + INVALID = 0 + REGISTERING = 1 + RUNNING = 2 + COLLISION = 3 + FAILURE = 4 + + +class EntryGroup(IntEnum): + UNCOMMITED = 0 + REGISTERING = 1 + ESTABLISHED = 2 + COLLISION = 3 + FAILURE = 4 + + +class DomainBrowser(IntEnum): + BROWSE = 0 + BROWSE_DEFAULT = 1 + REGISTER = 2 + REGISTER_DEFAULT = 3 + BROWSE_LEGACY = 4 + + +class Protocol(IntEnum): + UNSPEC = -1 + INET = 0 + INET6 = 1 + + +class Interface(IntEnum): + UNSPEC = -1 ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -47,7 +47,7 @@ class FeaturesWindow: self.features = { _('Bonjour / Zeroconf'): (self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), - _('Requires python-avahi.'), + _('Requires python-dbus.'), _('Requires pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/).'}), _('Command line'): (self.dbus_available, _('A script to control Gajim via commandline.'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2d6e7d2eee507cf267eea405be36d8cd5f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2d6e7d2eee507cf267eea405be36d8cd5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix translation in flatpak build
by Philipp Hörist 23 May '18

23 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc24ab47 by Philipp Hörist at 2018-05-23T08:38:09+02:00 Fix translation in flatpak build Fixes #9138 - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -81,6 +81,9 @@ def get_locale_dir(): path, tail = os.path.split(path) path, tail = os.path.split(path) localedir, tail = os.path.split(path) + elif os.path.exists('/app/share/run-as-flatpak'): + # Check if we run as flatpak + return '/app/share/locale' else: # fallback to user locale base = os.getenv('XDG_DATA_HOME') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bc24ab470d87896425684dbee543e95635… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bc24ab470d87896425684dbee543e95635… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Zeroconf
by Philipp Hörist 22 May '18

22 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0ec9812 by Philipp Hörist at 2018-05-22T23:38:04+02:00 Fix Zeroconf - Port pybonjour code from gajim_0.16 branch - Fix some other small things that broke zeroconf - - - - - 6 changed files: - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1069,7 +1069,10 @@ class ConnectionHandlersBase: if not jid_to: reply = True else: - fjid_to = helpers.parse_jid(str(jid_to)) + fjid_to = str(jid_to) + if self.name != 'Local': + # Dont check precis for zeroconf + fjid_to = helpers.parse_jid(str(jid_to)) jid_to = app.get_jid_without_resource(fjid_to) if jid_to == app.get_jid_from_account(self.name): reply = True ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -885,6 +885,7 @@ class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent): self.resource = 'local' self.prio = 0 self.keyID = None + self.idle_time = None self.timestamp = 0 self.contact_nickname = None self.avatar_sha = None @@ -1528,7 +1529,7 @@ class ZeroconfMessageReceivedEvent(MessageReceivedEvent): base_network_events = [] def get_jid_resource(self): - self.fjid =self.stanza.getFrom() + self.fjid = str(self.stanza.getFrom()) if self.fjid is None: for key in self.conn.connection.zeroconf.contacts: @@ -1833,7 +1834,12 @@ class MessageErrorEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-error' base_network_events = [] + def init(self): + self.zeroconf = False + def generate(self): + if self.zeroconf: + return True self.get_id() #only alert for errors of explicitly sent messages (see https://trac.gajim.org/ticket/8222) if self.id_ in self.conn.sent_message_ids: ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== --- a/gajim/common/zeroconf/client_zeroconf.py +++ b/gajim/common/zeroconf/client_zeroconf.py @@ -442,7 +442,7 @@ class P2PConnection(IdleObject, PlugIn): if self.state <= 0: return - r = packet + r = str(packet).encode('utf-8') if now: self.sendqueue.insert(0, (r, is_message)) @@ -532,6 +532,9 @@ class P2PConnection(IdleObject, PlugIn): if self.state < 0: return + + received = received.decode('utf-8') + if self.on_receive: if self._owner.sock_type == TYPE_CLIENT: self.set_timeout(ACTIVITY_TIMEOUT_SECONDS) @@ -609,7 +612,8 @@ class P2PConnection(IdleObject, PlugIn): if self.sent_data and self.sent_data.strip(): log.debug('sent: %s' % self.sent_data) if hasattr(self._owner, 'Dispatcher'): - self._owner.Dispatcher.Event('', DATA_SENT, self.sent_data) + self._owner.Dispatcher.Event( + '', DATA_SENT, self.sent_data.decode('utf-8')) self.sent_data = None if self.buff_is_message: self._owner.on_message_sent(self.fd) @@ -662,7 +666,7 @@ class ClientZeroconf: def resolve_all(self): if self.zeroconf: - self.zeroconf.resolve_all() + return self.zeroconf.resolve_all() def reannounce(self, txt): self.remove_announce() @@ -711,7 +715,7 @@ class ClientZeroconf: self.disconnect() def kill_all_connections(self): - for connection in self.connections.values(): + for connection in list(self.connections.values()): connection.force_disconnect() def add_connection(self, connection, ip, port, recipient): ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -69,6 +69,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): CommonConnection.__init__(self, name) self.is_zeroconf = True + app.ged.register_event_handler('message-outgoing', ged.OUT_CORE, + self._nec_message_outgoing) app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) @@ -107,7 +109,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def check_jid(self, jid): return jid - def get_own_jid(self): + def get_own_jid(self, *args, **kwargs): return nbxmpp.JID(self.username + '@' + self.host) def reconnect(self): @@ -123,7 +125,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _on_resolve_timeout(self): if self.connected: - self.connection.resolve_all() + if not self.connection.resolve_all(): + self._on_disconnected() + return False diffs = self.roster.getDiffs() for key in diffs: self.roster.setItem(key) @@ -205,7 +209,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): else: # result is None app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not start local service'), - msg=_('Please check if avahi-daemon is running.'))) + msg=_('Please check if avahi/bonjour-daemon is running.'))) self.disconnect() return else: @@ -321,23 +325,24 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): title=_('Could not change status of account "%s"') % self.name, msg=_('Please check if avahi-daemon is running.'))) + def _nec_message_outgoing(self, obj): + if obj.account != self.name: + return + self._prepare_message(obj) + def _nec_stanza_message_outgoing(self, obj): if obj.conn.name != self.name: return def on_send_ok(stanza_id): - app.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=obj.keyID, - automatic_message=obj.automatic_message, chatstate=None, - stanza_id=stanza_id)) - + app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj))) self.log_message(obj, obj.jid) def on_send_not_ok(reason): reason += ' ' + _('Your message could not be sent.') - app.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, - time_=None, session=obj.session)) + app.nec.push_incoming_event(MessageErrorEvent( + None, conn=self, fjid=obj.jid, error_code=-1, error_msg=reason, + msg=None, time_=None, session=obj.session, zeroconf=True)) # Dont propagate event return True @@ -347,10 +352,12 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if ret == -1: # Contact Offline - app.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=obj.jid, error_code=-1, error_msg=_( - 'Contact is offline. Your message could not be sent.'), - msg=None, time_=None, session=obj.session)) + error_message = _( + 'Contact is offline. Your message could not be sent.') + app.nec.push_incoming_event(MessageErrorEvent( + None, conn=self, fjid=obj.jid, error_code=-1, + error_msg=error_message, msg=None, time_=None, + session=obj.session, zeroconf=True)) # Dont propagate event return True @@ -369,9 +376,12 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): thread_id = data[1] frm = data[0] session = self.get_or_create_session(frm, thread_id) + error_message = _( + 'Connection to host could not be established: ' + 'Timeout while sending data.') app.nec.push_incoming_event(MessageErrorEvent( - None, conn=self, fjid=frm, error_code=-1, error_msg=_( - 'Connection to host could not be established: Timeout while ' - 'sending data.'), msg=None, time_=None, session=session)) + None, conn=self, fjid=frm, error_code=-1, + error_msg=error_message, msg=None, time_=None, + session=session, zeroconf=True)) # END ConnectionZeroconf ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -160,7 +160,7 @@ class Zeroconf: # we don't want to see ourselves in the list if name != self.name: - resolved_info = [(interface, protocol, host, aprotocol, address, port)] + resolved_info = [(interface, protocol, host, aprotocol, address, int(port))] if name in self.contacts: # Decide whether to try to merge with existing resolved info: old_name, old_domain, old_resolved_info, old_bare_name, old_txt = self.contacts[name] @@ -186,7 +186,7 @@ class Zeroconf: # gajim instance on the same machine, # it will be used when we get a new name. self.invalid_self_contact[name] = (name, domain, - (interface, protocol, host, aprotocol, address, port), + (interface, protocol, host, aprotocol, address, int(port)), bare_name, txt) @@ -445,7 +445,7 @@ class Zeroconf: # refresh txt data of all contacts manually (no callback available) def resolve_all(self): if not self.connected: - return + return False for val in self.contacts.values(): # get txt data from last recorded resolved info # TODO: Better try to get it from last IPv6 mDNS, then last IPv4? @@ -456,6 +456,8 @@ class Zeroconf: reply_handler=self.service_resolved_all_callback, error_handler=self.error_callback) + return True + def get_contacts(self): return self.contacts ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -1,28 +1,27 @@ -## common/zeroconf/zeroconf_bonjour.py -## -## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -from gajim.common import app +# Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +# Copyright (C) 2006 Philipp Hörist <philipp(a)hoerist.com> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging import select +import socket import re -import logging from gajim.common.zeroconf.zeroconf import Constant + log = logging.getLogger('gajim.c.z.zeroconf_bonjour') try: @@ -30,18 +29,17 @@ try: except ImportError: pass - resolve_timeout = 1 + class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, - disconnected_CB, error_CB, name, host, port): - self.domain = None # specific domain to browse + disconnected_CB, error_CB, name, host, port): self.stype = '_presence._tcp' - self.port = port # listening port that gets announced + self.port = port # listening port that gets announced self.username = name self.host = host - self.txt = pybonjour.TXTRecord() # service data + self.txt = {} # service data # XXX these CBs should be set to None when we destroy the object # (go offline), because they create a circular reference @@ -51,67 +49,76 @@ class Zeroconf: self.disconnected_CB = disconnected_CB self.error_CB = error_CB - self.contacts = {} # all current local contacts with data + self.contacts = {} # all current local contacts with data self.connected = False self.announced = False self.invalid_self_contact = {} + self.resolved_contacts = {} self.resolved = [] + self.queried = [] - - def browse_callback(self, sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain): - log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype)) + def browse_callback(self, sdRef, flags, interfaceIndex, errorCode, + serviceName, regtype, replyDomain): + log.debug('Found service %s in domain %s on %i(type: %s).', + serviceName, replyDomain, interfaceIndex, regtype) if not self.connected: return if errorCode != pybonjour.kDNSServiceErr_NoError: + log.debug('Error in browse_callback: %s', str(errorCode)) return if not (flags & pybonjour.kDNSServiceFlagsAdd): self.remove_service_callback(serviceName) return - # asynchronous resolving - resolve_sdRef = pybonjour.DNSServiceResolve(0, interfaceIndex, serviceName, regtype, replyDomain, self.service_resolved_callback) - try: + # asynchronous resolving + resolve_sdRef = None + resolve_sdRef = pybonjour.DNSServiceResolve( + 0, interfaceIndex, serviceName, + regtype, replyDomain, self.service_resolved_callback) + while not self.resolved: ready = select.select([resolve_sdRef], [], [], resolve_timeout) if resolve_sdRef not in ready[0]: - log.debug('Resolve timed out') + log.info('Resolve timed out') break pybonjour.DNSServiceProcessResult(resolve_sdRef) else: self.resolved.pop() + + except pybonjour.BonjourError as error: + log.info('Error when resolving DNS: %s', error) + finally: - resolve_sdRef.close() + if resolve_sdRef: + resolve_sdRef.close() def remove_service_callback(self, name): - log.debug('Service %s disappeared.' % name) + log.info('Service %s disappeared.' % name) if not self.connected: return if name != self.name: for key in self.contacts.keys(): - if self.contacts[key][Constant.BARE_NAME] == name: + if self.contacts[key][Constant.NAME] == name: del self.contacts[key] self.remove_serviceCB(key) return - def new_domain_callback(self, interface, protocol, domain, flags): - if domain != "local": - self.browse_domain(domain) - - # takes a TXTRecord instance def txt_array_to_dict(self, txt): - items = pybonjour.TXTRecord.parse(txt)._items + if isinstance(txt, pybonjour.TXTRecord): + items = txt._items + else: + items = pybonjour.TXTRecord.parse(txt)._items return dict((v[0], v[1]) for v in items.values()) - def service_resolved_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname, - hosttarget, port, txtRecord): - + @staticmethod + def _parse_name(fullname): + log.debug('Parse name: %s', fullname) # TODO: do proper decoding... - escaping= { - r'\.': '.', - r'\032': ' ', - r'\064': '@', - } + escaping = {r'\.': '.', + r'\032': ' ', + r'\064': '@', + } # Split on '.' but do not split on '\.' result = re.split('(?<!\\\\)\.', fullname) @@ -122,21 +129,59 @@ class Zeroconf: for src, trg in escaping.items(): name = name.replace(src, trg) + bare_name = name + if '@' not in name: + name = name + '@' + name + log.debug('End parse: %s %s %s %s', + name, bare_name, protocol, domain) + + return name, bare_name, protocol, domain + + def query_txt_callback(self, sdRef, flags, interfaceIndex, errorCode, + hosttarget, rrtype, rrclass, rdata, ttl): + # Callback from DNSServiceQueryRecord, it does not call decode() + # on rdata + rdata = rdata.decode() + + if errorCode != pybonjour.kDNSServiceErr_NoError: + log.error('Error in query_record_callback: %s', str(errorCode)) + return + + name, bare_name, protocol, domain = self._parse_name(hosttarget) + + if name != self.name: + # update TXT data only, as intended according to + # resolve_all comment + old_contact = self.contacts[name] + self.contacts[name] = old_contact[0:Constant.TXT] + (rdata,) + old_contact[Constant.TXT+1:] + log.debug(self.contacts[name]) + + self.queried.append(True) + + def query_record_callback(self, sdRef, flags, interfaceIndex, errorCode, + hosttarget, rrtype, rrclass, rdata, ttl): + if errorCode != pybonjour.kDNSServiceErr_NoError: + log.error('Error in query_record_callback: %s', str(errorCode)) + return + + fullname, port, txtRecord = self.resolved_contacts[hosttarget] + txt = pybonjour.TXTRecord.parse(txtRecord) + ip = socket.inet_ntoa(rdata) - log.debug('Service data for service %s on %i:' % (fullname, interfaceIndex)) - log.debug('Host %s, port %i, TXT data: %s' % (hosttarget, port, txt._items)) + name, bare_name, protocol, domain = self._parse_name(fullname) + + log.info('Service data for service %s on %i:', + fullname, interfaceIndex) + log.info('Host %s, ip %s, port %i, TXT data: %s', + hosttarget, ip, port, txt._items) if not self.connected: return - bare_name = name - if '@' not in name: - name = name + '@' + name - # we don't want to see ourselves in the list if name != self.name: - resolved_info = [(interfaceIndex, protocol, hosttarget, -1, port)] + resolved_info = [(interfaceIndex, protocol, hosttarget, fullname, ip, port)] self.contacts[name] = (name, domain, resolved_info, bare_name, txtRecord) self.new_serviceCB(name) @@ -145,57 +190,71 @@ class Zeroconf: # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, (interfaceIndex, protocol, hosttarget, -1, port), bare_name, txtRecord) - # count services - self.resolved.append(True) + self.invalid_self_contact[name] = \ + (name, domain, + (interfaceIndex, protocol, hosttarget, fullname, ip, port), + bare_name, txtRecord) - # different handler when resolving all contacts - def service_resolved_all_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname, hosttarget, port, txtRecord): - if not self.connected: - return + self.queried.append(True) - escaping= { - r'\.': '.', - r'\032': ' ', - r'\064': '@', - } + def service_resolved_callback(self, sdRef, flags, interfaceIndex, + errorCode, fullname, hosttarget, port, + txtRecord): - name, stype, protocol, domain, dummy = fullname.split('.') + if errorCode != pybonjour.kDNSServiceErr_NoError: + log.error('Error in service_resolved_callback: %s', str(errorCode)) + return - # Replace the escaped values - for src, trg in escaping.items(): - name = name.replace(src, trg) + self.resolved_contacts[hosttarget] = (fullname, port, txtRecord) - bare_name = name - if name.find('@') == -1: - name = name + '@' + name + try: + query_sdRef = None + query_sdRef = \ + pybonjour.DNSServiceQueryRecord( + interfaceIndex=interfaceIndex, + fullname=hosttarget, + rrtype=pybonjour.kDNSServiceType_A, + callBack=self.query_record_callback) + + while not self.queried: + ready = select.select([query_sdRef], [], [], resolve_timeout) + if query_sdRef not in ready[0]: + log.warning('Query record timed out') + break + pybonjour.DNSServiceProcessResult(query_sdRef) + else: + self.queried.pop() - # we don't want to see ourselves in the list - if name != self.name: - # update TXT data only, as intended according to resolve_all comment - old_contact = self.contacts[name] - self.contacts[name] = old_contact[0:Constant.TXT] + (self.txt,) + old_contact[Constant.TXT+1:] + except pybonjour.BonjourError as error: + if error.errorCode == pybonjour.kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + else: + self.error_CB(_('Error while adding service. %s') % error) + + finally: + if query_sdRef: + query_sdRef.close() + self.resolved.append(True) - def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain): + def service_added_callback(self, sdRef, flags, errorCode, + name, regtype, domain): if errorCode == pybonjour.kDNSServiceErr_NoError: - log.debug('Service successfully added') + log.info('Service successfully added') - def service_add_fail_callback(self, err): - if err[0][0] == pybonjour.kDNSServiceErr_NameConflict: - log.debug('Error while adding service. %s' % str(err)) + elif errorCode == pybonjour.kDNSServiceErr_NameConflict: + log.error('Error while adding service. %s', errorCode) parts = self.username.split(' ') - #check if last part is a number and if, increment it + # check if last part is a number and if, increment it try: stripped = str(int(parts[-1])) except Exception: stripped = 1 - alternative_name = self.username + str(stripped+1) + alternative_name = self.username + str(stripped + 1) self.name_conflictCB(alternative_name) - return - self.error_CB(_('Error while adding service. %s') % str(err)) - self.disconnect() + else: + self.error_CB(_('Error while adding service. %s') % str(errorCode)) # make zeroconf-valid names def replace_show(self, show): @@ -208,8 +267,8 @@ class Zeroconf: def create_service(self): txt = {} - #remove empty keys - for key, val in self.txt: + # remove empty keys + for key, val in self.txt.items(): if val: txt[key] = val @@ -222,22 +281,27 @@ class Zeroconf: txt['status'] = self.replace_show(self.txt['status']) else: txt['status'] = 'avail' - - self.txt = pybonjour.TXTRecord(txt, strict=True) - + self.txt = txt try: - sdRef = pybonjour.DNSServiceRegister(name = self.name, - regtype = self.stype, port = self.port, txtRecord = self.txt, - callBack = self.service_added_callback) - self.service_sdRef = sdRef - except pybonjour.BonjourError as e: - self.service_add_fail_callback(e) - else: - log.debug('Publishing service %s of type %s' % (self.name, self.stype)) - - ready = select.select([sdRef], [], [], resolve_timeout) - if sdRef in ready[0]: - pybonjour.DNSServiceProcessResult(sdRef) + self.service_sdRef = pybonjour.DNSServiceRegister( + name=self.name, + regtype=self.stype, + port=self.port, + txtRecord=pybonjour.TXTRecord(self.txt, strict=True), + callBack=self.service_added_callback) + + log.info('Publishing service %s of type %s', self.name, self.stype) + + ready = select.select([self.service_sdRef], [], []) + if self.service_sdRef in ready[0]: + pybonjour.DNSServiceProcessResult(self.service_sdRef) + + except pybonjour.BonjourError as error: + if error.errorCode == pybonjour.kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + else: + self.error_CB(_('Error while adding service. %s') % error) + self.disconnect() def announce(self): if not self.connected: @@ -254,28 +318,21 @@ class Zeroconf: self.service_sdRef.close() self.announced = False return True - except pybonjour.BonjourError as e: - log.debug(e) + except pybonjour.BonjourError as error: + log.error('Error when removing announce: %s', error) return False - def connect(self): - self.name = self.username + '@' + self.host # service name + self.name = self.username + '@' + self.host # service name self.connected = True # start browsing - if self.domain is None: - # Explicitly browse .local - self.browse_domain() - - # Browse for other browsable domains - #self.domain_sdRef = pybonjour.DNSServiceEnumerateDomains(flags, interfaceIndex=0, callBack=self.new_domain_callback) - + if self.browse_domain(): + return True else: - self.browse_domain(self.domain) - - return True + self.disconnect() + return False def disconnect(self): if self.connected: @@ -285,54 +342,92 @@ class Zeroconf: self.remove_announce() def browse_domain(self, domain=None): - log.debug('starting to browse') try: - self.browse_sdRef = pybonjour.DNSServiceBrowse(regtype=self.stype, domain=domain, callBack=self.browse_callback) - except pybonjour.BonjourError as e: - self.error_CB("Error while browsing: %s" % str(e)) + self.browse_sdRef = pybonjour.DNSServiceBrowse( + regtype=self.stype, + domain=domain, + callBack=self.browse_callback) + log.info('Starting to browse .local') + return True + except pybonjour.BonjourError as error: + if error.errorCode == pybonjour.kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + else: + log.error('Error while browsing for services. %s', error) + return False def browse_loop(self): - ready = select.select([self.browse_sdRef], [], [], 0) - if self.browse_sdRef in ready[0]: - pybonjour.DNSServiceProcessResult(self.browse_sdRef) + try: + ready = select.select([self.browse_sdRef], [], [], 0) + if self.browse_sdRef in ready[0]: + pybonjour.DNSServiceProcessResult(self.browse_sdRef) + except pybonjour.BonjourError as error: + if error.errorCode == pybonjour.kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + return False + else: + log.error('Error while browsing for services. %s', error) + return True - # refresh txt data of all contacts manually (no callback available) + # resolve_all() is called every X seconds and querys for new clients + # and monitors TXT records for changed status def resolve_all(self): if not self.connected: - return - + return False # for now put here as this is synchronous - self.browse_loop() + if not self.browse_loop(): + return False + # Monitor TXT Records with DNSServiceQueryRecord because + # its more efficient (see pybonjour documentation) for val in self.contacts.values(): - resolve_sdRef = pybonjour.DNSServiceResolve(0, - pybonjour.kDNSServiceInterfaceIndexAny, val[Constant.BARE_NAME], - self.stype + '.', val[Constant.DOMAIN] + '.', - self.service_resolved_all_callback) - try: - ready = select.select([resolve_sdRef], [], [], resolve_timeout) - if resolve_sdRef not in ready[0]: - log.debug('Resolve timed out (in resolve_all)') - break - pybonjour.DNSServiceProcessResult(resolve_sdRef) + query_sdRef = None + query_sdRef = \ + pybonjour.DNSServiceQueryRecord( + interfaceIndex=pybonjour.kDNSServiceInterfaceIndexAny, + fullname=val[Constant.RESOLVED_INFO][0][Constant.BARE_NAME], + rrtype=pybonjour.kDNSServiceType_TXT, + callBack=self.query_txt_callback) + + while not self.queried: + ready = select.select( + [query_sdRef], [], [], resolve_timeout) + if query_sdRef not in ready[0]: + log.info('Query record timed out') + break + pybonjour.DNSServiceProcessResult(query_sdRef) + else: + self.queried.pop() + + except pybonjour.BonjourError as error: + if error.errorCode == pybonjour.kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + return False + else: + log.error('Error in query for TXT records. %s', error) finally: - resolve_sdRef.close() + if query_sdRef: + query_sdRef.close() + + return True def get_contacts(self): return self.contacts def get_contact(self, jid): - if not jid in self.contacts: + if jid not in self.contacts: return None return self.contacts[jid] - def update_txt(self, show = None): + def update_txt(self, show=None): if show: self.txt['status'] = self.replace_show(show) + txt = pybonjour.TXTRecord(self.txt, strict=True) try: - pybonjour.DNSServiceUpdateRecord(self.service_sdRef, None, 0, self.txt) - except pybonjour.BonjourError: + pybonjour.DNSServiceUpdateRecord(self.service_sdRef, None, 0, txt) + except pybonjour.BonjourError as e: + log.error('Error when updating TXT Record: %s', e) return False return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d0ec9812a6b0163fd25c63751ac86175c9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d0ec9812a6b0163fd25c63751ac86175c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Work around flatpak cleanup issue
by Philipp Hörist 22 May '18

22 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cfd64926 by André Apitzsch at 2018-05-22T23:12:29+02:00 Work around flatpak cleanup issue cleaning /share/locale/ from one component can affect later components, i.e. locales are also removed there - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -253,7 +253,8 @@ "cleanup": [ "/bin", "/lib/avahi", - "/share" + "/share/avahi", + "avahi.mo" ], "config-opts": [ "--with-distro=none", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cfd64926b919cba18d8be1d8b50055f353… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cfd64926b919cba18d8be1d8b50055f353… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove version key in desktop.in
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c474f94 by Philipp Hörist at 2018-05-21T22:24:48+02:00 Remove version key in desktop.in This is not for the Gajim version, its the version of the spec this file conforms to. This key is not required by the spec - - - - - 1 changed file: - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== --- a/data/org.gajim.Gajim.desktop.in +++ b/data/org.gajim.Gajim.desktop.in @@ -5,7 +5,6 @@ GenericName=Jabber IM Client Comment=A GTK+ Jabber client #Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; -Version=1.0.3 Exec=gajim %u #Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c474f9405b9304d8f965c88d3e916449d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c474f9405b9304d8f965c88d3e916449d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix detecting language
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7b0cbb77 by Philipp Hörist at 2018-05-21T21:49:19+02:00 Fix detecting language - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -65,7 +65,7 @@ def initialize_lang(): if default is None: # LC_ALL=C return - LANG = LANG[:2] + LANG = default[:2] except (ValueError, locale.Error): pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7b0cbb7763b8be450b2b2b8efd4eca6a03… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7b0cbb7763b8be450b2b2b8efd4eca6a03… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add dedicated zeroconf menu
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2410121d by Philipp Hörist at 2018-05-21T21:18:38+02:00 Add dedicated zeroconf menu - - - - - 3 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -1,24 +1,19 @@ -# -*- coding: utf-8 -*- -## src/app_actions.py -## -## Copyright (C) 2017 Philipp Hörist <philipp AT hoerist.com> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -from gi.repository import Gtk +# +# Copyright (C) 2017 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gajim.common import app from gajim.common import helpers @@ -36,263 +31,295 @@ from gajim.history_sync import HistorySyncAssistant from gajim.server_info import ServerInfoDialog -class AppActions(): - ''' Action Callbacks ''' - def __init__(self, application: Gtk.Application): - self.application = application - - # General Actions - - def on_add_contact_jid(self, action, param): - dialogs.AddNewContactWindow(None, param.get_string()) - - # Application Menu Actions - - def on_preferences(self, action, param): - if 'preferences' in interface.instances: - interface.instances['preferences'].window.present() - else: - interface.instances['preferences'] = \ - config.PreferencesWindow() - - def on_plugins(self, action, param): - if 'plugins' in interface.instances: - interface.instances['plugins'].window.present() - else: - interface.instances['plugins'] = gajim.plugins.gui.PluginsWindow() - - def on_accounts(self, action, param): - if 'accounts' in app.interface.instances: - app.interface.instances['accounts'].present() - else: - app.interface.instances['accounts'] = accounts_window.AccountsWindow() - - def on_history_manager(self, action, param): - from gajim.history_manager import HistoryManager - HistoryManager() - - def on_manage_bookmarks(self, action, param): - config.ManageBookmarksWindow() - - def on_quit(self, action, param): - interface.roster.on_quit_request() - - def on_new_chat(self, action, param): - if 'start_chat' in app.interface.instances: - app.interface.instances['start_chat'].present() - else: - app.interface.instances['start_chat'] = dialogs.StartChatDialog() - - # Accounts Actions - - def on_profile(self, action, param): - interface.edit_own_details(param.get_string()) - - def on_activate_bookmark(self, action, param): - dict_ = param.unpack() - account, jid, nick, password = \ - dict_['account'], dict_['jid'], None, None - if 'nick' in dict_: - nick = dict_['nick'] - if 'password' in dict_: - password = dict_['password'] - interface.join_gc_room(account, jid, nick, password) - - def on_send_server_message(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/online' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_service_disco(self, action, param): - account = param.get_string() - server_jid = app.config.get_per('accounts', account, 'hostname') - if server_jid in interface.instances[account]['disco']: - interface.instances[account]['disco'][server_jid].\ - window.present() - else: - try: - # Object will add itself to the window dict - disco.ServiceDiscoveryWindow(account, address_entry=True) - except GajimGeneralException: - pass - - def on_join_gc(self, action, param): - account = param.get_string() - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: - app.interface.raise_dialog('join-while-invisible') +# General Actions + +def on_add_contact_jid(action, param): + dialogs.AddNewContactWindow(None, param.get_string()) + +# Application Menu Actions + + +def on_preferences(action, param): + if 'preferences' in interface.instances: + interface.instances['preferences'].window.present() + else: + interface.instances['preferences'] = \ + config.PreferencesWindow() + + +def on_plugins(action, param): + if 'plugins' in interface.instances: + interface.instances['plugins'].window.present() + else: + interface.instances['plugins'] = gajim.plugins.gui.PluginsWindow() + + +def on_accounts(action, param): + if 'accounts' in app.interface.instances: + app.interface.instances['accounts'].present() + else: + app.interface.instances['accounts'] = accounts_window.AccountsWindow() + + +def on_history_manager(action, param): + from gajim.history_manager import HistoryManager + HistoryManager() + + +def on_manage_bookmarks(action, param): + config.ManageBookmarksWindow() + + +def on_quit(action, param): + interface.roster.on_quit_request() + + +def on_new_chat(action, param): + if 'start_chat' in app.interface.instances: + app.interface.instances['start_chat'].present() + else: + app.interface.instances['start_chat'] = dialogs.StartChatDialog() + +# Accounts Actions + + +def on_profile(action, param): + interface.edit_own_details(param.get_string()) + + +def on_activate_bookmark(action, param): + dict_ = param.unpack() + account, jid, nick, password = \ + dict_['account'], dict_['jid'], None, None + if 'nick' in dict_: + nick = dict_['nick'] + if 'password' in dict_: + password = dict_['password'] + interface.join_gc_room(account, jid, nick, password) + + +def on_send_server_message(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/online' + dialogs.SingleMessageWindow(account, server, 'send') + + +def on_service_disco(action, param): + account = param.get_string() + server_jid = app.config.get_per('accounts', account, 'hostname') + if server_jid in interface.instances[account]['disco']: + interface.instances[account]['disco'][server_jid].\ + window.present() + else: + try: + # Object will add itself to the window dict + disco.ServiceDiscoveryWindow(account, address_entry=True) + except GajimGeneralException: + pass + + +def on_join_gc(action, param): + account = param.get_string() + invisible_show = app.SHOW_LIST.index('invisible') + if app.connections[account].connected == invisible_show: + app.interface.raise_dialog('join-while-invisible') + return + if 'join_gc' in interface.instances[account]: + interface.instances[account]['join_gc'].present() + else: + interface.instances[account]['join_gc'] = \ + dialogs.JoinGroupchatWindow(account, None) + + +def on_add_contact(action, param): + dialogs.AddNewContactWindow(param.get_string()) + + +def on_single_message(action, param): + dialogs.SingleMessageWindow(param.get_string(), action='send') + + +def on_merge_accounts(action, param): + action.set_state(param) + value = param.get_boolean() + app.config.set('mergeaccounts', value) + # Do not merge accounts if only one active + if len(app.connections) >= 2: + app.interface.roster.regroup = value + else: + app.interface.roster.regroup = False + app.interface.roster.setup_and_draw_roster() + + +def on_use_pgp_agent(action, param): + action.set_state(param) + app.config.set('use_gpg_agent', param.get_boolean()) + + +def on_add_account(action, param): + if 'account_creation_wizard' in app.interface.instances: + app.interface.instances['account_creation_wizard'].window.present() + else: + app.interface.instances['account_creation_wizard'] = \ + config.AccountCreationWizardWindow() + + +def on_import_contacts(action, param): + account = param.get_string() + if 'import_contacts' in app.interface.instances: + app.interface.instances['import_contacts'].dialog.present() + else: + app.interface.instances['import_contacts'] = \ + dialogs.SynchroniseSelectAccountDialog(account) + +# Advanced Actions + + +def on_archiving_preferences(action, param): + account = param.get_string() + if 'archiving_preferences' in interface.instances[account]: + interface.instances[account]['archiving_preferences'].window.\ + present() + else: + interface.instances[account]['archiving_preferences'] = \ + dialogs.Archiving313PreferencesWindow(account) + + +def on_history_sync(action, param): + account = param.get_string() + if 'history_sync' in interface.instances[account]: + interface.instances[account]['history_sync'].present() + else: + interface.instances[account]['history_sync'] = \ + HistorySyncAssistant(account, interface.roster.window) + + +def on_privacy_lists(action, param): + account = param.get_string() + if 'privacy_lists' in interface.instances[account]: + interface.instances[account]['privacy_lists'].window.present() + else: + interface.instances[account]['privacy_lists'] = \ + dialogs.PrivacyListsWindow(account) + + +def on_server_info(action, param): + account = param.get_string() + if 'server_info' in interface.instances[account]: + interface.instances[account]['server_info'].present() + else: + interface.instances[account]['server_info'] = \ + ServerInfoDialog(account) + + +def on_xml_console(action, param): + account = param.get_string() + if 'xml_console' in interface.instances[account]: + interface.instances[account]['xml_console'].present() + else: + interface.instances[account]['xml_console'] = \ + dialogs.XMLConsoleWindow(account) + + +def on_manage_proxies(action, param): + if 'manage_proxies' in app.interface.instances: + app.interface.instances['manage_proxies'].window.present() + else: + app.interface.instances['manage_proxies'] = \ + config.ManageProxiesWindow(interface.roster.window) + +# Admin Actions + + +def on_set_motd(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/motd' + dialogs.SingleMessageWindow(account, server, 'send') + + +def on_update_motd(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/motd/update' + dialogs.SingleMessageWindow(account, server, 'send') + + +def on_delete_motd(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/motd/delete' + app.connections[account].send_motd(server) + +# Help Actions + + +def on_contents(action, param): + helpers.launch_browser_mailer( + 'url', 'https://dev.gajim.org/gajim/gajim/wikis') + + +def on_faq(action, param): + helpers.launch_browser_mailer( + 'url', 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') + + +def on_keyboard_shortcuts(action, param): + shortcuts_window.show(app.app.get_active_window()) + + +def on_features(action, param): + features_window.FeaturesWindow() + + +def on_about(action, param): + dialogs.AboutDialog() + +# View Actions + + +def on_file_transfers(action, param): + if interface.instances['file_transfers']. \ + window.get_property('visible'): + interface.instances['file_transfers'].window.present() + else: + interface.instances['file_transfers'].window.show_all() + + +def on_history(action, param): + if 'logs' in interface.instances: + interface.instances['logs'].window.present() + else: + interface.instances['logs'] = history_window.\ + HistoryWindow() + + +def on_open_event(action, param): + dict_ = param.unpack() + app.interface.handle_event( + dict_['account'], dict_['jid'], dict_['type_']) + + +# Other Actions + +def toggle_ipython(action, param): + """ + Show/hide the ipython window + """ + win = app.ipython_window + if win and win.window.is_visible(): + win.present() + else: + app.interface.create_ipython_window() + + +def show_next_pending_event(action, param): + """ + Show the window(s) with next pending event in tabbed/group chats + """ + if app.events.get_nb_events(): + account, jid, event = app.events.get_first_systray_event() + if not event: return - if 'join_gc' in interface.instances[account]: - interface.instances[account]['join_gc'].present() - else: - interface.instances[account]['join_gc'] = \ - dialogs.JoinGroupchatWindow(account, None) - - def on_add_contact(self, action, param): - dialogs.AddNewContactWindow(param.get_string()) - - def on_single_message(self, action, param): - dialogs.SingleMessageWindow(param.get_string(), action='send') - - def on_merge_accounts(self, action, param): - action.set_state(param) - value = param.get_boolean() - app.config.set('mergeaccounts', value) - if len(app.connections) >= 2: # Do not merge accounts if only one active - app.interface.roster.regroup = value - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - - def on_use_pgp_agent(self, action, param): - action.set_state(param) - app.config.set('use_gpg_agent', param.get_boolean()) - - def on_add_account(self, action, param): - if 'account_creation_wizard' in app.interface.instances: - app.interface.instances['account_creation_wizard'].window.present() - else: - app.interface.instances['account_creation_wizard'] = \ - config.AccountCreationWizardWindow() - - def on_import_contacts(self, action, param): - account = param.get_string() - if 'import_contacts' in app.interface.instances: - app.interface.instances['import_contacts'].dialog.present() - else: - app.interface.instances['import_contacts'] = \ - dialogs.SynchroniseSelectAccountDialog(account) - - # Advanced Actions - - def on_archiving_preferences(self, action, param): - account = param.get_string() - if 'archiving_preferences' in interface.instances[account]: - interface.instances[account]['archiving_preferences'].window.\ - present() - else: - interface.instances[account]['archiving_preferences'] = \ - dialogs.Archiving313PreferencesWindow(account) - - def on_history_sync(self, action, param): - account = param.get_string() - if 'history_sync' in interface.instances[account]: - interface.instances[account]['history_sync'].present() - else: - interface.instances[account]['history_sync'] = \ - HistorySyncAssistant(account, interface.roster.window) - - def on_privacy_lists(self, action, param): - account = param.get_string() - if 'privacy_lists' in interface.instances[account]: - interface.instances[account]['privacy_lists'].window.present() - else: - interface.instances[account]['privacy_lists'] = \ - dialogs.PrivacyListsWindow(account) - - def on_server_info(self, action, param): - account = param.get_string() - if 'server_info' in interface.instances[account]: - interface.instances[account]['server_info'].present() - else: - interface.instances[account]['server_info'] = \ - ServerInfoDialog(account) - - def on_xml_console(self, action, param): - account = param.get_string() - if 'xml_console' in interface.instances[account]: - interface.instances[account]['xml_console'].present() - else: - interface.instances[account]['xml_console'] = \ - dialogs.XMLConsoleWindow(account) - - def on_manage_proxies(self, action, param): - if 'manage_proxies' in app.interface.instances: - app.interface.instances['manage_proxies'].window.present() - else: - app.interface.instances['manage_proxies'] = \ - config.ManageProxiesWindow(interface.roster.window) - - # Admin Actions - - def on_set_motd(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_update_motd(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/update' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_delete_motd(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/delete' - app.connections[account].send_motd(server) - - # Help Actions - - def on_contents(self, action, param): - helpers.launch_browser_mailer( - 'url', 'https://dev.gajim.org/gajim/gajim/wikis') - - def on_faq(self, action, param): - helpers.launch_browser_mailer( - 'url', 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') - - def on_keyboard_shortcuts(self, action, param): - shortcuts_window.show(self.application.get_active_window()) - - def on_features(self, action, param): - features_window.FeaturesWindow() - - def on_about(self, action, param): - dialogs.AboutDialog() - - # View Actions - - def on_file_transfers(self, action, param): - if interface.instances['file_transfers']. \ - window.get_property('visible'): - interface.instances['file_transfers'].window.present() - else: - interface.instances['file_transfers'].window.show_all() - - def on_history(self, action, param): - if 'logs' in interface.instances: - interface.instances['logs'].window.present() - else: - interface.instances['logs'] = history_window.\ - HistoryWindow() - - def on_open_event(self, action, param): - dict_ = param.unpack() - app.interface.handle_event(dict_['account'], dict_['jid'], - dict_['type_']) - - - # Other Actions - - def toggle_ipython(self, action, param): - """ - Show/hide the ipython window - """ - win = app.ipython_window - if win and win.window.is_visible(): - win.present() - else: - app.interface.create_ipython_window() - - def show_next_pending_event(self, action, param): - """ - Show the window(s) with next pending event in tabbed/group chats - """ - if app.events.get_nb_events(): - account, jid, event = app.events.get_first_systray_event() - if not event: - return - app.interface.handle_event(account, jid, event.type_) + app.interface.handle_event(account, jid, event.type_) ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -284,37 +284,14 @@ class GajimApplication(Gtk.Application): def add_actions(self): ''' Build Application Actions ''' - from gajim.app_actions import AppActions - action = AppActions(self) - - self.account_actions = [ - ('-start-single-chat', action.on_single_message, 'online', 's'), - ('-join-groupchat', action.on_join_gc, 'online', 's'), - ('-add-contact', action.on_add_contact, 'online', 's'), - ('-services', action.on_service_disco, 'online', 's'), - ('-profile', action.on_profile, 'feature', 's'), - ('-xml-console', action.on_xml_console, 'always', 's'), - ('-server-info', action.on_server_info, 'online', 's'), - ('-archive', action.on_archiving_preferences, 'feature', 's'), - ('-sync-history', action.on_history_sync, 'online', 's'), - ('-privacylists', action.on_privacy_lists, 'feature', 's'), - ('-send-server-message', - action.on_send_server_message, 'online', 's'), - ('-set-motd', action.on_set_motd, 'online', 's'), - ('-update-motd', action.on_update_motd, 'online', 's'), - ('-delete-motd', action.on_delete_motd, 'online', 's'), - ('-activate-bookmark', - action.on_activate_bookmark, 'online', 'a{sv}'), - ('-open-event', action.on_open_event, 'always', 'a{sv}'), - ('-import-contacts', action.on_import_contacts, 'online', 's'), - ] + from gajim import app_actions # General Stateful Actions act = Gio.SimpleAction.new_stateful( 'merge', None, GLib.Variant.new_boolean(app.config.get('mergeaccounts'))) - act.connect('change-state', action.on_merge_accounts) + act.connect('change-state', app_actions.on_merge_accounts) self.add_action(act) act = Gio.SimpleAction.new_stateful( @@ -324,40 +301,38 @@ class GajimApplication(Gtk.Application): # General Actions - self.general_actions = [ - ('quit', action.on_quit), - ('accounts', action.on_accounts), - ('add-account', action.on_add_account), - ('manage-proxies', action.on_manage_proxies), - ('start-chat', action.on_new_chat), - ('bookmarks', action.on_manage_bookmarks), - ('history-manager', action.on_history_manager), - ('preferences', action.on_preferences), - ('plugins', action.on_plugins), - ('file-transfer', action.on_file_transfers), - ('history', action.on_history), - ('shortcuts', action.on_keyboard_shortcuts), - ('features', action.on_features), - ('content', action.on_contents), - ('about', action.on_about), - ('faq', action.on_faq), - ('ipython', action.toggle_ipython), - ('show-next-pending-event', action.show_next_pending_event), + general_actions = [ + ('quit', app_actions.on_quit), + ('accounts', app_actions.on_accounts), + ('add-account', app_actions.on_add_account), + ('manage-proxies', app_actions.on_manage_proxies), + ('start-chat', app_actions.on_new_chat), + ('bookmarks', app_actions.on_manage_bookmarks), + ('history-manager', app_actions.on_history_manager), + ('preferences', app_actions.on_preferences), + ('plugins', app_actions.on_plugins), + ('file-transfer', app_actions.on_file_transfers), + ('history', app_actions.on_history), + ('shortcuts', app_actions.on_keyboard_shortcuts), + ('features', app_actions.on_features), + ('content', app_actions.on_contents), + ('about', app_actions.on_about), + ('faq', app_actions.on_faq), + ('ipython', app_actions.toggle_ipython), + ('show-next-pending-event', app_actions.show_next_pending_event), ] act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) - act.connect("activate", action.on_add_contact_jid) + act.connect("activate", app_actions.on_add_contact_jid) self.add_action(act) - for action in self.general_actions: + for action in general_actions: action_name, func = action act = Gio.SimpleAction.new(action_name, None) act.connect("activate", func) self.add_action(act) accounts_list = sorted(app.config.get_per('accounts')) - if 'Local' in accounts_list: - accounts_list.remove('Local') if not accounts_list: return if len(accounts_list) > 1: @@ -366,10 +341,38 @@ class GajimApplication(Gtk.Application): else: self.add_account_actions(accounts_list[0]) - def add_account_actions(self, account): + def _get_account_actions(self, account): + from gajim import app_actions + if account == 'Local': - return - for action in self.account_actions: + return [ + ('-xml-console', app_actions.on_xml_console, 'always', 's') + ] + + return [ + ('-start-single-chat', app_actions.on_single_message, 'online', 's'), + ('-join-groupchat', app_actions.on_join_gc, 'online', 's'), + ('-add-contact', app_actions.on_add_contact, 'online', 's'), + ('-services', app_actions.on_service_disco, 'online', 's'), + ('-profile', app_actions.on_profile, 'feature', 's'), + ('-xml-console', app_actions.on_xml_console, 'always', 's'), + ('-server-info', app_actions.on_server_info, 'online', 's'), + ('-archive', app_actions.on_archiving_preferences, 'feature', 's'), + ('-sync-history', app_actions.on_history_sync, 'online', 's'), + ('-privacylists', app_actions.on_privacy_lists, 'feature', 's'), + ('-send-server-message', + app_actions.on_send_server_message, 'online', 's'), + ('-set-motd', app_actions.on_set_motd, 'online', 's'), + ('-update-motd', app_actions.on_update_motd, 'online', 's'), + ('-delete-motd', app_actions.on_delete_motd, 'online', 's'), + ('-activate-bookmark', + app_actions.on_activate_bookmark, 'online', 'a{sv}'), + ('-open-event', app_actions.on_open_event, 'always', 'a{sv}'), + ('-import-contacts', app_actions.on_import_contacts, 'online', 's'), + ] + + def add_account_actions(self, account): + for action in self._get_account_actions(account): action_name, func, state, type_ = action action_name = account + action_name if self.lookup_action(action_name): @@ -383,14 +386,12 @@ class GajimApplication(Gtk.Application): self.add_action(act) def remove_account_actions(self, account): - for action in self.account_actions: + for action in self._get_account_actions(account): action_name = account + action[0] self.remove_action(action_name) def set_account_actions_state(self, account, new_state=False): - if account == 'Local': - return - for action in self.account_actions: + for action in self._get_account_actions(account): action_name, _, state, _ = action if not new_state and state in ('online', 'feature'): # We go offline ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -727,25 +727,29 @@ def get_account_menu(account): sub menu: list ''' account_menu = [ - ('-add-contact', _('Add Contact…')), - ('-join-groupchat', _('Join Group Chat')), - ('-profile', _('Profile')), - ('-services', _('Discover Services')), - ('-start-single-chat', _('Send Single Message…')), - (_('Advanced'), [ - ('-archive', _('Archiving Preferences')), - ('-sync-history', _('Synchronise History')), - ('-privacylists', _('Privacy Lists')), - ('-server-info', _('Server Info')), - ('-xml-console', _('XML Console')) - ]), - (_('Admin'), [ - ('-send-server-message', _('Send Server Message…')), - ('-set-motd', _('Set MOTD…')), - ('-update-motd', _('Update MOTD…')), - ('-delete-motd', _('Delete MOTD…')) - ]), - ] + ('-add-contact', _('Add Contact…')), + ('-join-groupchat', _('Join Group Chat')), + ('-profile', _('Profile')), + ('-services', _('Discover Services')), + ('-start-single-chat', _('Send Single Message…')), + (_('Advanced'), [ + ('-archive', _('Archiving Preferences')), + ('-sync-history', _('Synchronise History')), + ('-privacylists', _('Privacy Lists')), + ('-server-info', _('Server Info')), + ('-xml-console', _('XML Console')) + ]), + (_('Admin'), [ + ('-send-server-message', _('Send Server Message…')), + ('-set-motd', _('Set MOTD…')), + ('-update-motd', _('Update MOTD…')), + ('-delete-motd', _('Delete MOTD…')) + ]), + ] + + zeroconf_menu = [ + ('-xml-console', _('XML Console')), + ] def build_menu(preset): menu = Gio.Menu() @@ -769,6 +773,8 @@ def get_account_menu(account): menu.append_submenu(label, submenu) return menu + if account == 'Local': + return build_menu(zeroconf_menu) return build_menu(account_menu) @@ -781,7 +787,7 @@ def build_accounts_menu(): acc_menu = menubar.get_item_link(menu_position, 'submenu') acc_menu.remove_all() - accounts_list = sorted(app.contacts.get_accounts(zeroconf=False)) + accounts_list = sorted(app.contacts.get_accounts()) if not accounts_list: no_accounts = _('No Accounts available') acc_menu.append_item(Gio.MenuItem.new(no_accounts, None)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2410121ddb703245cd1c967087749567f2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2410121ddb703245cd1c967087749567f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise version in desktop.in
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 828ae5bb by Philipp Hörist at 2018-05-21T19:27:38+02:00 Raise version in desktop.in - - - - - 1 changed file: - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== --- a/data/org.gajim.Gajim.desktop.in +++ b/data/org.gajim.Gajim.desktop.in @@ -5,7 +5,7 @@ GenericName=Jabber IM Client Comment=A GTK+ Jabber client #Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; -Version=1.0 +Version=1.0.3 Exec=gajim %u #Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828ae5bb42e08e9b5911caad15f0e40ab5… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828ae5bb42e08e9b5911caad15f0e40ab5… 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