← Back to branch summary

~ubuntu-branches/ubuntu/wily/sugar-0.84/wily

« back to all changes in this revision

Viewing changes to src/jarabe/model/owner.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonas Smedegaard
  • Date: 2009-12-11 18:49:39 UTC
  • mfrom: (2.2.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091211184939-zxp8f64t03l2qv61
Tags: 0.84.9-1
* New upstream bugfix release.
* Update debian/copyright (just shuffling around, no new owners or
  licenses).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/jarabe/model/owner.py
17
17
 
18
18
import gobject
19
19
import os
20
 
import cjson
21
20
import gconf
 
21
import simplejson
22
22
 
23
23
from telepathy.interfaces import CHANNEL_TYPE_TEXT
24
24
 
98
98
            bundle_id = 'org.laptop.Chat'
99
99
        else:
100
100
            bundle_id = 'org.laptop.VideoChat'
101
 
        tp_channel = cjson.encode([bus_name, connection, channel])
 
101
        tp_channel = simplejson.dumps([bus_name, connection, channel])
102
102
        self._invites.add_private_invite(tp_channel, bundle_id)
103
103
 
104
104
    def _activity_disappeared_cb(self, pservice, activity):