From 8e6e5f5466dc3d92a055561ec378115c2639eee3 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Thu, 09 Aug 2012 18:32:40 +0000
Subject: cjson --> json sl#3142

Patch to change cjson for json, acording to SL#3142
---
(limited to 'activity.py')

diff --git a/activity.py b/activity.py
index d84e194..d67bfe4 100644
--- a/activity.py
+++ b/activity.py
@@ -16,7 +16,7 @@
 
 import gtk
 import logging
-import cjson
+import json
 import math
 from gettext import gettext as _
 
@@ -161,7 +161,7 @@ class Chat(activity.Activity):
         """Handle a private invite from a non-Sugar 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(
--
cgit v0.9.1