Ticket #3142: 0001-cjson-json-sl-3142.patch

File 0001-cjson-json-sl-3142.patch, 1.1 KB (added by RafaelOrtiz, 12 years ago)

  • activity.py 

    From 1e889b92e478c9c5f1e9b7835854ea452853143a Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Wed, 8 Aug 2012 23:32:32 -0500
Subject: [PATCH] cjson --> json sl#3142

---
 activity.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activity.py b/activity.py
index 7fa835c..6dcb10f 100644
    a b  
    1717from gi.repository import Gtk
    1818from gi.repository import Gdk
    1919import logging
    20 import cjson
     20import json
    2121import math
    2222from gettext import gettext as _
    2323
    … … class Chat(activity.Activity): 
    164164        """Handle a private invite from a non-sugar3 XMPP client."""
    165165        if self.shared_activity or self.text_channel:
    166166            return
    167         bus_name, connection, channel = cjson.decode(tp_channel)
     167        bus_name, connection, channel = json.loads(tp_channel)
    168168        logger.debug('GOT XMPP: %s %s %s', bus_name, connection,channel)
    169169        Connection( bus_name, connection, ready_handler=lambda conn: \
    170170        self._one_to_one_connection_ready_cb(bus_name, channel, conn))