diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-04-10 19:15:30 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-04-10 19:15:30 (GMT) |
| commit | a4792552f4899caeb809f477d66b2ae31bda50ef (patch) | |
| tree | 6b407b21ccf9eb65413b56424e6ae51923b37fb7 /services | |
| parent | e49b36c0f5549cb1747ea38282c9833aa551c75d (diff) | |
| parent | f134efbb6f4bdecf78aedc8a15fdd1ff5177a7e7 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'services')
| -rw-r--r-- | services/presence/activity.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/presence/activity.py b/services/presence/activity.py index 7711daf..42fed01 100644 --- a/services/presence/activity.py +++ b/services/presence/activity.py @@ -24,7 +24,7 @@ from telepathy.interfaces import (CHANNEL_INTERFACE) _ACTIVITY_PATH = "/org/laptop/Sugar/Presence/Activities/" _ACTIVITY_INTERFACE = "org.laptop.Sugar.Presence.Activity" -class DBusGObjectMetaclass(gobject.GObjectMeta, dbus.service.InterfaceType): pass +class DBusGObjectMetaclass(dbus.service.InterfaceType, gobject.GObjectMeta): pass class DBusGObject(dbus.service.Object, gobject.GObject): __metaclass__ = DBusGObjectMetaclass |