diff options
Diffstat (limited to 'collaboration/buddy.py')
| -rw-r--r-- | collaboration/buddy.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/collaboration/buddy.py b/collaboration/buddy.py index b117940..eedf615 100644 --- a/collaboration/buddy.py +++ b/collaboration/buddy.py @@ -17,8 +17,8 @@ import logging -import gobject -import gconf +from util.gtkcompat import GObject +#from util.gtkcompat import GConf import dbus from telepathy.client import Connection from telepathy.interfaces import CONNECTION @@ -32,7 +32,7 @@ CONNECTION_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo' _owner_instance = None -class BaseBuddyModel(gobject.GObject): +class BaseBuddyModel(GObject.GObject): __gtype_name__ = 'SugarBaseBuddyModel' def __init__(self, **kwargs): @@ -42,7 +42,7 @@ class BaseBuddyModel(gobject.GObject): self._tags = None self._current_activity = None - gobject.GObject.__init__(self, **kwargs) + GObject.GObject.__init__(self, **kwargs) def get_nick(self): return self._nick @@ -50,7 +50,7 @@ class BaseBuddyModel(gobject.GObject): def set_nick(self, nick): self._nick = nick - nick = gobject.property(type=object, getter=get_nick, setter=set_nick) + nick = GObject.property(type=object, getter=get_nick, setter=set_nick) def get_key(self): return self._key @@ -58,7 +58,7 @@ class BaseBuddyModel(gobject.GObject): def set_key(self, key): self._key = key - key = gobject.property(type=object, getter=get_key, setter=set_key) + key = GObject.property(type=object, getter=get_key, setter=set_key) def get_color(self): return self._color @@ -66,12 +66,12 @@ class BaseBuddyModel(gobject.GObject): def set_color(self, color): self._color = color - color = gobject.property(type=object, getter=get_color, setter=set_color) + color = GObject.property(type=object, getter=get_color, setter=set_color) def get_tags(self): return self._tags - tags = gobject.property(type=object, getter=get_tags) + tags = GObject.property(type=object, getter=get_tags) def get_current_activity(self): return self._current_activity @@ -81,7 +81,7 @@ class BaseBuddyModel(gobject.GObject): self._current_activity = current_activity self.notify('current-activity') - current_activity = gobject.property(type=object, + current_activity = GObject.property(type=object, getter=get_current_activity, setter=set_current_activity) @@ -95,7 +95,7 @@ class OwnerBuddyModel(BaseBuddyModel): def __init__(self): BaseBuddyModel.__init__(self) - #client = gconf.client_get_default() + #client = GConf.Client.get_default() #self.props.nick = client.get_string('/desktop/sugar/user/nick') self.props.nick = "rgs" #color = client.get_string('/desktop/sugar/user/color') @@ -212,7 +212,7 @@ class BuddyModel(BaseBuddyModel): def set_account(self, account): self._account = account - account = gobject.property(type=object, getter=get_account, + account = GObject.property(type=object, getter=get_account, setter=set_account) def get_contact_id(self): @@ -221,7 +221,7 @@ class BuddyModel(BaseBuddyModel): def set_contact_id(self, contact_id): self._contact_id = contact_id - contact_id = gobject.property(type=object, getter=get_contact_id, + contact_id = GObject.property(type=object, getter=get_contact_id, setter=set_contact_id) def get_handle(self): @@ -230,5 +230,5 @@ class BuddyModel(BaseBuddyModel): def set_handle(self, handle): self._handle = handle - handle = gobject.property(type=object, getter=get_handle, + handle = GObject.property(type=object, getter=get_handle, setter=set_handle) |