Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2012-07-23 07:58:38 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2012-07-23 07:58:38 (GMT)
commit2fd3c731d6b27a99173ecab9916034a3fb72f826 (patch)
tree63f2265c5fa4fb6c17106a1f6a4ffcc9790de687
parentac3fdc31224dd033f61a9b33a3fe5e91e7c316bc (diff)
Send event in json from Network service to avoid dbus marshaling issues
-rw-r--r--sugar_network/local/dbus_network.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/sugar_network/local/dbus_network.py b/sugar_network/local/dbus_network.py
index 378289f..9fb2ab0 100644
--- a/sugar_network/local/dbus_network.py
+++ b/sugar_network/local/dbus_network.py
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import json
+
import dbus
from dbus.service import BusName, method, signal
@@ -31,10 +33,10 @@ class Network(dbus_thread.Service):
dbus_thread.Service.__init__(self, bus_name, _OBJECT_PATH)
def handle_event(self, event):
- self.Event(event)
+ self.Event(json.dumps(event))
- @signal(_INTERFACE, signature='a{sv}')
- def Event(self, props):
+ @signal(_INTERFACE, signature='s')
+ def Event(self, event):
pass
@method(_INTERFACE, in_signature='sssas', out_signature='a{sv}',