From 302e7334412d98727666146ba4568fc57ce7dd49 Mon Sep 17 00:00:00 2001
From: flavio <fdanesse@gmail.com>
Date: Sat, 11 Aug 2012 20:22:05 +0000
Subject: (Rafa) to change cjson for json, acording to SL#3142

---
(limited to 'activity.py')

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))
--
cgit v0.9.1