From 84060484c44aceeff32ef6aa715374de215d7c1a Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 19 Sep 2017 15:52:53 +0200 Subject: [PATCH] Remove more Gmail things --- gajim/common/connection_handlers.py | 4 ---- plugins/events_dump/plugin.py | 4 ++-- test/integration/test_resolver.py | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gajim/common/connection_handlers.py b/gajim/common/connection_handlers.py index 3528e0b99..033202602 100644 --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -2192,10 +2192,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._HttpAuthCB, 'get', nbxmpp.NS_HTTP_AUTH) con.RegisterHandler('iq', self._CommandExecuteCB, 'set', nbxmpp.NS_COMMANDS) - con.RegisterHandler('iq', self._gMailNewMailCB, 'set', - nbxmpp.NS_GMAILNOTIFY) - con.RegisterHandler('iq', self._gMailQueryCB, 'result', - nbxmpp.NS_GMAILNOTIFY) con.RegisterHandler('iq', self._DiscoverInfoGetCB, 'get', nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', diff --git a/plugins/events_dump/plugin.py b/plugins/events_dump/plugin.py index 1ecc83e33..b88554d5e 100644 --- a/plugins/events_dump/plugin.py +++ b/plugins/events_dump/plugin.py @@ -64,8 +64,8 @@ class EventsDumpPlugin(GajimPlugin): 'GC_AFFILIATION', 'GC_PASSWORD_REQUIRED', 'BAD_PASSPHRASE', 'ROSTER_INFO', 'BOOKMARKS', 'CON_TYPE', 'CONNECTION_LOST', 'FILE_REQUEST', - 'GMAIL_NOTIFY', 'FILE_REQUEST_ERROR', - 'FILE_SEND_ERROR', 'STANZA_ARRIVED', 'STANZA_SENT', + 'FILE_REQUEST_ERROR', 'FILE_SEND_ERROR', + 'STANZA_ARRIVED', 'STANZA_SENT', 'HTTP_AUTH', 'VCARD_PUBLISHED', 'VCARD_NOT_PUBLISHED', 'ASK_NEW_NICK', 'SIGNED_IN', 'METACONTACTS', 'ATOM_ENTRY', 'FAILED_DECRYPT', diff --git a/test/integration/test_resolver.py b/test/integration/test_resolver.py index 96b283d0b..dcdef91c3 100644 --- a/test/integration/test_resolver.py +++ b/test/integration/test_resolver.py @@ -13,13 +13,11 @@ from mock import Mock, expectParams from gajim_mocks import * from xmpp_mocks import IdleQueueThread -GMAIL_SRV_NAME = '_xmpp-client._tcp.gmail.com' NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' JABBERCZ_SRV_NAME = '_xmpp-client._tcp.jabber.cz' -TEST_LIST = [(GMAIL_SRV_NAME, 'srv', True), - (NONSENSE_NAME, 'srv', False), +TEST_LIST = [(NONSENSE_NAME, 'srv', False), (JABBERCZ_SRV_NAME, 'srv', True)] class TestResolver(unittest.TestCase):