From 7d0d96f94053472202fb2ef8f3f915f5ad3a2286 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Sun, 20 Jan 2013 23:59:28 -0800
Subject: Add Google Settings plugin.

---
 sleekxmpp/plugins/google_settings/settings.py | 65 +++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 sleekxmpp/plugins/google_settings/settings.py

(limited to 'sleekxmpp/plugins/google_settings/settings.py')

diff --git a/sleekxmpp/plugins/google_settings/settings.py b/sleekxmpp/plugins/google_settings/settings.py
new file mode 100644
index 00000000..470660e3
--- /dev/null
+++ b/sleekxmpp/plugins/google_settings/settings.py
@@ -0,0 +1,65 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+import logging
+
+from sleekxmpp.stanza import Iq
+from sleekxmpp.xmlstream.handler import Callback
+from sleekxmpp.xmlstream.matcher import MatchXPath
+from sleekxmpp.xmlstream import register_stanza_plugin
+from sleekxmpp.plugins import BasePlugin
+from sleekxmpp.plugins.google_settings import stanza
+
+
+log = logging.getLogger(__name__)
+
+
+class GoogleSettings(BasePlugin):
+
+    """
+    Google: Gmail Notifications
+
+    Also see <https://developers.google.com/talk/jep_extensions/usersettings>.
+    """
+
+    name = 'google_settings'
+    description = 'Google: User Settings'
+    dependencies = set()
+    stanza = stanza
+
+    def plugin_init(self):
+        register_stanza_plugin(Iq, stanza.UserSettings)
+
+        self.xmpp.register_handler(
+                Callback('Google Settings',
+                    MatchXPath('{%s}iq/%s' % (
+                        self.xmpp.default_ns,
+                        stanza.UserSettings.tag_name())),
+                    self._handle_settings_change))
+
+    def plugin_end(self):
+        self.xmpp.remove_handler('Google Settings')
+
+    def get(self, block=True, timeout=None, callback=None):
+        iq = self.xmpp.Iq()
+        iq['type'] = 'get'
+        iq.enable('google_settings')
+        return iq.send(block=block, timeout=timeout, callback=callback)
+
+    def update(settings, block=True, timeout=None, callback=None):
+        iq = self.xmpp.Iq()
+        iq['type'] = 'set'
+        iq.enable('google_settings')
+
+        for setting, value in settings.items():
+            iq['google_settings'][setting] = value
+
+        return iq.send(block=block, timeout=timeout, callback=callback)
+
+    def _handle_settings_change(self, iq):
+        self.xmpp.event('google_settings_change', iq)
-- 
cgit v1.2.3


From 903e641457f30670af36a13b51ef0ab3e611bead Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Mon, 21 Jan 2013 01:38:42 -0800
Subject: Fix issues in Google settings plugin.

---
 sleekxmpp/plugins/google_settings/settings.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'sleekxmpp/plugins/google_settings/settings.py')

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)
-- 
cgit v1.2.3