From fa6c29144a349ca41f2091b5bb0c2cde775ff563 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Thu, 08 Nov 2012 05:30:57 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:speak/mainline

---
diff --git a/activity.py b/activity.py
index b973ca9..d80bb39 100644
--- a/activity.py
+++ b/activity.py
@@ -28,7 +28,7 @@ import logging
 import gtk
 import gobject
 import pango
-import cjson
+import json
 from gettext import gettext as _
 
 from sugar.graphics.toolbutton import ToolButton
@@ -195,7 +195,7 @@ class SpeakActivity(SharedActivity):
                 % xoOwner.props.nick)
 
     def resume_instance(self, file_path):
-        cfg = cjson.decode(file(file_path, 'r').read())
+        cfg = json.loads(file(file_path, 'r').read())
 
         status = self.face.status = face.Status().deserialize(cfg['status'])
         self.voices.select(status.voice)
@@ -217,7 +217,7 @@ class SpeakActivity(SharedActivity):
                 'history': [unicode(i[0], 'utf-8', 'ignore') \
                         for i in self.entrycombo.get_model()],
                 }
-        file(file_path, 'w').write(cjson.encode(cfg))
+        file(file_path, 'w').write(json.dumps(cfg))
 
     def share_instance(self, connection, is_initiator):
         self.chat.messenger = Messenger(connection, is_initiator, self.chat)
diff --git a/activity/activity.info b/activity/activity.info
index ef14258..96fa384 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -11,7 +11,7 @@ description = Speak is a talking face for the XO laptop. Anything you type will
 homepage  = http://wiki.sugarlabs.org/go/Activities/Speak
 license   = GPLv3+
 
-version   = 42
+version   = 44
 stability = stable
 
 icon      = activity-speak
@@ -19,7 +19,7 @@ exec      = sugar-activity activity.SpeakActivity
 requires  = base/gst-plugins-espeak; base/pyaiml
 
 # original activity.info options
-activity_version = 42
+activity_version = 44
 bundle_id = vu.lux.olpc.Speak
 
 [Source]
diff --git a/face.py b/face.py
index a3364b9..f71c043 100644
--- a/face.py
+++ b/face.py
@@ -24,7 +24,7 @@
 
 import logging 
 import gtk
-import cjson
+import json
 
 import sugar.graphics.style as style
 
@@ -56,7 +56,7 @@ class Status:
                     fft_mouth.FFTMouth : 2,
                     waveform_mouth.WaveformMouth : 3 }
 
-        return cjson.encode({
+        return json.dumps({
             'voice' : { 'language'  : self.voice.language,
                         'name'      : self.voice.name },
             'pitch' : self.pitch,
@@ -71,7 +71,7 @@ class Status:
                     2: fft_mouth.FFTMouth,
                     3: waveform_mouth.WaveformMouth }
 
-        data = cjson.decode(buf)
+        data = json.loads(buf)
         self.voice = voice.Voice(data['voice']['language'],
                 data['voice']['name'])
         self.pitch = data['pitch']
--
cgit v0.9.1