diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-21 01:38:42 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-21 01:38:42 -0800 |
| commit | 903e641457f30670af36a13b51ef0ab3e611bead (patch) | |
| tree | 5d75ddb0728ddc5dc7b162779f8d0814a60472cd | |
| parent | f34b9399cc3fa8bb87d0271293a891533c8dacfd (diff) | |
| download | slixmpp-903e641457f30670af36a13b51ef0ab3e611bead.tar.gz slixmpp-903e641457f30670af36a13b51ef0ab3e611bead.tar.bz2 slixmpp-903e641457f30670af36a13b51ef0ab3e611bead.tar.xz slixmpp-903e641457f30670af36a13b51ef0ab3e611bead.zip | |
Fix issues in Google settings plugin.
| -rw-r--r-- | sleekxmpp/plugins/google_settings/settings.py | 13 | ||||
| -rw-r--r-- | sleekxmpp/plugins/google_settings/stanza.py | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/google_settings/settings.py b/sleekxmpp/plugins/google_settings/settings.py index 470660e3..6bd209c7 100644 --- a/sleekxmpp/plugins/google_settings/settings.py +++ b/sleekxmpp/plugins/google_settings/settings.py @@ -10,7 +10,7 @@ import logging from sleekxmpp.stanza import Iq from sleekxmpp.xmlstream.handler import Callback -from sleekxmpp.xmlstream.matcher import MatchXPath +from sleekxmpp.xmlstream.matcher import StanzaPath from sleekxmpp.xmlstream import register_stanza_plugin from sleekxmpp.plugins import BasePlugin from sleekxmpp.plugins.google_settings import stanza @@ -37,9 +37,7 @@ class GoogleSettings(BasePlugin): self.xmpp.register_handler( Callback('Google Settings', - MatchXPath('{%s}iq/%s' % ( - self.xmpp.default_ns, - stanza.UserSettings.tag_name())), + StanzaPath('iq@type=set/google_settings'), self._handle_settings_change)) def plugin_end(self): @@ -51,7 +49,7 @@ class GoogleSettings(BasePlugin): iq.enable('google_settings') return iq.send(block=block, timeout=timeout, callback=callback) - def update(settings, block=True, timeout=None, callback=None): + def update(self, settings, block=True, timeout=None, callback=None): iq = self.xmpp.Iq() iq['type'] = 'set' iq.enable('google_settings') @@ -62,4 +60,9 @@ class GoogleSettings(BasePlugin): return iq.send(block=block, timeout=timeout, callback=callback) def _handle_settings_change(self, iq): + reply = self.xmpp.Iq() + reply['type'] = 'result' + reply['id'] = iq['id'] + reply['to'] = iq['from'] + reply.send() self.xmpp.event('google_settings_change', iq) diff --git a/sleekxmpp/plugins/google_settings/stanza.py b/sleekxmpp/plugins/google_settings/stanza.py index cc887880..d8161770 100644 --- a/sleekxmpp/plugins/google_settings/stanza.py +++ b/sleekxmpp/plugins/google_settings/stanza.py @@ -6,7 +6,7 @@ See the file LICENSE for copying permission. """ -from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin +from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin class UserSettings(ElementBase): |