Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix event name
by Philipp Hörist 26 Jul '18

26 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ad6a28e by Philipp Hörist at 2018-07-26T15:27:56Z Fix event name - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== --- a/gajim/common/modules/mam.py +++ b/gajim/common/modules/mam.py @@ -581,7 +581,7 @@ class MamMessageReceivedEvent(NetworkIncomingEvent): class MamGcMessageReceivedEvent(NetworkIncomingEvent): - name = 'mam-message-received' + name = 'mam-gc-message-received' class MamDecryptedMessageReceived(NetworkIncomingEvent): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ad6a28e128042a423dc421c37c30cc49f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ad6a28e128042a423dc421c37c30cc49f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont get own avatar_sha from contacts
by Philipp Hörist 25 Jul '18

25 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 313b913a by Philipp Hörist at 2018-07-25T21:17:12Z Dont get own avatar_sha from contacts - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -156,12 +156,13 @@ class ProfileWindow(Gtk.ApplicationWindow): menu = Gtk.Menu() nick = app.config.get_per('accounts', self.account, 'name') - sha = app.contacts.get_avatar_sha(self.account, self.jid) + if self.avatar_sha is None: + return menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) menuitem.connect( 'activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - sha, nick) + self.avatar_sha, nick) menu.append(menuitem) menu.connect('selection-done', lambda w: w.destroy()) # show the menu View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/313b913ae4867eec76294f9efef7eb1c61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/313b913ae4867eec76294f9efef7eb1c61… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Discover httpupload also on the user domain
by Philipp Hörist 25 Jul '18

25 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf580c62 by Philipp Hörist at 2018-07-25T17:33:03Z Discover httpupload also on the user domain - - - - - 2 changed files: - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -190,6 +190,7 @@ class Discovery: self._con.get_module('VCardTemp').pass_disco(from_, *args) self._con.get_module('Carbons').pass_disco(from_, *args) self._con.get_module('PrivacyLists').pass_disco(from_, *args) + self._con.get_module('HTTPUpload').pass_disco(from_, *args) identities, features, data, node = args if nbxmpp.NS_REGISTER in features: ===================================== gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/modules/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -106,7 +106,6 @@ class HTTPUpload: for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() - raise nbxmpp.NodeProcessed def handle_outgoing_stanza(self, event): if event.conn.name != self._account: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf580c62de1e850bb15da7d2de4d9adc19… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf580c62de1e850bb15da7d2de4d9adc19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows build: Install ctypes from git
by Philipp Hörist 24 Jul '18

24 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f9034701 by Philipp Hörist at 2018-07-24T23:32:27+02:00 Windows build: Install ctypes from git The version on pip is broken with python 3.7 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -92,6 +92,7 @@ function install_deps { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git +git+https://github.com/enthought/pywin32-ctypes.git keyring python-gnupg python-axolotl View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f903470130959aeeef9fa9a74674699765… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f903470130959aeeef9fa9a74674699765… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move subscription code into presence module
by Philipp Hörist 23 Jul '18

23 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d24c9bb by Philipp Hörist at 2018-07-23T23:04:07+02:00 Move subscription code into presence module - - - - - 7 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/modules/presence.py - gajim/dialogs.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -380,43 +380,6 @@ class CommonConnection: additional_data=obj.additional_data, stanza_id=obj.stanza_id) - def ack_subscribed(self, jid): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def ack_unsubscribed(self, jid): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def request_subscription(self, jid, msg='', name='', groups=None, - auto_auth=False): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def send_authorization(self, jid): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def refuse_authorization(self, jid): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def unsubscribe(self, jid, remove_auth = True): - """ - To be implemented by derived classes - """ - raise NotImplementedError - def unsubscribe_agent(self, agent): """ To be implemented by derived classes @@ -585,7 +548,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_connect_success = None self.on_connect_failure = None self.retrycount = 0 - self.jids_for_auto_auth = [] # list of jid to auto-authorize self.available_transports = {} # list of available transports on this # server {'icq': ['icq.server.com', 'icq2.server.com'], } self.private_storage_supported = True @@ -1651,75 +1613,6 @@ class Connection(CommonConnection, ConnectionHandlers): return self.connection.send(stanza) - def ack_subscribed(self, jid): - if not app.account_is_connected(self.name): - return - log.debug('ack\'ing subscription complete for %s' % jid) - p = nbxmpp.Presence(jid, 'subscribe') - self.connection.send(p) - - def ack_unsubscribed(self, jid): - if not app.account_is_connected(self.name): - return - log.debug('ack\'ing unsubscription complete for %s' % jid) - p = nbxmpp.Presence(jid, 'unsubscribe') - self.connection.send(p) - - def request_subscription(self, jid, msg='', name='', groups=None, - auto_auth=False, user_nick=''): - if not app.account_is_connected(self.name): - return - if groups is None: - groups = [] - log.debug('subscription request for %s' % jid) - if auto_auth: - self.jids_for_auto_auth.append(jid) - # RFC 3921 section 8.2 - infos = {'jid': jid} - if name: - infos['name'] = name - iq = nbxmpp.Iq('set', nbxmpp.NS_ROSTER) - q = iq.setQuery() - item = q.addChild('item', attrs=infos) - for g in groups: - item.addChild('group').setData(g) - self.connection.send(iq) - - p = nbxmpp.Presence(jid, 'subscribe') - if user_nick: - p.setTag('nick', namespace = nbxmpp.NS_NICK).setData(user_nick) - p = self.add_sha(p) - if msg: - p.setStatus(msg) - self.connection.send(p) - - def send_authorization(self, jid): - if not app.account_is_connected(self.name): - return - p = nbxmpp.Presence(jid, 'subscribed') - p = self.add_sha(p) - self.connection.send(p) - - def refuse_authorization(self, jid): - if not app.account_is_connected(self.name): - return - p = nbxmpp.Presence(jid, 'unsubscribed') - p = self.add_sha(p) - self.connection.send(p) - - def unsubscribe(self, jid, remove_auth = True): - if not app.account_is_connected(self.name): - return - if remove_auth: - self.connection.getRoster().delItem(jid) - jid_list = app.config.get_per('contacts') - for j in jid_list: - if j.startswith(jid): - app.config.del_per('contacts', j) - else: - self.connection.getRoster().Unsubscribe(jid) - self.update_contact(jid, '', []) - def unsubscribe_agent(self, agent): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -78,7 +78,7 @@ class ConnectionDisco: if resp.getType() == 'result': app.nec.push_incoming_event(InformationEvent( None, dialog_name='agent-register-success', args=agent)) - self.request_subscription(agent, auto_auth=True) + self.get_module('Presence').subscribe(agent, auto_auth=True) self.agent_registrations[agent]['roster_push'] = True if self.agent_registrations[agent]['sub_received']: p = nbxmpp.Presence(agent, 'subscribed') @@ -121,9 +121,6 @@ class ConnectionHandlersBase: # List of IDs that will produce a timeout is answer doesn't arrive # {time_of_the_timeout: (id, message to send to gui), } self.awaiting_timeouts = {} - # keep the jids we auto added (transports contacts) to not send the - # SUBSCRIBED event to gui - self.automatically_added = [] # keep track of sessions this connection has with other JIDs self.sessions = {} @@ -461,9 +458,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) - # keep the latest subscribed event for each jid to prevent loop when we - # acknowledge presences - self.subscribed_events = {} # IDs of disco#items requests self.disco_items_ids = [] # IDs of disco#info requests @@ -478,16 +472,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, ged.CORE, self._nec_roster_set_received) app.ged.register_event_handler('roster-received', ged.CORE, self._nec_roster_received) - app.ged.register_event_handler('subscribe-presence-received', - ged.CORE, self._nec_subscribe_presence_received) - app.ged.register_event_handler('subscribed-presence-received', - ged.CORE, self._nec_subscribed_presence_received) - app.ged.register_event_handler('subscribed-presence-received', - ged.POSTGUI, self._nec_subscribed_presence_received_end) - app.ged.register_event_handler('unsubscribed-presence-received', - ged.CORE, self._nec_unsubscribed_presence_received) - app.ged.register_event_handler('unsubscribed-presence-received', - ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) @@ -497,16 +481,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('roster-received', ged.CORE, self._nec_roster_received) - app.ged.remove_event_handler('subscribe-presence-received', - ged.CORE, self._nec_subscribe_presence_received) - app.ged.remove_event_handler('subscribed-presence-received', - ged.CORE, self._nec_subscribed_presence_received) - app.ged.remove_event_handler('subscribed-presence-received', - ged.POSTGUI, self._nec_subscribed_presence_received_end) - app.ged.remove_event_handler('unsubscribed-presence-received', - ged.CORE, self._nec_unsubscribed_presence_received) - app.ged.remove_event_handler('unsubscribed-presence-received', - ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) @@ -671,101 +645,13 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, self.connection.SendAndCallForResponse(iq, self._on_bob_received, {'cid': cid}) - def _nec_subscribe_presence_received(self, obj): - account = obj.conn.name - if account != self.name: - return - if app.jid_is_transport(obj.fjid) and obj.fjid in \ - self.agent_registrations: - self.agent_registrations[obj.fjid]['sub_received'] = True - if not self.agent_registrations[obj.fjid]['roster_push']: - # We'll reply after roster push result - return True - if app.config.get_per('accounts', self.name, 'autoauth') or \ - app.jid_is_transport(obj.fjid) or obj.jid in self.jids_for_auto_auth \ - or obj.transport_auto_auth: - if self.connection: - p = nbxmpp.Presence(obj.fjid, 'subscribed') - p = self.add_sha(p) - self.connection.send(p) - if app.jid_is_transport(obj.fjid) or obj.transport_auto_auth: - #TODO!?!? - #self.show = 'offline' - #self.status = 'offline' - #emit NOTIFY - pass - if obj.transport_auto_auth: - self.automatically_added.append(obj.jid) - self.request_subscription(obj.jid, name=obj.user_nick) - return True - if not obj.status: - obj.status = _('I would like to add you to my roster.') - - def _nec_subscribed_presence_received(self, obj): - account = obj.conn.name - if account != self.name: - return - # BE CAREFUL: no con.updateRosterItem() in a callback - if obj.jid in self.automatically_added: - self.automatically_added.remove(obj.jid) - return True - # detect a subscription loop - if obj.jid not in self.subscribed_events: - self.subscribed_events[obj.jid] = [] - self.subscribed_events[obj.jid].append(time_time()) - block = False - if len(self.subscribed_events[obj.jid]) > 5: - if time_time() - self.subscribed_events[obj.jid][0] < 5: - block = True - self.subscribed_events[obj.jid] = \ - self.subscribed_events[obj.jid][1:] - if block: - app.config.set_per('account', self.name, 'dont_ack_subscription', - True) - return True - - def _nec_subscribed_presence_received_end(self, obj): - account = obj.conn.name - if account != self.name: - return - if not app.config.get_per('accounts', account, - 'dont_ack_subscription'): - self.ack_subscribed(obj.jid) - - def _nec_unsubscribed_presence_received(self, obj): - account = obj.conn.name - if account != self.name: - return - # detect a unsubscription loop - if obj.jid not in self.subscribed_events: - self.subscribed_events[obj.jid] = [] - self.subscribed_events[obj.jid].append(time_time()) - block = False - if len(self.subscribed_events[obj.jid]) > 5: - if time_time() - self.subscribed_events[obj.jid][0] < 5: - block = True - self.subscribed_events[obj.jid] = \ - self.subscribed_events[obj.jid][1:] - if block: - app.config.set_per('account', self.name, 'dont_ack_subscription', - True) - return True - - def _nec_unsubscribed_presence_received_end(self, obj): - account = obj.conn.name - if account != self.name: - return - if not app.config.get_per('accounts', account, - 'dont_ack_subscription'): - self.ack_unsubscribed(obj.jid) - def _nec_agent_removed(self, obj): if obj.conn.name != self.name: return for jid in obj.jid_list: log.debug('Removing contact %s due to unregistered transport %s' % \ (jid, obj.agent)) - self.unsubscribe(jid) + self.get_module('Presence').unsubscribe(jid) # Transport contacts can't have 2 resources if jid in app.to_be_removed[self.name]: # This way we'll really remove it ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -383,12 +383,6 @@ PresenceHelperEvent): elif namespace == nbxmpp.NS_DELAY and not self.timestamp: # XEP-0091 self._generate_timestamp(self.stanza.timestamp) - elif namespace == 'http://delx.cjb.net/protocol/roster-subsync': - # see http://trac.gajim.org/ticket/326 - agent = app.get_server_from_jid(self.jid) - if self.conn.connection.getRoster().getItem(agent): - # to be sure it's a transport contact - self.transport_auto_auth = True if not self.is_gc and self.id_ and self.id_.startswith('gajim_muc_') \ and self.ptype == 'error': @@ -413,19 +407,7 @@ PresenceHelperEvent): presence_obj=self)) return - if self.ptype == 'subscribe': - app.nec.push_incoming_event(SubscribePresenceReceivedEvent(None, - conn=self.conn, stanza=self.stanza, presence_obj=self)) - elif self.ptype == 'subscribed': - # BE CAREFUL: no con.updateRosterItem() in a callback - app.nec.push_incoming_event(SubscribedPresenceReceivedEvent(None, - conn=self.conn, stanza=self.stanza, presence_obj=self)) - elif self.ptype == 'unsubscribe': - log.debug(_('unsubscribe request from %s') % self.jid) - elif self.ptype == 'unsubscribed': - app.nec.push_incoming_event(UnsubscribedPresenceReceivedEvent( - None, conn=self.conn, stanza=self.stanza, presence_obj=self)) - elif self.ptype == 'error': + if self.ptype == 'error': return if not self.ptype or self.ptype == 'unavailable': @@ -552,35 +534,6 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.new_nick = self.stanza.getNewNick() return True -class SubscribePresenceReceivedEvent(nec.NetworkIncomingEvent): - name = 'subscribe-presence-received' - base_network_events = [] - - def generate(self): - self.jid = self.presence_obj.jid - self.fjid = self.presence_obj.fjid - self.status = self.presence_obj.status - self.transport_auto_auth = self.presence_obj.transport_auto_auth - self.user_nick = self.presence_obj.user_nick - return True - -class SubscribedPresenceReceivedEvent(nec.NetworkIncomingEvent): - name = 'subscribed-presence-received' - base_network_events = [] - - def generate(self): - self.jid = self.presence_obj.jid - self.resource = self.presence_obj.resource - return True - -class UnsubscribedPresenceReceivedEvent(nec.NetworkIncomingEvent): - name = 'unsubscribed-presence-received' - base_network_events = [] - - def generate(self): - self.jid = self.presence_obj.jid - return True - class OurShowEvent(nec.NetworkIncomingEvent): name = 'our-show' base_network_events = [] ===================================== gajim/common/modules/presence.py ===================================== --- a/gajim/common/modules/presence.py +++ b/gajim/common/modules/presence.py @@ -16,8 +16,11 @@ import logging +import nbxmpp + from gajim.common import app from gajim.common.nec import NetworkEvent +from gajim.common.modules.user_nickname import parse_nickname log = logging.getLogger('gajim.c.m.presence') @@ -27,15 +30,171 @@ class Presence: self._con = con self._account = con.name - self.handlers = [('presence', self._presence_received)] + self.handlers = [ + ('presence', self._presence_received), + ('presence', self._subscribe_received, 'subscribe'), + ('presence', self._subscribed_received, 'subscribed'), + ('presence', self._unsubscribe_received, 'unsubscribe'), + ('presence', self._unsubscribed_received, 'unsubscribed'), + ] + + # keep the jids we auto added (transports contacts) to not send the + # SUBSCRIBED event to GUI + self.automatically_added = [] + + # list of jid to auto-authorize + self.jids_for_auto_auth = [] def _presence_received(self, con, stanza): + if stanza.getType() in ('subscribe', 'subscribed', + 'unsubscribe', 'unsubscribed'): + # Dont handle that here + return + log.info('Received from %s', stanza.getFrom()) app.nec.push_incoming_event( NetworkEvent('raw-pres-received', conn=self._con, stanza=stanza)) + def _subscribe_received(self, con, stanza): + from_ = stanza.getFrom() + jid = from_.getStripped() + fjid = str(from_) + status = stanza.getStatus() + is_transport = app.jid_is_transport(fjid) + auto_auth = app.config.get_per('accounts', self._account, 'autoauth') + user_nick = parse_nickname(stanza) + + log.info('Received Subscribe: %s, transport: %s, auto_auth: %s, ' + 'user_nick: %s', from_, is_transport, auto_auth, user_nick) + if is_transport and fjid in self._con.agent_registrations: + self._con.agent_registrations[fjid]['sub_received'] = True + if not self.agent_registrations[fjid]['roster_push']: + # We'll reply after roster push result + raise nbxmpp.NodeProcessed + + if auto_auth or is_transport or jid in self.jids_for_auto_auth: + presence = nbxmpp.Presence(fjid, 'subscribed') + presence = self._add_sha(presence) + self._con.connection.send(presence) + + if not status: + status = _('I would like to add you to my roster.') + + app.nec.push_incoming_event(NetworkEvent( + 'subscribe-presence-received', + conn=self._con, + jid=jid, + fjid=fjid, + status=status, + user_nick=user_nick, + is_transport=is_transport)) + + raise nbxmpp.NodeProcessed + + def _subscribed_received(self, con, stanza): + from_ = stanza.getFrom() + jid = from_.getStripped() + resource = from_.getResource() + log.info('Received Subscribed: %s', from_) + if jid in self.automatically_added: + self.automatically_added.remove(jid) + raise nbxmpp.NodeProcessed + + app.nec.push_incoming_event(NetworkEvent( + 'subscribed-presence-received', + conn=self._con, jid=jid, resource=resource)) + raise nbxmpp.NodeProcessed + + def _unsubscribe_received(self, con, stanza): + log.info('Received Unsubscribe: %s', stanza.getFrom()) + raise nbxmpp.NodeProcessed + + def _unsubscribed_received(self, con, stanza): + from_ = stanza.getFrom() + jid = from_.getStripped() + log.info('Received Unsubscribed: %s', from_) + app.nec.push_incoming_event(NetworkEvent( + 'unsubscribed-presence-received', + conn=self._con, jid=jid)) + raise nbxmpp.NodeProcessed + + def subscribed(self, jid): + if not app.account_is_connected(self._account): + return + log.info('Subscribed: %s', jid) + presence = nbxmpp.Presence(jid, 'subscribed') + presence = self._add_sha(presence) + self._con.connection.send(presence) + + def unsubscribed(self, jid): + if not app.account_is_connected(self._account): + return + log.info('Unsubscribed: %s', jid) + presence = nbxmpp.Presence(jid, 'unsubscribed') + presence = self._add_sha(presence) + self._con.connection.send(presence) + + def unsubscribe(self, jid, remove_auth=True): + if not app.account_is_connected(self._account): + return + if remove_auth: + self._con.connection.getRoster().delItem(jid) + jid_list = app.config.get_per('contacts') + for j in jid_list: + if j.startswith(jid): + app.config.del_per('contacts', j) + else: + log.info('Unsubscribe from %s', jid) + self._con.connection.getRoster().Unsubscribe(jid) + self._con.connection.getRoster().setItem(jid) + + def subscribe(self, jid, msg='', name='', groups=None, + auto_auth=False, user_nick=''): + if not app.account_is_connected(self._account): + return + if groups is None: + groups = [] + + log.info('Request Subscription to %s', jid) + + if auto_auth: + self.jids_for_auto_auth.append(jid) + + infos = {'jid': jid} + if name: + infos['name'] = name + iq = nbxmpp.Iq('set', nbxmpp.NS_ROSTER) + query = iq.setQuery() + item = query.addChild('item', attrs=infos) + for group in groups: + item.addChild('group').setData(group) + self._con.connection.send(iq) + + presence = nbxmpp.Presence(jid, 'subscribe') + if user_nick: + nick = presence.setTag('nick', namespace=nbxmpp.NS_NICK) + nick.setData(user_nick) + presence = self._add_sha(presence) + if msg: + presence.setStatus(msg) + self._con.connection.send(presence) + + def _add_sha(self, presence, send_caps=True): + vcard = self._con.get_module('VCardAvatars') + presence = vcard.add_update_node(presence) + if send_caps: + return self._add_caps(presence) + return presence + + def _add_caps(self, presence): + c = presence.setTag('c', namespace=nbxmpp.NS_CAPS) + c.setAttr('hash', 'sha-1') + c.setAttr('node', 'http://gajim.org') + c.setAttr('ver', app.caps_hash[self._account]) + return presence + def parse_show(stanza): show = stanza.getShow() ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -881,7 +881,7 @@ class SubscriptionRequestWindow(Gtk.ApplicationWindow): """ Accept the request """ - app.connections[self.account].send_authorization(self.jid) + app.connections[self.account].get_module('Presence').subscribed(self.jid) self.destroy() contact = app.contacts.get_contact(self.account, self.jid) if not contact or _('Not in Roster') in contact.groups: @@ -911,7 +911,7 @@ class SubscriptionRequestWindow(Gtk.ApplicationWindow): """ Refuse the request """ - app.connections[self.account].refuse_authorization(self.jid) + app.connections[self.account].get_module('Presence').unsubscribed(self.jid) contact = app.contacts.get_contact(self.account, self.jid) if contact and _('Not in Roster') in contact.get_shown_groups(): app.interface.roster.remove_contact(self.jid, self.account) @@ -1271,8 +1271,8 @@ class RosterItemExchangeWindow: groups = [] jid = model[iter_][1] if app.jid_is_transport(self.jid_from): - app.connections[self.account].automatically_added.append( - jid) + con = app.connections[self.account] + con.get_module('Presence').automatically_added.append(jid) app.interface.roster.req_sub(self, jid, message, self.account, groups=groups, nickname=model[iter_][2], auto_auth=True) @@ -1311,7 +1311,7 @@ class RosterItemExchangeWindow: a+=1 # it is selected jid = model[iter_][1] - app.connections[self.account].unsubscribe(jid) + app.connections[self.account].get_module('Presence').unsubscribe(jid) app.interface.roster.remove_contact(jid, self.account) app.contacts.remove_jid(self.account, jid) iter_ = model.iter_next(iter_) ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -723,7 +723,7 @@ class SignalObject(dbus.service.Object): for account in accounts: contacts = app.contacts.get_contacts(account, jid) if contacts: - app.connections[account].unsubscribe(jid) + app.connections[account].get_module('Presence').unsubscribe(jid) for contact in contacts: app.interface.roster.remove_contact(contact, account) app.contacts.remove_jid(account, jid) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2037,7 +2037,7 @@ class RosterWindow: """ Authorize a contact (by re-sending auth menuitem) """ - app.connections[account].send_authorization(jid) + app.connections[account].get_module('Presence').subscribed(jid) InformationDialog(_('Authorization sent'), _('"%s" will now see your status.') %jid) @@ -2047,8 +2047,8 @@ class RosterWindow: Request subscription to a contact """ groups_list = groups or [] - app.connections[account].request_subscription(jid, txt, nickname, - groups_list, auto_auth, app.nicks[account]) + app.connections[account].get_module('Presence').subscribe( + jid, txt, nickname, groups_list, auto_auth, app.nicks[account]) contact = app.contacts.get_contact_with_highest_priority(account, jid) if not contact: keyID = '' @@ -2076,7 +2076,7 @@ class RosterWindow: """ Revoke a contact's authorization """ - app.connections[account].refuse_authorization(jid) + app.connections[account].get_module('Presence').unsubscribed(jid) InformationDialog(_('Authorization removed'), _('Now "%s" will always see you as offline.') %jid) @@ -2792,7 +2792,7 @@ class RosterWindow: contact.jid: # We remove the server contact # remove it from treeview - app.connections[account].unsubscribe(contact.jid) + app.connections[account].get_module('Presence').unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) return @@ -2977,7 +2977,7 @@ class RosterWindow: self.remove_contact_from_groups(contact.jid, account, [group]) else: - app.connections[account].unsubscribe(contact.jid) + app.connections[account].get_module('Presence').unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) ConfirmationDialogCheck(_('Remove Group'), @@ -3410,7 +3410,7 @@ class RosterWindow: remove_auth = False for (contact, account) in list_: if _('Not in Roster') not in contact.get_shown_groups(): - app.connections[account].unsubscribe(contact.jid, + app.connections[account].get_module('Presence').unsubscribe(contact.jid, remove_auth) self.remove_contact(contact.jid, account, backend=True) if not remove_auth and contact.sub == 'both': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d24c9bbdd8a72dd592e823284f2622d76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d24c9bbdd8a72dd592e823284f2622d76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont disco unnecessary server items
by Philipp Hörist 23 Jul '18

23 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c4d9ff4 by Philipp Hörist at 2018-07-23T20:44:57+02:00 Dont disco unnecessary server items - - - - - 1 changed file: - gajim/common/modules/discovery.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -146,6 +146,9 @@ class Discovery: def _server_items_received(self, from_, node, items): log.info('Server items received') for item in items: + if 'node' in item: + # Only disco components + continue self.disco_info(item['jid'], success_cb=self._server_items_info_received) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c4d9ff4c79fb1f11afbfa772d0aee65c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c4d9ff4c79fb1f11afbfa772d0aee65c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch cert error in posh query
by Philipp Hörist 23 Jul '18

23 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ea34959b by Philipp Hörist at 2018-07-23T19:51:25+02:00 Catch cert error in posh query - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -43,6 +43,7 @@ import hashlib import json import logging import base64 +import ssl from functools import partial from string import Template from urllib.request import urlopen @@ -1281,7 +1282,7 @@ class Connection(CommonConnection, ConnectionHandlers): try: file = urlopen( url, cafile=cafile, timeout=2) - except URLError as exc: + except (URLError, ssl.CertificateError) as exc: log.info('Error while requesting POSH: %s' % exc) return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ea34959b35ed610ac1aa31f0097eb4e2ca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ea34959b35ed610ac1aa31f0097eb4e2ca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move caps code into own module
by Philipp Hörist 22 Jul '18

22 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a943a35a by Philipp Hörist at 2018-07-22T20:49:53+02:00 Move caps code into own module - - - - - 9 changed files: - gajim/chat_control.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/caps.py - gajim/common/modules/discovery.py - + gajim/common/modules/presence.py - − gajim/common/protocol/caps.py - gajim/groupchat_control.py - test/unit/test_protocol_caps.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -231,7 +231,7 @@ class ChatControl(ChatControlBase): self._nec_update_avatar) app.ged.register_event_handler('chatstate-received', ged.GUI1, self._nec_chatstate_received) - app.ged.register_event_handler('caps-received', ged.GUI1, + app.ged.register_event_handler('caps-update', ged.GUI1, self._nec_caps_received) app.ged.register_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) @@ -1154,7 +1154,7 @@ class ChatControl(ChatControlBase): self._nec_update_avatar) app.ged.remove_event_handler('chatstate-received', ged.GUI1, self._nec_chatstate_received) - app.ged.remove_event_handler('caps-received', ged.GUI1, + app.ged.remove_event_handler('caps-update', ged.GUI1, self._nec_caps_received) app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -29,24 +29,18 @@ ## import operator - from time import time as time_time -from gi.repository import GLib - import nbxmpp -from gajim.common import caps_cache as capscache from gajim.common import modules from gajim.common import helpers from gajim.common import app from gajim.common import jingle_xtls from gajim.common.caps_cache import muc_caps_cache -from gajim.common.protocol.caps import ConnectionCaps from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.connection_handlers_events import * -from gajim.common.modules.misc import parse_eme from gajim.common import ged from gajim.common.nec import NetworkEvent @@ -455,7 +449,7 @@ class ConnectionHandlersBase: return sess class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, - ConnectionCaps, ConnectionHandlersBase, + ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): ConnectionSocks5Bytestream.__init__(self) @@ -464,9 +458,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, # Handle presences BEFORE caps app.nec.register_incoming_event(PresenceReceivedEvent) - ConnectionCaps.__init__(self, account=self.name, - capscache=capscache.capscache, - client_caps_factory=capscache.create_suitable_client_caps) ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) @@ -502,7 +493,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, def cleanup(self): ConnectionHandlersBase.cleanup(self) - ConnectionCaps.cleanup(self) app.ged.remove_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('roster-received', ged.CORE, @@ -681,14 +671,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, self.connection.SendAndCallForResponse(iq, self._on_bob_received, {'cid': cid}) - def _presenceCB(self, con, prs): - """ - Called when we receive a presence - """ - log.debug('PresenceCB') - app.nec.push_incoming_event(NetworkEvent('raw-pres-received', - conn=self, stanza=prs)) - def _nec_subscribe_presence_received(self, obj): account = obj.conn.name if account != self.name: @@ -918,7 +900,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class # that defines handlers - con.RegisterHandler('presence', self._presenceCB) con.RegisterHandler('iq', self._rosterSetCB, 'set', nbxmpp.NS_ROSTER) con.RegisterHandler('iq', self._siSetCB, 'set', nbxmpp.NS_SI) con.RegisterHandler('iq', self._siErrorCB, 'error', nbxmpp.NS_SI) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -900,48 +900,6 @@ class ConnectionLostEvent(nec.NetworkIncomingEvent): show='offline')) return True -class CapsPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent, -PresenceHelperEvent): - name = 'caps-presence-received' - base_network_events = ['raw-pres-received'] - - def _extract_caps_from_presence(self): - caps_tag = self.stanza.getTag('c', namespace=nbxmpp.NS_CAPS) - if caps_tag: - self.hash_method = caps_tag['hash'] - self.node = caps_tag['node'] - self.caps_hash = caps_tag['ver'] - else: - self.hash_method = self.node = self.caps_hash = None - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - try: - self.get_jid_resource() - except Exception: - return - self._generate_ptype() - self._generate_show() - self._extract_caps_from_presence() - return True - -class CapsDiscoReceivedEvent(nec.NetworkIncomingEvent): - name = 'caps-disco-received' - base_network_events = [] - -class CapsReceivedEvent(nec.NetworkIncomingEvent): - name = 'caps-received' - base_network_events = ['caps-presence-received', 'caps-disco-received'] - - def generate(self): - self.conn = self.base_event.conn - self.fjid = self.base_event.fjid - self.jid = self.base_event.jid - self.resource = self.base_event.resource - self.client_caps = self.base_event.client_caps - return True - class GPGTrustKeyEvent(nec.NetworkIncomingEvent): name = 'gpg-trust-key' base_network_events = [] ===================================== gajim/common/modules/caps.py ===================================== --- /dev/null +++ b/gajim/common/modules/caps.py @@ -0,0 +1,153 @@ +# Copyright (C) 2009 Stephan Erb <steve-e AT h3c.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/>. + +# XEP-0115: Entity Capabilities + +import logging + +import nbxmpp + +from gajim.common import caps_cache +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.presence import parse_show +from gajim.common.modules.presence import parse_type + +log = logging.getLogger('gajim.c.m.caps') + + +class Caps: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('presence', self._presence_received, '', nbxmpp.NS_CAPS) + ] + + self._capscache = caps_cache.capscache + self._create_suitable_client_caps = caps_cache.create_suitable_client_caps + + def _presence_received(self, con, stanza): + hash_method = node = caps_hash = None + + caps = stanza.getTag('c', namespace=nbxmpp.NS_CAPS) + if caps is not None: + hash_method = caps['hash'] + node = caps['node'] + caps_hash = caps['ver'] + + from_ = stanza.getFrom() + full_jid = str(from_) + show = parse_show(stanza) + type_ = parse_type(stanza) + + log.info('Received from %s, type: %s, method: %s, node: %s, hash: %s', + from_, stanza.getType(), hash_method, node, caps_hash) + + client_caps = self._create_suitable_client_caps( + node, caps_hash, hash_method, full_jid) + + # Type is None means 'available' + if stanza.getType() is None and client_caps._hash_method == 'no': + self._capscache.forget_caps(client_caps) + client_caps = self._create_suitable_client_caps( + node, caps_hash, hash_method) + else: + self._capscache.query_client_of_jid_if_unknown( + self._con, full_jid, client_caps) + + self._update_client_caps_of_contact(from_, client_caps) + + # Event is only used by ClientIcons Plugin + app.nec.push_incoming_event(NetworkEvent( + 'caps-presence-received', + conn=self._con, + fjid=full_jid, + jid=from_.getStripped(), + resource=from_.getResource(), + hash_method=hash_method, + node=node, + caps_hash=caps_hash, + client_caps=client_caps, + show=show, + ptype=type_, + stanza=stanza)) + + app.nec.push_incoming_event(NetworkEvent('caps-update', + conn=self._con, + fjid=full_jid, + jid=from_.getStripped())) + + def _update_client_caps_of_contact(self, from_, client_caps): + contact = self._get_contact_or_gc_contact_for_jid(from_) + if contact is not None: + contact.client_caps = client_caps + else: + log.warning('Received Caps from unknown contact %s' % from_) + + def _get_contact_or_gc_contact_for_jid(self, from_): + contact = app.contacts.get_contact_from_full_jid(self._account, + str(from_)) + + if contact is None: + room_jid, resource = from_.getStripped(), from_.getResource() + contact = app.contacts.get_gc_contact( + self._account, room_jid, resource) + return contact + + def contact_info_received(self, from_, identities, features, data, node): + """ + callback to update our caps cache with queried information after + we have retrieved an unknown caps hash via a disco + """ + bare_jid = from_.getStripped() + + contact = self._get_contact_or_gc_contact_for_jid(from_) + if not contact: + log.info('Received Disco from unknown contact %s' % from_) + return + + lookup = contact.client_caps.get_cache_lookup_strategy() + cache_item = lookup(self._capscache) + + if cache_item.is_valid(): + # we already know that the hash is fine and have already cached + # the identities and features + return + else: + validate = contact.client_caps.get_hash_validation_strategy() + hash_is_valid = validate(identities, features, data) + + if hash_is_valid: + cache_item.set_and_store(identities, features) + else: + node = caps_hash = hash_method = None + contact.client_caps = self._create_suitable_client_caps( + node, caps_hash, hash_method) + log.warning( + 'Computed and retrieved caps hash differ. Ignoring ' + 'caps of contact %s' % contact.get_full_jid()) + + app.nec.push_incoming_event( + NetworkEvent('caps-update', + conn=self._con, + fjid=str(from_), + jid=bare_jid)) + + +def get_instance(*args, **kwargs): + return Caps(*args, **kwargs), 'Caps' ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -39,7 +39,7 @@ class Discovery: ] def disco_contact(self, jid, node=None): - success_cb = self._con._nec_agent_info_received_caps + success_cb = self._con.get_module('Caps').contact_info_received self._disco(nbxmpp.NS_DISCO_INFO, jid, node, success_cb, None) def disco_items(self, jid, node=None, success_cb=None, error_cb=None): ===================================== gajim/common/modules/presence.py ===================================== --- /dev/null +++ b/gajim/common/modules/presence.py @@ -0,0 +1,70 @@ +# 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/>. + +# Presence handler + +import logging + +from gajim.common import app +from gajim.common.nec import NetworkEvent + +log = logging.getLogger('gajim.c.m.presence') + + +class Presence: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [('presence', self._presence_received)] + + def _presence_received(self, con, stanza): + log.info('Received from %s', stanza.getFrom()) + app.nec.push_incoming_event( + NetworkEvent('raw-pres-received', + conn=self._con, + stanza=stanza)) + + +def parse_show(stanza): + show = stanza.getShow() + type_ = parse_type(stanza) + if show is None and type_ is None: + return 'online' + + if type_ == 'unavailable': + return 'offline' + + if show not in (None, 'chat', 'away', 'xa', 'dnd'): + log.warning('Invalid show element: %s', stanza) + if type_ is None: + return 'online' + return 'offline' + + if show is None: + return 'online' + return show + + +def parse_type(stanza): + type_ = stanza.getType() + if type_ not in (None, 'unavailable', 'error', 'subscribe', + 'subscribed', 'unsubscribe', 'unsubscribed'): + log.warning('Invalid type: %s', stanza) + return None + return type_ + + +def get_instance(*args, **kwargs): + return Presence(*args, **kwargs), 'Presence' ===================================== gajim/common/protocol/caps.py deleted ===================================== --- a/gajim/common/protocol/caps.py +++ /dev/null @@ -1,121 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/protocol/caps.py -## -## Copyright (C) 2009 Stephan Erb <steve-e AT h3c.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/>. -## - -""" -Module containing the network portion of XEP-115 (Entity Capabilities) -""" - -import logging -log = logging.getLogger('gajim.c.p.caps') - -from gajim.common import app -from gajim.common import ged -from gajim.common.connection_handlers_events import CapsPresenceReceivedEvent, \ - CapsDiscoReceivedEvent, CapsReceivedEvent - - -class ConnectionCaps(object): - - def __init__(self, account, capscache, client_caps_factory): - self._account = account - self._capscache = capscache - self._create_suitable_client_caps = client_caps_factory - app.nec.register_incoming_event(CapsPresenceReceivedEvent) - app.nec.register_incoming_event(CapsReceivedEvent) - app.ged.register_event_handler('caps-presence-received', ged.GUI1, - self._nec_caps_presence_received) - - def cleanup(self): - app.ged.remove_event_handler('caps-presence-received', ged.GUI1, - self._nec_caps_presence_received) - - def caps_change_account_name(self, new_name): - self._account = new_name - - def _nec_caps_presence_received(self, obj): - if obj.conn.name != self._account: - return - obj.client_caps = self._create_suitable_client_caps(obj.node, - obj.caps_hash, obj.hash_method, obj.fjid) - if obj.show == 'offline' and obj.client_caps._hash_method == 'no': - self._capscache.forget_caps(obj.client_caps) - obj.client_caps = self._create_suitable_client_caps(obj.node, - obj.caps_hash, obj.hash_method) - else: - self._capscache.query_client_of_jid_if_unknown(self, obj.fjid, - obj.client_caps) - self._update_client_caps_of_contact(obj) - - def _update_client_caps_of_contact(self, obj): - contact = self._get_contact_or_gc_contact_for_jid(obj.fjid) - if contact: - contact.client_caps = obj.client_caps - else: - log.info('Received Caps from unknown contact %s' % obj.fjid) - - def _get_contact_or_gc_contact_for_jid(self, jid): - contact = app.contacts.get_contact_from_full_jid(self._account, jid) - if contact is None: - room_jid, nick = app.get_room_and_nick_from_fjid(jid) - contact = app.contacts.get_gc_contact(self._account, room_jid, nick) - return contact - - def _nec_agent_info_received_caps(self, from_, identities, features, - data, node): - """ - callback to update our caps cache with queried information after - we have retrieved an unknown caps hash and issued a disco - """ - fjid = str(from_) - bare_jid = from_.getStripped() - resource = from_.getResource() - - contact = self._get_contact_or_gc_contact_for_jid(fjid) - if not contact: - log.info('Received Disco from unknown contact %s' % fjid) - return - - lookup = contact.client_caps.get_cache_lookup_strategy() - cache_item = lookup(self._capscache) - - if cache_item.is_valid(): - # we already know that the hash is fine and have already cached - # the identities and features - return - else: - validate = contact.client_caps.get_hash_validation_strategy() - hash_is_valid = validate(identities, features, data) - - if hash_is_valid: - cache_item.set_and_store(identities, features) - else: - node = caps_hash = hash_method = None - contact.client_caps = self._create_suitable_client_caps( - node, caps_hash, hash_method) - log.info('Computed and retrieved caps hash differ.' - 'Ignoring caps of contact %s' % contact.get_full_jid()) - - app.nec.push_incoming_event( - CapsDiscoReceivedEvent(None, - conn=self, - fjid=fjid, - jid=bare_jid, - resource=resource, - client_caps=contact.client_caps)) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -169,7 +169,7 @@ class PrivateChatControl(ChatControl): self.TYPE_ID = 'pm' app.ged.register_event_handler('update-gc-avatar', ged.GUI1, self._nec_update_avatar) - app.ged.register_event_handler('caps-received', ged.GUI1, + app.ged.register_event_handler('caps-update', ged.GUI1, self._nec_caps_received_pm) app.ged.register_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) @@ -181,7 +181,7 @@ class PrivateChatControl(ChatControl): super(PrivateChatControl, self).shutdown() app.ged.remove_event_handler('update-gc-avatar', ged.GUI1, self._nec_update_avatar) - app.ged.remove_event_handler('caps-received', ged.GUI1, + app.ged.remove_event_handler('caps-update', ged.GUI1, self._nec_caps_received_pm) app.ged.remove_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) ===================================== test/unit/test_protocol_caps.py ===================================== --- a/test/unit/test_protocol_caps.py +++ b/test/unit/test_protocol_caps.py @@ -1,7 +1,11 @@ ''' Tests for caps network coding ''' + import unittest +from unittest.mock import MagicMock + +import nbxmpp import lib lib.setup_env() @@ -10,64 +14,42 @@ from gajim.common import app from gajim.common import nec from gajim.common import ged from gajim.common import caps_cache -from gajim.common.connection_handlers import ConnectionHandlers -from gajim.common.protocol import caps -from gajim.common.contacts import Contact -from gajim.common.connection_handlers_events import CapsPresenceReceivedEvent - -from mock import Mock - -import nbxmpp - -class TestableConnectionCaps(ConnectionHandlers, caps.ConnectionCaps): - - def __init__(self, *args, **kwargs): - self.name = 'account' - self._mocked_contacts = {} - caps.ConnectionCaps.__init__(self, *args, **kwargs) - - def _get_contact_or_gc_contact_for_jid(self, jid): - """ - Overwrite to decouple form contact handling - """ - if jid not in self._mocked_contacts: - self._mocked_contacts[jid] = Mock(realClass=Contact) - self._mocked_contacts[jid].jid = jid - return self._mocked_contacts[jid] - - def discoverInfo(self, *args, **kwargs): - pass - - def get_mocked_contact_for_jid(self, jid): - return self._mocked_contacts[jid] +from gajim.common.modules.caps import Caps class TestConnectionCaps(unittest.TestCase): def setUp(self): + app.contacts.add_account('account') + contact = app.contacts.create_contact( + 'user(a)server.com', 'account', resource='a') + app.contacts.add_contact('account', contact) + app.nec = nec.NetworkEventsController() - app.ged.register_event_handler('caps-presence-received', ged.GUI2, + app.ged.register_event_handler( + 'caps-presence-received', ged.GUI2, self._nec_caps_presence_received) + self.module = Caps(MagicMock()) + self.module._account = 'account' + self.module._capscache = MagicMock() + def _nec_caps_presence_received(self, obj): - self.assertFalse(isinstance(obj.client_caps, caps_cache.NullClientCaps), - msg="On receive of proper caps, we must not use the fallback") + self.assertTrue( + isinstance(obj.client_caps, caps_cache.ClientCaps), + msg="On receive of valid caps, ClientCaps should be returned") def test_capsPresenceCB(self): fjid = "user(a)server.com/a" - connection_caps = TestableConnectionCaps("account", Mock(), - caps_cache.create_suitable_client_caps) - - contact = connection_caps._get_contact_or_gc_contact_for_jid(fjid) - xml = """<presence from='user(a)server.com/a' to='%s' id='123'> <c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o=' hash='sha-1' xmlns='http://jabber.org/protocol/caps'/> </presence> """ % (fjid) msg = nbxmpp.protocol.Presence(node=nbxmpp.simplexml.XML2Node(xml)) - connection_caps._presenceCB(None, msg) + self.module._presence_received(None, msg) + if __name__ == '__main__': unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a943a35a5da5577b47dcd929afc1d233b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a943a35a5da5577b47dcd929afc1d233b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Move ManagePEPServicesWindow into gtk module
by Philipp Hörist 22 Jul '18

22 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cd9ffc7e by Philipp Hörist at 2018-07-22T16:34:51+02:00 Move ManagePEPServicesWindow into gtk module - - - - - 8ed39525 by Philipp Hörist at 2018-07-22T16:43:42+02:00 Move ManageBookmarksWindow into gtk module - - - - - 8c299c0b by Philipp Hörist at 2018-07-22T16:46:37+02:00 Remove unused imports - - - - - 78e4e20d by Philipp Hörist at 2018-07-22T16:53:02+02:00 Move ProfileWindow into gtk module - - - - - 9 changed files: - gajim/app_actions.py - gajim/config.py - gajim/dialogs.py - gajim/gtk/__init__.py - + gajim/gtk/bookmarks.py - + gajim/gtk/pep_config.py - gajim/profile_window.py → gajim/gtk/profile.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -37,6 +37,7 @@ from gajim.gtk import SingleMessageWindow from gajim.gtk import XMLConsoleWindow from gajim.gtk import AboutDialog from gajim.gtk import PrivacyListsWindow +from gajim.gtk import ManageBookmarksWindow # General Actions @@ -75,7 +76,7 @@ def on_history_manager(action, param): def on_manage_bookmarks(action, param): - config.ManageBookmarksWindow() + ManageBookmarksWindow() def on_quit(action, param): ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1883,406 +1883,6 @@ class RemoveAccountWindow: app.interface.instances['accounts'].remove_account(self.account) self.window.destroy() - -#---------- ManageBookmarksWindow class -------------# -class ManageBookmarksWindow: - def __init__(self): - self.xml = gtkgui_helpers.get_gtk_builder('manage_bookmarks_window.ui') - self.window = self.xml.get_object('manage_bookmarks_window') - self.window.set_transient_for(app.interface.roster.window) - - self.ignore_events = False - - # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Password, Nick, - # Show_Status - self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str, str) - self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) - - # Store bookmarks in treeview. - for account, account_label in app.get_enabled_accounts_with_labels( - connected_only=True, private_storage_only=True): - iter_ = self.treestore.append(None, [None, account, None, None, - None, None, None, None, account_label]) - - con = app.connections[account] - bookmarks = con.get_module('Bookmarks').bookmarks - for jid, bookmark in bookmarks.items(): - if not bookmark['name']: - # No name was given for this bookmark. - # Use the first part of JID instead... - name = jid.split("@")[0] - bookmark['name'] = name - - # make '1', '0', 'true', 'false' (or other) to True/False - autojoin = helpers.from_xs_boolean_to_python_boolean( - bookmark['autojoin']) - - minimize = helpers.from_xs_boolean_to_python_boolean( - bookmark['minimize']) - - print_status = bookmark.get('print_status', '') - if print_status not in ('', 'all', 'in_and_out', 'none'): - print_status = '' - self.treestore.append(iter_, [ - account, - bookmark['name'], - jid, - autojoin, - minimize, - bookmark['password'], - bookmark['nick'], - print_status, - bookmark['name'] ]) - - self.print_status_combobox = self.xml.get_object('print_status_combobox') - model = Gtk.ListStore(str, str) - - self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'), - 'in_and_out': _('Enter and leave only'), - 'none': Q_('?print_status:None')} - for opt, label in sorted(self.option_list.items()): - model.append([label, opt]) - - self.print_status_combobox.set_model(model) - self.print_status_combobox.set_active(1) - - self.view = self.xml.get_object('bookmarks_treeview') - self.view.set_model(self.treestore) - self.view.expand_all() - - renderer = Gtk.CellRendererText() - column = Gtk.TreeViewColumn('Bookmarks', renderer, text=8) - self.view.append_column(column) - - self.selection = self.view.get_selection() - self.selection.connect('changed', self.bookmark_selected) - - #Prepare input fields - self.title_entry = self.xml.get_object('title_entry') - self.title_entry.connect('changed', self.on_title_entry_changed) - self.nick_entry = self.xml.get_object('nick_entry') - self.nick_entry.connect('changed', self.on_nick_entry_changed) - self.server_entry = self.xml.get_object('server_entry') - self.server_entry.connect('focus-out-event', - self.on_server_entry_focus_out) - self.room_entry = self.xml.get_object('room_entry') - self.room_entry_changed_id = self.room_entry.connect('changed', - self.on_room_entry_changed) - self.pass_entry = self.xml.get_object('pass_entry') - self.pass_entry.connect('changed', self.on_pass_entry_changed) - self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') - self.minimize_checkbutton = self.xml.get_object('minimize_checkbutton') - self.settings_box = self.xml.get_object('settings_box') - self.remove_bookmark_button = self.xml.get_object('remove_bookmark_button') - - self.xml.connect_signals(self) - self.window.show_all() - # select root iter - first_iter = self.treestore.get_iter_first() - if first_iter: - self.selection.select_iter(first_iter) - - def on_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.destroy() - - def on_add_bookmark_button_clicked(self, widget): - """ - Add a new bookmark - """ - # Get the account that is currently used - # (the parent of the currently selected item) - (model, iter_) = self.selection.get_selected() - if not iter_: # Nothing selected, do nothing - return - - parent = model.iter_parent(iter_) - - if parent: - # We got a bookmark selected, so we add_to the parent - add_to = parent - else: - # No parent, so we got an account -> add to this. - add_to = iter_ - - account = model[add_to][1] - nick = app.nicks[account] - label = _('New Group Chat') - iter_ = self.treestore.append(add_to, [account, label, - '@', False, False, '', nick, 'in_and_out', label]) - - self.view.expand_row(model.get_path(add_to), True) - self.view.set_cursor(model.get_path(iter_)) - - def on_remove_bookmark_button_clicked(self, widget): - """ - Remove selected bookmark - """ - (model, iter_) = self.selection.get_selected() - if not iter_: # Nothing selected - return - - if not model.iter_parent(iter_): - # Don't remove account iters - return - - self.ignore_events = True - model.remove(iter_) - self.selection.unselect_all() - self.clear_fields() - self.set_sensitive_all(False) - self.ignore_events = False - - def check_valid_bookmark(self): - """ - Check if all necessary fields are entered correctly - """ - (model, iter_) = self.selection.get_selected() - - if not model.iter_parent(iter_): - #Account data can't be changed - return - - if self.server_entry.get_text() == '' or \ - self.room_entry.get_text() == '': - ErrorDialog(_('This bookmark has invalid data'), - _('Please be sure to fill out server and room fields or remove this' - ' bookmark.')) - return False - - return True - - def on_ok_button_clicked(self, widget): - """ - Parse the treestore data into our new bookmarks array, then send the new - bookmarks to the server. - """ - - (model, iter_) = self.selection.get_selected() - if iter_ and model.iter_parent(iter_): - # bookmark selected, check it - if not self.check_valid_bookmark(): - return - - for account in self.treestore: - acct = account[1] - con = app.connections[acct] - con.get_module('Bookmarks').bookmarks = {} - - for bm in account.iterchildren(): - # Convert True/False/None to '1' or '0' - autojoin = str(int(bm[3])) - minimize = str(int(bm[4])) - name = bm[1] - jid = bm[2] - pw = bm[5] - nick = bm[6] - - # create the bookmark-dict - bmdict = { - 'name': name, - 'autojoin': autojoin, - 'minimize': minimize, - 'password': pw, - 'nick': nick, - 'print_status': bm[7]} - - con.get_module('Bookmarks').bookmarks[jid] = bmdict - - con.get_module('Bookmarks').store_bookmarks() - gui_menu_builder.build_bookmark_menu(acct) - self.window.destroy() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def bookmark_selected(self, selection): - """ - Fill in the bookmark's data into the fields. - """ - (model, iter_) = selection.get_selected() - - if not iter_: - # After removing the last bookmark for one account - # this will be None, so we will just: - return - - - - if model.iter_parent(iter_): - # make the fields sensitive - self.set_sensitive_all(True) - else: - # Top-level has no data (it's the account fields) - # clear fields & make them insensitive - self.clear_fields() - self.set_sensitive_all(False) - return - - # Fill in the data for childs - self.title_entry.set_text(model[iter_][1]) - room_jid = model[iter_][2] - room_jid_s = room_jid.split('@') - if len(room_jid_s) == 1: - room = '' - server = room_jid - else: - (room, server) = room_jid_s - self.room_entry.handler_block(self.room_entry_changed_id) - self.room_entry.set_text(room) - self.room_entry.handler_unblock(self.room_entry_changed_id) - self.server_entry.set_text(server) - - self.autojoin_checkbutton.set_active(model[iter_][3]) - self.minimize_checkbutton.set_active(model[iter_][4]) - # sensitive only if auto join is checked - self.minimize_checkbutton.set_sensitive(model[iter_][3]) - - if model[iter_][5] is not None: - password = model[iter_][5] - else: - password = None - - if password: - self.pass_entry.set_text(password) - else: - self.pass_entry.set_text('') - nick = model[iter_][6] - if nick: - self.nick_entry.set_text(nick) - else: - self.nick_entry.set_text('') - - print_status = model[iter_][7] - opts = sorted(self.option_list.keys()) - self.print_status_combobox.set_active(opts.index(print_status)) - - def on_title_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: # After removing a bookmark, we got nothing selected - if model.iter_parent(iter_): - # Don't clear the title field for account nodes - model[iter_][1] = self.title_entry.get_text() - - def on_nick_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - nick = self.nick_entry.get_text() - try: - nick = helpers.parse_resource(nick) - except helpers.InvalidFormat: - ErrorDialog(_('Invalid nickname'), - _('Character not allowed'), transient_for=self.window) - self.nick_entry.set_text(model[iter_][6]) - return True - model[iter_][6] = nick - - def on_server_entry_focus_out(self, widget, event): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if not iter_: - return - server = widget.get_text() - if not server: - return - if '@' in server: - ErrorDialog(_('Invalid server'), - _('Character not allowed'), transient_for=self.window) - widget.set_text(server.replace('@', '')) - - room = self.room_entry.get_text().strip() - if not room: - return - room_jid = room + '@' + server.strip() - try: - room_jid = helpers.parse_jid(room_jid) - except helpers.InvalidFormat as e: - ErrorDialog(_('Invalid server'), - _('Character not allowed'), transient_for=self.window) - self.server_entry.set_text(model[iter_][2].split('@')[1]) - return True - model[iter_][2] = room_jid - - def on_room_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if not iter_: - return - room = widget.get_text() - if not room: - return - if '@' in room: - room, server = room.split('@', 1) - widget.set_text(room) - if server: - self.server_entry.set_text(server) - self.server_entry.grab_focus() - server = self.server_entry.get_text().strip() - if not server: - return - room_jid = room.strip() + '@' + server - try: - room_jid = helpers.parse_jid(room_jid) - except helpers.InvalidFormat: - ErrorDialog(_('Invalid room'), - _('Character not allowed'), transient_for=self.window) - return True - model[iter_][2] = room_jid - - def on_pass_entry_changed(self, widget): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - model[iter_][5] = self.pass_entry.get_text() - - def on_autojoin_checkbutton_toggled(self, widget, *args): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - model[iter_][3] = self.autojoin_checkbutton.get_active() - self.minimize_checkbutton.set_sensitive(model[iter_][3]) - - def on_minimize_checkbutton_toggled(self, widget, *args): - if self.ignore_events: - return - (model, iter_) = self.selection.get_selected() - if iter_: - model[iter_][4] = self.minimize_checkbutton.get_active() - - def on_print_status_combobox_changed(self, widget): - if self.ignore_events: - return - active = widget.get_active() - model = widget.get_model() - print_status = model[active][1] - (model2, iter_) = self.selection.get_selected() - if iter_: - model2[iter_][7] = print_status - - def clear_fields(self): - widgets = [ self.title_entry, self.nick_entry, self.room_entry, - self.server_entry, self.pass_entry ] - for field in widgets: - field.set_text('') - self.autojoin_checkbutton.set_active(False) - self.minimize_checkbutton.set_active(False) - self.print_status_combobox.set_active(1) - - def set_sensitive_all(self, sensitive): - widgets = [ self.title_entry, self.nick_entry, self.room_entry, - self.server_entry, self.pass_entry, self.settings_box, - self.remove_bookmark_button ] - for field in widgets: - field.set_sensitive(sensitive) - class AccountCreationWizardWindow: def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder( @@ -2836,116 +2436,6 @@ class AccountCreationWizardWindow: app.interface.roster.setup_and_draw_roster() gui_menu_builder.build_accounts_menu() -class ManagePEPServicesWindow: - def __init__(self, account): - self.xml = gtkgui_helpers.get_gtk_builder('manage_pep_services_window.ui') - self.window = self.xml.get_object('manage_pep_services_window') - self.window.set_transient_for(app.interface.roster.window) - self.xml.get_object('configure_button').set_sensitive(False) - self.xml.get_object('delete_button').set_sensitive(False) - self.xml.connect_signals(self) - self.account = account - self._con = app.connections[self.account] - - self.init_services() - self.xml.get_object('services_treeview').get_selection().connect( - 'changed', self.on_services_selection_changed) - - app.ged.register_event_handler('pubsub-config-received', ged.GUI1, - self._nec_pep_config_received) - - self.window.show_all() - - def on_manage_pep_services_window_destroy(self, widget): - '''close window''' - del app.interface.instances[self.account]['pep_services'] - app.ged.remove_event_handler('pubsub-config-received', ged.GUI1, - self._nec_pep_config_received) - - def on_close_button_clicked(self, widget): - self.window.destroy() - - def on_services_selection_changed(self, sel): - self.xml.get_object('configure_button').set_sensitive(True) - self.xml.get_object('delete_button').set_sensitive(True) - - def init_services(self): - self.treeview = self.xml.get_object('services_treeview') - # service, access_model, group - self.treestore = Gtk.ListStore(str) - self.treeview.set_model(self.treestore) - - col = Gtk.TreeViewColumn('Service') - self.treeview.append_column(col) - - cellrenderer_text = Gtk.CellRendererText() - col.pack_start(cellrenderer_text, True) - col.add_attribute(cellrenderer_text, 'text', 0) - - jid = self._con.get_own_jid().getStripped() - self._con.get_module('Discovery').disco_items( - jid, success_cb=self._items_received, error_cb=self._items_error) - - def _items_received(self, from_, node, items): - jid = self._con.get_own_jid().getStripped() - for item in items: - if item['jid'] == jid and 'node' in item: - self.treestore.append([item['node']]) - - def _items_error(self, from_, error): - ErrorDialog('Error', error) - - def node_removed(self, jid, node): - if jid != app.get_jid_from_account(self.account): - return - model = self.treeview.get_model() - iter_ = model.get_iter_first() - while iter_: - if model[iter_][0] == node: - model.remove(iter_) - break - iter_ = model.iter_next(iter_) - - def node_not_removed(self, jid, node, msg): - if jid != app.get_jid_from_account(self.account): - return - WarningDialog(_('PEP node was not removed'), - _('PEP node %(node)s was not removed: %(message)s') % {'node': node, - 'message': msg}) - - def on_delete_button_clicked(self, widget): - selection = self.treeview.get_selection() - if not selection: - return - model, iter_ = selection.get_selected() - node = model[iter_][0] - our_jid = app.get_jid_from_account(self.account) - con = app.connections[self.account] - con.get_module('PubSub').send_pb_delete(our_jid, node, - on_ok=self.node_removed, - on_fail=self.node_not_removed) - - def on_configure_button_clicked(self, widget): - selection = self.treeview.get_selection() - if not selection: - return - model, iter_ = selection.get_selected() - node = model[iter_][0] - our_jid = app.get_jid_from_account(self.account) - con = app.connections[self.account] - con.get_module('PubSub').request_pb_configuration(our_jid, node) - - def _nec_pep_config_received(self, obj): - def on_ok(form, node): - form.type_ = 'submit' - our_jid = app.get_jid_from_account(self.account) - con = app.connections[self.account] - con.get_module('PubSub').send_pb_configure(our_jid, node, form) - window = dialogs.DataFormWindow(obj.form, (on_ok, obj.node)) - title = _('Configure %s') % obj.node - window.set_title(title) - window.show_all() - class ManageSoundsWindow: def __init__(self): ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -31,11 +31,9 @@ from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GObject from gi.repository import GLib import os -import nbxmpp import logging from gajim import gtkgui_helpers @@ -44,7 +42,6 @@ from gajim import dataforms_widget from random import randrange from gajim.common import ged -from gajim.common import const from gajim.common.const import ACTIVITIES from gajim.common.const import MOODS ===================================== gajim/gtk/__init__.py ===================================== --- a/gajim/gtk/__init__.py +++ b/gajim/gtk/__init__.py @@ -54,3 +54,6 @@ from gajim.gtk.xml_console import XMLConsoleWindow from gajim.gtk.privacy_list import PrivacyListsWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.server_info import ServerInfoDialog +from gajim.gtk.pep_config import ManagePEPServicesWindow +from gajim.gtk.bookmarks import ManageBookmarksWindow +from gajim.gtk.profile import ProfileWindow ===================================== gajim/gtk/bookmarks.py ===================================== --- /dev/null +++ b/gajim/gtk/bookmarks.py @@ -0,0 +1,437 @@ +# 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 +from gi.repository import Gdk + +from gajim import gui_menu_builder +from gajim.common import app +from gajim.common import helpers +from gajim.common.i18n import Q_ +from gajim.gtk import ErrorDialog +from gajim.gtk.util import get_builder + + +class ManageBookmarksWindow: + def __init__(self): + self.xml = get_builder('manage_bookmarks_window.ui') + self.window = self.xml.get_object('manage_bookmarks_window') + self.window.set_transient_for(app.interface.roster.window) + + self.ignore_events = False + + # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Password, Nick, + # Show_Status + self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, + str, str, str) + self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) + + # Store bookmarks in treeview. + for account, account_label in app.get_enabled_accounts_with_labels( + connected_only=True, private_storage_only=True): + iter_ = self.treestore.append(None, [ + None, account, None, None, + None, None, None, None, account_label]) + + con = app.connections[account] + bookmarks = con.get_module('Bookmarks').bookmarks + for jid, bookmark in bookmarks.items(): + if not bookmark['name']: + # No name was given for this bookmark. + # Use the first part of JID instead... + name = jid.split("@")[0] + bookmark['name'] = name + + # make '1', '0', 'true', 'false' (or other) to True/False + autojoin = helpers.from_xs_boolean_to_python_boolean( + bookmark['autojoin']) + + minimize = helpers.from_xs_boolean_to_python_boolean( + bookmark['minimize']) + + print_status = bookmark.get('print_status', '') + if print_status not in ('', 'all', 'in_and_out', 'none'): + print_status = '' + self.treestore.append(iter_, [account, + bookmark['name'], + jid, + autojoin, + minimize, + bookmark['password'], + bookmark['nick'], + print_status, + bookmark['name']]) + + self.print_status_combobox = self.xml.get_object( + 'print_status_combobox') + model = Gtk.ListStore(str, str) + + self.option_list = { + '': _('Default'), 'all': Q_('?print_status:All'), + 'in_and_out': _('Enter and leave only'), + 'none': Q_('?print_status:None')} + for opt, label in sorted(self.option_list.items()): + model.append([label, opt]) + + self.print_status_combobox.set_model(model) + self.print_status_combobox.set_active(1) + + self.view = self.xml.get_object('bookmarks_treeview') + self.view.set_model(self.treestore) + self.view.expand_all() + + renderer = Gtk.CellRendererText() + column = Gtk.TreeViewColumn('Bookmarks', renderer, text=8) + self.view.append_column(column) + + self.selection = self.view.get_selection() + self.selection.connect('changed', self.bookmark_selected) + + # Prepare input fields + self.title_entry = self.xml.get_object('title_entry') + self.title_entry.connect('changed', self.on_title_entry_changed) + self.nick_entry = self.xml.get_object('nick_entry') + self.nick_entry.connect('changed', self.on_nick_entry_changed) + self.server_entry = self.xml.get_object('server_entry') + self.server_entry.connect( + 'focus-out-event', self.on_server_entry_focus_out) + self.room_entry = self.xml.get_object('room_entry') + self.room_entry_changed_id = self.room_entry.connect( + 'changed', self.on_room_entry_changed) + self.pass_entry = self.xml.get_object('pass_entry') + self.pass_entry.connect('changed', self.on_pass_entry_changed) + self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') + self.minimize_checkbutton = self.xml.get_object('minimize_checkbutton') + self.settings_box = self.xml.get_object('settings_box') + self.remove_bookmark_button = self.xml.get_object( + 'remove_bookmark_button') + + self.xml.connect_signals(self) + self.window.show_all() + # select root iter + first_iter = self.treestore.get_iter_first() + if first_iter: + self.selection.select_iter(first_iter) + + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + + def on_add_bookmark_button_clicked(self, widget): + """ + Add a new bookmark + """ + # Get the account that is currently used + # (the parent of the currently selected item) + (model, iter_) = self.selection.get_selected() + if not iter_: # Nothing selected, do nothing + return + + parent = model.iter_parent(iter_) + + if parent: + # We got a bookmark selected, so we add_to the parent + add_to = parent + else: + # No parent, so we got an account -> add to this. + add_to = iter_ + + account = model[add_to][1] + nick = app.nicks[account] + label = _('New Group Chat') + iter_ = self.treestore.append(add_to, [ + account, label, '@', False, False, '', nick, 'in_and_out', label]) + + self.view.expand_row(model.get_path(add_to), True) + self.view.set_cursor(model.get_path(iter_)) + + def on_remove_bookmark_button_clicked(self, widget): + """ + Remove selected bookmark + """ + (model, iter_) = self.selection.get_selected() + if not iter_: # Nothing selected + return + + if not model.iter_parent(iter_): + # Don't remove account iters + return + + self.ignore_events = True + model.remove(iter_) + self.selection.unselect_all() + self.clear_fields() + self.set_sensitive_all(False) + self.ignore_events = False + + def check_valid_bookmark(self): + """ + Check if all necessary fields are entered correctly + """ + (model, iter_) = self.selection.get_selected() + + if not model.iter_parent(iter_): + # Account data can't be changed + return + + server = self.server_entry.get_text() + room = self.room_entry.get_text() + + if server == '' or room == '': + ErrorDialog( + _('This bookmark has invalid data'), + _('Please be sure to fill out server and room fields ' + 'or remove this bookmark.')) + return False + + return True + + def on_ok_button_clicked(self, widget): + """ + Parse the treestore data into our new bookmarks array, then send the + new bookmarks to the server. + """ + + (model, iter_) = self.selection.get_selected() + if iter_ and model.iter_parent(iter_): + # bookmark selected, check it + if not self.check_valid_bookmark(): + return + + for account in self.treestore: + acct = account[1] + con = app.connections[acct] + con.get_module('Bookmarks').bookmarks = {} + + for bm in account.iterchildren(): + # Convert True/False/None to '1' or '0' + autojoin = str(int(bm[3])) + minimize = str(int(bm[4])) + name = bm[1] + jid = bm[2] + pw = bm[5] + nick = bm[6] + + # create the bookmark-dict + bmdict = { + 'name': name, + 'autojoin': autojoin, + 'minimize': minimize, + 'password': pw, + 'nick': nick, + 'print_status': bm[7]} + + con.get_module('Bookmarks').bookmarks[jid] = bmdict + + con.get_module('Bookmarks').store_bookmarks() + gui_menu_builder.build_bookmark_menu(acct) + self.window.destroy() + + def on_cancel_button_clicked(self, widget): + self.window.destroy() + + def bookmark_selected(self, selection): + """ + Fill in the bookmark's data into the fields. + """ + (model, iter_) = selection.get_selected() + + if not iter_: + # After removing the last bookmark for one account + # this will be None, so we will just: + return + + if model.iter_parent(iter_): + # make the fields sensitive + self.set_sensitive_all(True) + else: + # Top-level has no data (it's the account fields) + # clear fields & make them insensitive + self.clear_fields() + self.set_sensitive_all(False) + return + + # Fill in the data for childs + self.title_entry.set_text(model[iter_][1]) + room_jid = model[iter_][2] + room_jid_s = room_jid.split('@') + if len(room_jid_s) == 1: + room = '' + server = room_jid + else: + (room, server) = room_jid_s + self.room_entry.handler_block(self.room_entry_changed_id) + self.room_entry.set_text(room) + self.room_entry.handler_unblock(self.room_entry_changed_id) + self.server_entry.set_text(server) + + self.autojoin_checkbutton.set_active(model[iter_][3]) + self.minimize_checkbutton.set_active(model[iter_][4]) + # sensitive only if auto join is checked + self.minimize_checkbutton.set_sensitive(model[iter_][3]) + + if model[iter_][5] is not None: + password = model[iter_][5] + else: + password = None + + if password: + self.pass_entry.set_text(password) + else: + self.pass_entry.set_text('') + nick = model[iter_][6] + if nick: + self.nick_entry.set_text(nick) + else: + self.nick_entry.set_text('') + + print_status = model[iter_][7] + opts = sorted(self.option_list.keys()) + self.print_status_combobox.set_active(opts.index(print_status)) + + def on_title_entry_changed(self, widget): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if iter_: # After removing a bookmark, we got nothing selected + if model.iter_parent(iter_): + # Don't clear the title field for account nodes + model[iter_][1] = self.title_entry.get_text() + + def on_nick_entry_changed(self, widget): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if iter_: + nick = self.nick_entry.get_text() + try: + nick = helpers.parse_resource(nick) + except helpers.InvalidFormat: + ErrorDialog( + _('Invalid nickname'), + _('Character not allowed'), + transient_for=self.window) + self.nick_entry.set_text(model[iter_][6]) + return True + model[iter_][6] = nick + + def on_server_entry_focus_out(self, widget, event): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if not iter_: + return + server = widget.get_text() + if not server: + return + if '@' in server: + ErrorDialog( + _('Invalid server'), + _('Character not allowed'), + transient_for=self.window) + widget.set_text(server.replace('@', '')) + + room = self.room_entry.get_text().strip() + if not room: + return + room_jid = room + '@' + server.strip() + try: + room_jid = helpers.parse_jid(room_jid) + except helpers.InvalidFormat as e: + ErrorDialog( + _('Invalid server'), + _('Character not allowed'), + transient_for=self.window) + self.server_entry.set_text(model[iter_][2].split('@')[1]) + return True + model[iter_][2] = room_jid + + def on_room_entry_changed(self, widget): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if not iter_: + return + room = widget.get_text() + if not room: + return + if '@' in room: + room, server = room.split('@', 1) + widget.set_text(room) + if server: + self.server_entry.set_text(server) + self.server_entry.grab_focus() + server = self.server_entry.get_text().strip() + if not server: + return + room_jid = room.strip() + '@' + server + try: + room_jid = helpers.parse_jid(room_jid) + except helpers.InvalidFormat: + ErrorDialog( + _('Invalid room'), + _('Character not allowed'), + transient_for=self.window) + return True + model[iter_][2] = room_jid + + def on_pass_entry_changed(self, widget): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if iter_: + model[iter_][5] = self.pass_entry.get_text() + + def on_autojoin_checkbutton_toggled(self, widget, *args): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if iter_: + model[iter_][3] = self.autojoin_checkbutton.get_active() + self.minimize_checkbutton.set_sensitive(model[iter_][3]) + + def on_minimize_checkbutton_toggled(self, widget, *args): + if self.ignore_events: + return + (model, iter_) = self.selection.get_selected() + if iter_: + model[iter_][4] = self.minimize_checkbutton.get_active() + + def on_print_status_combobox_changed(self, widget): + if self.ignore_events: + return + active = widget.get_active() + model = widget.get_model() + print_status = model[active][1] + (model2, iter_) = self.selection.get_selected() + if iter_: + model2[iter_][7] = print_status + + def clear_fields(self): + widgets = [ + self.title_entry, self.nick_entry, self.room_entry, + self.server_entry, self.pass_entry] + for field in widgets: + field.set_text('') + self.autojoin_checkbutton.set_active(False) + self.minimize_checkbutton.set_active(False) + self.print_status_combobox.set_active(1) + + def set_sensitive_all(self, sensitive): + widgets = [ + self.title_entry, self.nick_entry, self.room_entry, + self.server_entry, self.pass_entry, self.settings_box, + self.remove_bookmark_button] + for field in widgets: + field.set_sensitive(sensitive) ===================================== gajim/gtk/pep_config.py ===================================== --- /dev/null +++ b/gajim/gtk/pep_config.py @@ -0,0 +1,133 @@ +# 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 + +from gajim.common import app +from gajim.common import ged +from gajim.gtk import ErrorDialog +from gajim.gtk import WarningDialog +from gajim.gtk.util import get_builder + + +class ManagePEPServicesWindow: + def __init__(self, account): + self.xml = get_builder('manage_pep_services_window.ui') + self.window = self.xml.get_object('manage_pep_services_window') + self.window.set_transient_for(app.interface.roster.window) + self.xml.get_object('configure_button').set_sensitive(False) + self.xml.get_object('delete_button').set_sensitive(False) + self.xml.connect_signals(self) + self.account = account + self._con = app.connections[self.account] + + self.init_services() + self.xml.get_object('services_treeview').get_selection().connect( + 'changed', self.on_services_selection_changed) + + app.ged.register_event_handler( + 'pubsub-config-received', ged.GUI1, self._nec_pep_config_received) + + self.window.show_all() + + def on_manage_pep_services_window_destroy(self, widget): + del app.interface.instances[self.account]['pep_services'] + app.ged.remove_event_handler( + 'pubsub-config-received', ged.GUI1, self._nec_pep_config_received) + + def on_close_button_clicked(self, widget): + self.window.destroy() + + def on_services_selection_changed(self, sel): + self.xml.get_object('configure_button').set_sensitive(True) + self.xml.get_object('delete_button').set_sensitive(True) + + def init_services(self): + self.treeview = self.xml.get_object('services_treeview') + # service, access_model, group + self.treestore = Gtk.ListStore(str) + self.treeview.set_model(self.treestore) + + col = Gtk.TreeViewColumn('Service') + self.treeview.append_column(col) + + cellrenderer_text = Gtk.CellRendererText() + col.pack_start(cellrenderer_text, True) + col.add_attribute(cellrenderer_text, 'text', 0) + + jid = self._con.get_own_jid().getStripped() + self._con.get_module('Discovery').disco_items( + jid, success_cb=self._items_received, error_cb=self._items_error) + + def _items_received(self, from_, node, items): + jid = self._con.get_own_jid().getStripped() + for item in items: + if item['jid'] == jid and 'node' in item: + self.treestore.append([item['node']]) + + def _items_error(self, from_, error): + ErrorDialog('Error', error) + + def node_removed(self, jid, node): + if jid != app.get_jid_from_account(self.account): + return + model = self.treeview.get_model() + iter_ = model.get_iter_first() + while iter_: + if model[iter_][0] == node: + model.remove(iter_) + break + iter_ = model.iter_next(iter_) + + def node_not_removed(self, jid, node, msg): + if jid != app.get_jid_from_account(self.account): + return + WarningDialog( + _('PEP node was not removed'), + _('PEP node %(node)s was not removed: %(message)s') % { + 'node': node, 'message': msg}) + + def on_delete_button_clicked(self, widget): + selection = self.treeview.get_selection() + if not selection: + return + model, iter_ = selection.get_selected() + node = model[iter_][0] + our_jid = app.get_jid_from_account(self.account) + con = app.connections[self.account] + con.get_module('PubSub').send_pb_delete(our_jid, node, + on_ok=self.node_removed, + on_fail=self.node_not_removed) + + def on_configure_button_clicked(self, widget): + selection = self.treeview.get_selection() + if not selection: + return + model, iter_ = selection.get_selected() + node = model[iter_][0] + our_jid = app.get_jid_from_account(self.account) + con = app.connections[self.account] + con.get_module('PubSub').request_pb_configuration(our_jid, node) + + def _nec_pep_config_received(self, obj): + def on_ok(form, node): + form.type_ = 'submit' + our_jid = app.get_jid_from_account(self.account) + con = app.connections[self.account] + con.get_module('PubSub').send_pb_configure(our_jid, node, form) + from gajim.dialogs import DataFormWindow + window = DataFormWindow(obj.form, (on_ok, obj.node)) + title = _('Configure %s') % obj.node + window.set_title(title) + window.show_all() ===================================== gajim/profile_window.py → gajim/gtk/profile.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/gtk/profile.py @@ -1,24 +1,20 @@ -# -*- coding:utf-8 -*- -## src/profile_window.py -## -## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## -## 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/>. -## +# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +# +# 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 base64 import time @@ -32,6 +28,7 @@ from gi.repository import GLib from gajim import gtkgui_helpers from gajim.gtk import ErrorDialog from gajim.gtk import InformationDialog +from gajim.gtk.util import get_builder from gajim.filechoosers import AvatarChooserDialog from gajim.common.const import AvatarSize from gajim.common import app @@ -51,7 +48,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.connect('destroy', self.on_profile_window_destroy) self.connect('key-press-event', self.on_profile_window_key_press_event) - self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') + self.xml = get_builder('profile_window.ui') self.add(self.xml.get_object('profile_box')) self.progressbar = self.xml.get_object('progressbar') self.statusbar = self.xml.get_object('statusbar') @@ -89,7 +86,7 @@ class ProfileWindow(Gtk.ApplicationWindow): def update_progressbar(self): self.progressbar.pulse() - return True # loop forever + return True def remove_statusbar(self, message_id): self.statusbar.remove(self.context_id, message_id) @@ -100,12 +97,12 @@ class ProfileWindow(Gtk.ApplicationWindow): GLib.source_remove(self.update_progressbar_timeout_id) if self.remove_statusbar_timeout_id is not None: GLib.source_remove(self.remove_statusbar_timeout_id) - app.ged.remove_event_handler('vcard-published', ged.GUI1, - self._nec_vcard_published) - app.ged.remove_event_handler('vcard-not-published', ged.GUI1, - self._nec_vcard_not_published) + app.ged.remove_event_handler( + 'vcard-published', ged.GUI1, self._nec_vcard_published) + app.ged.remove_event_handler( + 'vcard-not-published', ged.GUI1, self._nec_vcard_not_published) - if self.dialog: # Image chooser dialog + if self.dialog: # Image chooser dialog self.dialog.destroy() def on_profile_window_key_press_event(self, widget, event): @@ -161,16 +158,17 @@ class ProfileWindow(Gtk.ApplicationWindow): nick = app.config.get_per('accounts', self.account, 'name') sha = app.contacts.get_avatar_sha(self.account, self.jid) menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) - menuitem.connect('activate', + menuitem.connect( + 'activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, nick) menu.append(menuitem) - menu.connect('selection-done', lambda w:w.destroy()) + menu.connect('selection-done', lambda w: w.destroy()) # show the menu menu.show_all() menu.attach_to_widget(widget, None) menu.popup(None, None, None, None, event.button, event.time) - elif event.button == 1: # left click + elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) def on_BDAY_entry_focus_out_event(self, widget, event): @@ -182,8 +180,10 @@ class ProfileWindow(Gtk.ApplicationWindow): except ValueError: if not widget.is_focus(): pritext = _('Wrong date format') - ErrorDialog(pritext, _('Format of the date must be ' - 'YYYY-MM-DD'), transient_for=self) + ErrorDialog( + pritext, + _('Format of the date must be YYYY-MM-DD'), + transient_for=self) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -201,7 +201,7 @@ class ProfileWindow(Gtk.ApplicationWindow): button = self.xml.get_object('PHOTO_button') image = self.xml.get_object('PHOTO_image') text_button = self.xml.get_object('NOPHOTO_button') - if not 'PHOTO' in vcard_: + if 'PHOTO' not in vcard_: # set default image image.set_from_pixbuf(None) button.hide() @@ -248,10 +248,10 @@ class ProfileWindow(Gtk.ApplicationWindow): if self.update_progressbar_timeout_id is not None: if self.message_id: self.statusbar.remove(self.context_id, self.message_id) - self.message_id = self.statusbar.push(self.context_id, - _('Information received')) - self.remove_statusbar_timeout_id = GLib.timeout_add_seconds(3, - self.remove_statusbar, self.message_id) + self.message_id = self.statusbar.push( + self.context_id, _('Information received')) + self.remove_statusbar_timeout_id = GLib.timeout_add_seconds( + 3, self.remove_statusbar, self.message_id) GLib.source_remove(self.update_progressbar_timeout_id) self.progressbar.hide() self.progressbar.set_fraction(0) @@ -266,10 +266,10 @@ class ProfileWindow(Gtk.ApplicationWindow): """ entries = entry.split('_') loc = vcard_ - if len(entries) == 3: # We need to use lists + if len(entries) == 3: # We need to use lists if entries[0] not in loc: loc[entries[0]] = [] - found = False + for e in loc[entries[0]]: if entries[1] in e: e[entries[2]] = txt @@ -289,13 +289,14 @@ class ProfileWindow(Gtk.ApplicationWindow): """ Make the vCard dictionary """ - entries = ['FN', 'NICKNAME', 'BDAY', 'EMAIL_HOME_USERID', 'JABBERID', 'URL', - 'TEL_HOME_NUMBER', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX', - 'N_SUFFIX', 'ADR_HOME_STREET', 'ADR_HOME_EXTADR', 'ADR_HOME_LOCALITY', - 'ADR_HOME_REGION', 'ADR_HOME_PCODE', 'ADR_HOME_CTRY', 'ORG_ORGNAME', - 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'TEL_WORK_NUMBER', 'EMAIL_WORK_USERID', - 'ADR_WORK_STREET', 'ADR_WORK_EXTADR', 'ADR_WORK_LOCALITY', - 'ADR_WORK_REGION', 'ADR_WORK_PCODE', 'ADR_WORK_CTRY'] + entries = [ + 'FN', 'NICKNAME', 'BDAY', 'EMAIL_HOME_USERID', 'JABBERID', 'URL', + 'TEL_HOME_NUMBER', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX', + 'N_SUFFIX', 'ADR_HOME_STREET', 'ADR_HOME_EXTADR', 'ADR_HOME_LOCALITY', + 'ADR_HOME_REGION', 'ADR_HOME_PCODE', 'ADR_HOME_CTRY', 'ORG_ORGNAME', + 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'TEL_WORK_NUMBER', 'EMAIL_WORK_USERID', + 'ADR_WORK_STREET', 'ADR_WORK_EXTADR', 'ADR_WORK_LOCALITY', + 'ADR_WORK_REGION', 'ADR_WORK_PCODE', 'ADR_WORK_CTRY'] vcard_ = {} for e in entries: txt = self.xml.get_object(e + '_entry').get_text() @@ -322,9 +323,11 @@ class ProfileWindow(Gtk.ApplicationWindow): # Operation in progress return if app.connections[self.account].connected < 2: - ErrorDialog(_('You are not connected to the server'), - _('Without a connection, you can not publish your contact ' - 'information.'), transient_for=self) + ErrorDialog( + _('You are not connected to the server'), + _('Without a connection, you can not publish your contact ' + 'information.'), + transient_for=self) return vcard_, sha = self.make_vcard() nick = '' @@ -337,11 +340,11 @@ class ProfileWindow(Gtk.ApplicationWindow): app.nicks[self.account] = nick app.connections[self.account].get_module('VCardTemp').send_vcard( vcard_, sha) - self.message_id = self.statusbar.push(self.context_id, - _('Sending profile…')) + self.message_id = self.statusbar.push( + self.context_id, _('Sending profile…')) self.progressbar.show() - self.update_progressbar_timeout_id = GLib.timeout_add(100, - self.update_progressbar) + self.update_progressbar_timeout_id = GLib.timeout_add( + 100, self.update_progressbar) def _nec_vcard_published(self, obj): if obj.conn.name != self.account: @@ -356,17 +359,18 @@ class ProfileWindow(Gtk.ApplicationWindow): return if self.message_id: self.statusbar.remove(self.context_id, self.message_id) - self.message_id = self.statusbar.push(self.context_id, - _('Information NOT published')) - self.remove_statusbar_timeout_id = GLib.timeout_add_seconds(3, - self.remove_statusbar, self.message_id) + self.message_id = self.statusbar.push( + self.context_id, _('Information NOT published')) + self.remove_statusbar_timeout_id = GLib.timeout_add_seconds( + 3, self.remove_statusbar, self.message_id) if self.update_progressbar_timeout_id is not None: GLib.source_remove(self.update_progressbar_timeout_id) self.progressbar.set_fraction(0) self.update_progressbar_timeout_id = None - InformationDialog(_('vCard publication failed'), + InformationDialog( + _('vCard publication failed'), _('There was an error while publishing your personal information, ' - 'try again later.'), transient_for=self) + 'try again later.'), transient_for=self) def on_cancel_button_clicked(self, widget): self.destroy() ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -106,7 +106,6 @@ from gajim.common.const import AvatarSize, SSLError, PEPEventType from gajim.common.const import ACTIVITIES, MOODS from gajim import roster_window -from gajim import profile_window from gajim import config from threading import Thread from gajim.common import ged @@ -123,6 +122,7 @@ from gajim.gtk import PlainConnectionDialog from gajim.gtk import SSLErrorDialog from gajim.gtk import ConfirmationDialogDoubleCheck from gajim.gtk import ChangeNickDialog +from gajim.gtk import ProfileWindow from gajim.common import configpaths @@ -284,9 +284,9 @@ class Interface: self.show_vcard_when_connect.remove(account) def edit_own_details(self, account): - window = app.get_app_window(profile_window.ProfileWindow) + window = app.get_app_window(ProfileWindow) if window is None: - profile_window.ProfileWindow(account) + ProfileWindow(account) else: window.present() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -68,6 +68,8 @@ from gajim.gtk import InformationDialog from gajim.gtk import NonModalConfirmationDialog from gajim.gtk import SingleMessageWindow from gajim.gtk import AddNewContactWindow +from gajim.gtk import ManagePEPServicesWindow +from gajim.gtk import ManageBookmarksWindow from gajim.common.const import AvatarSize @@ -3654,7 +3656,7 @@ class RosterWindow: app.interface.instances[account]['pep_services'].window.present() else: app.interface.instances[account]['pep_services'] = \ - config.ManagePEPServicesWindow(account) + ManagePEPServicesWindow(account) def on_add_new_contact(self, widget, account): AddNewContactWindow(account) @@ -3672,7 +3674,7 @@ class RosterWindow: self.refilter_shown_roster_items() def on_manage_bookmarks_menuitem_activate(self, widget): - config.ManageBookmarksWindow() + ManageBookmarksWindow() def on_execute_command(self, widget, contact, account, resource=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/07c87a4194baafc557f43b64c657e9ff2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/07c87a4194baafc557f43b64c657e9ff2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: Remove traces of forwarding messages (XEP-0146)
by Philipp Hörist 22 Jul '18

22 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9f65bca3 by Philipp Hörist at 2018-07-21T08:50:46+02:00 Remove traces of forwarding messages (XEP-0146) This is deprecated because its very insecure and also not needed anymore because of MAM - - - - - d4fd621d by Philipp Hörist at 2018-07-21T08:50:46+02:00 Use misc module to parse correction - - - - - 37f7a803 by Philipp Hörist at 2018-07-22T12:33:55+02:00 Move message handler into own module - - - - - 78858f7c by Philipp Hörist at 2018-07-22T16:19:53+02:00 Move more MUC methods into muc module - - - - - afb03061 by Philipp Hörist at 2018-07-22T16:19:59+02:00 Move security labels into own module - - - - - 1156897b by Philipp Hörist at 2018-07-22T16:19:59+02:00 Show Security Labels support in ServerInfo - - - - - 5ff9e9fe by Philipp Hörist at 2018-07-22T16:20:00+02:00 Move dataforms into modules folder - - - - - 07c87a41 by Philipp Hörist at 2018-07-22T16:20:00+02:00 Rewrite discovery code and move it into own module - - - - - 30 changed files: - gajim/adhoc_commands.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/caps_cache.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.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/carbons.py - + gajim/common/modules/chatstates.py - gajim/common/dataforms.py → gajim/common/modules/dataforms.py - + gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - + gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - + gajim/common/modules/receipts.py - + gajim/common/modules/security_labels.py - gajim/common/modules/user_nickname.py - + gajim/common/modules/util.py - gajim/common/modules/vcard_temp.py - gajim/common/protocol/bytestream.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/54b5dec6c73ba470799f5cd01b9a148d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/54b5dec6c73ba470799f5cd01b9a148d5… 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