Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflavio <fdanesse@gmail.com>2012-08-11 20:22:05 (GMT)
committer flavio <fdanesse@gmail.com>2012-08-11 20:22:05 (GMT)
commit302e7334412d98727666146ba4568fc57ce7dd49 (patch)
tree0208c05bdaaca9b4ec5b83777cec704f045b4265
parent015c5587d2a65e76eed686445bcc4e99504052ca (diff)
(Rafa) to change cjson for json, acording to SL#3142
-rw-r--r--activity.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/activity.py b/activity.py
index 7fa835c..6dcb10f 100644
--- a/activity.py
+++ b/activity.py
@@ -17,7 +17,7 @@
from gi.repository import Gtk
from gi.repository import Gdk
import logging
-import cjson
+import json
import math
from gettext import gettext as _
@@ -164,7 +164,7 @@ class Chat(activity.Activity):
"""Handle a private invite from a non-sugar3 XMPP client."""
if self.shared_activity or self.text_channel:
return
- bus_name, connection, channel = cjson.decode(tp_channel)
+ bus_name, connection, channel = json.loads(tp_channel)
logger.debug('GOT XMPP: %s %s %s', bus_name, connection,channel)
Connection( bus_name, connection, ready_handler=lambda conn: \
self._one_to_one_connection_ready_cb(bus_name, channel, conn))