From 98cc77f1fb35ae0c0e44a27dc389248b8024bba7 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Tue, 22 Jun 2010 14:31:21 +0000
Subject: Replace enough of the old PS so we can join an activity instance on the network.

* src/sugar/activity/activity.py: Get the shared activity wrapper from
  sugar.presence.
* src/sugar/activity/activityfactory.py: Disable checking in the PS for
  activity_id duplicates.
* src/sugar/presence/activity.py: Remove the PS dependency and query Telepathy
  directly. Implemented enough to join an activity.
* src/sugar/presence/buddy.py: Remove the PS dependency and query Telepathy
  directly. Implemented enough to join an activity. Added an Owner subclass of
  Buddy()
* src/sugar/presence/presenceservice.py: Remove the PS dependency and query Telepathy
  directly. Implemented enough to join an activity.
* src/sugar/presence/util.py: Add ConnectionManager for discovering and tracking
  connections.
---
(limited to 'src/sugar/activity/activityfactory.py')

diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index 6b4ba32..0dd3793 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -75,11 +75,14 @@ def create_activity_id():
 
         # check through network activities
         found = False
+        logging.info('KILL_PS check the activity_id is not used in the network')
+        """
         activities = pservice.get_activities()
         for act in activities:
             if act_id == act.props.id:
                 found = True
                 break
+        """
         if not found:
             return act_id
     raise RuntimeError("Cannot generate unique activity id.")
--
cgit v0.9.1