Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/presence
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-17 10:00:45 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-20 13:33:54 (GMT)
commit1af1bc97134663fdbb9a7c71fb1b1b4aad8545ed (patch)
tree335d15f01ed9454de3780371ab6fa543a6abc8c6 /src/sugar/presence
parent56679a3de6f4731e87d9e997abcdec1d1dddc040 (diff)
Address several nitpicks from Marco
Diffstat (limited to 'src/sugar/presence')
-rw-r--r--src/sugar/presence/Makefile.am4
-rw-r--r--src/sugar/presence/buddy.py2
-rw-r--r--src/sugar/presence/connectionmanager.py (renamed from src/sugar/presence/util.py)0
-rw-r--r--src/sugar/presence/presenceservice.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/sugar/presence/Makefile.am b/src/sugar/presence/Makefile.am
index e41f099..6d87fe7 100644
--- a/src/sugar/presence/Makefile.am
+++ b/src/sugar/presence/Makefile.am
@@ -3,8 +3,8 @@ sugar_PYTHON = \
__init__.py \
activity.py \
buddy.py \
+ connectionmanager.py \
sugartubeconn.py \
tubeconn.py \
- presenceservice.py \
- util.py
+ presenceservice.py
diff --git a/src/sugar/presence/buddy.py b/src/sugar/presence/buddy.py
index 41ab9c4..0a72a36 100644
--- a/src/sugar/presence/buddy.py
+++ b/src/sugar/presence/buddy.py
@@ -31,7 +31,7 @@ from telepathy.interfaces import CONNECTION, \
CONNECTION_INTERFACE_CONTACTS
from telepathy.constants import HANDLE_TYPE_CONTACT
-from sugar.presence.util import get_connection_manager
+from sugar.presence.connectionmanager import get_connection_manager
ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
diff --git a/src/sugar/presence/util.py b/src/sugar/presence/connectionmanager.py
index cc57137..cc57137 100644
--- a/src/sugar/presence/util.py
+++ b/src/sugar/presence/connectionmanager.py
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py
index 69632b9..4241cd4 100644
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar/presence/presenceservice.py
@@ -31,7 +31,7 @@ from dbus import PROPERTIES_IFACE
from sugar.presence.buddy import Buddy, Owner
from sugar.presence.activity import Activity
-from sugar.presence.util import get_connection_manager
+from sugar.presence.connectionmanager import get_connection_manager
from telepathy.interfaces import ACCOUNT, \
ACCOUNT_MANAGER, \