Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
84060484 by Yann Leboulanger at 2017-09-19T15:52:53+02:00
Remove more Gmail things
- - - - -
3 changed files:
- gajim/common/connection_handlers.py
- plugins/events_dump/plugin.py
- test/integration/test_resolver.py
Changes:
=====================================
gajim/common/connection_handlers.py
=====================================
--- 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',
=====================================
plugins/events_dump/plugin.py
=====================================
--- 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',
=====================================
test/integration/test_resolver.py
=====================================
--- 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):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/84060484c44aceeff32ef6aa715374de215d7c1a
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/84060484c44aceeff32ef6aa715374de215d7c1a
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
