Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/collaboration
diff options
context:
space:
mode:
authorRaul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk>2011-02-01 10:36:22 (GMT)
committer Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk>2011-02-01 10:36:22 (GMT)
commitab3ece2632fdd6fc3b5491ac7e9169d21f5f940d (patch)
tree1954057da02caa2a5c0ee84e9a17aad274ab40bd /collaboration
parent02d6433b3e0084bc02e4b2a6fcefef64eac5cca0 (diff)
A bunch of fixes/hacks to make collab work
Diffstat (limited to 'collaboration')
-rw-r--r--collaboration/activity.py9
-rwxr-xr-xcollaboration/neighborhood.py11
2 files changed, 9 insertions, 11 deletions
diff --git a/collaboration/activity.py b/collaboration/activity.py
index 06e36df..bd58e92 100644
--- a/collaboration/activity.py
+++ b/collaboration/activity.py
@@ -355,10 +355,11 @@ class Activity(gobject.GObject):
del self._buddies[contact_id]
def _get_buddy(self, contact_id):
- if contact_id in self._buddies:
- return self._buddies[contact_id]
- else:
- return Buddy(self._account_path, contact_id)
+ return None
+ #if contact_id in self._buddies:
+ # return self._buddies[contact_id]
+ #else:
+ # return Buddy(self._account_path, contact_id)
def join(self):
"""Join this activity.
diff --git a/collaboration/neighborhood.py b/collaboration/neighborhood.py
index ad7ce21..b587bc8 100755
--- a/collaboration/neighborhood.py
+++ b/collaboration/neighborhood.py
@@ -896,13 +896,6 @@ class Neighborhood(gobject.GObject):
print('__activity_updated_cb Unknown activity with activity_id %r', activity_id)
return
- ###
- # FIXME: this should be configurable, we only care about the activity thats using this lib
- # i.e.: Turtle Art
-
- if properties['type']:
- print properties['type']
-
# we should somehow emulate this and say we only have TurtleArtActivity
#registry = bundleregistry.get_registry()
#bundle = registry.get_bundle(properties['type'])
@@ -922,6 +915,10 @@ class Neighborhood(gobject.GObject):
activity.props.name = properties['name']
if 'private' in properties:
activity.props.private = properties['private']
+ # FIXME: this should be configurable, we only care about the activity thats using this lib
+ # i.e.: Turtle Art
+ if properties['type']:
+ activity.props.bundle = properties['type']
if is_new:
print "The activity is new"