1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
From 90dd9a44e417f423791798a717d869ca332f1830 Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajay@activitycentral.com>
Date: Thu, 21 Feb 2013 16:41:01 +0530
Subject: [PATCH] sdxo#2948: [version 86.2] Making collaboration work again.
Organization: Sugar Labs Foundation
This stopped working (for "Write"), since the time
http://git.sugarlabs.org/sugar-toolkit-gtk3/sugar-toolkit-gtk3/commit/70cee44717d46129419992cd6a7e15472dc1f568
was pushed.
Signed-off-by: Ajay Garg <ajay@activitycentral.com>
---
AbiWordActivity.py | 21 ++++++++++-----------
activity/activity.info | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index 35b248c..e95718e 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -67,7 +67,6 @@ class AbiWordActivity(activity.Activity):
# create our main abiword canvas
self.abiword_canvas = DocumentView()
- self._shared_activity = None
self._new_instance = True
toolbar_box = ToolbarBox()
@@ -182,13 +181,13 @@ class AbiWordActivity(activity.Activity):
self.connect('shared', self._shared_cb)
- if self._shared_activity:
+ if self.shared_activity:
# we are joining the activity
logger.error('We are joining an activity')
self.connect('joined', self._joined_cb)
- self._shared_activity.connect('buddy-joined',
+ self.shared_activity.connect('buddy-joined',
self._buddy_joined_cb)
- self._shared_activity.connect('buddy-left', self._buddy_left_cb)
+ self.shared_activity.connect('buddy-left', self._buddy_left_cb)
if self.get_shared():
# # oh, OK, we've already joined
self._joined_cb()
@@ -236,8 +235,8 @@ class AbiWordActivity(activity.Activity):
logger.error('My Write activity was shared')
self._sharing_setup()
- self._shared_activity.connect('buddy-joined', self._buddy_joined_cb)
- self._shared_activity.connect('buddy-left', self._buddy_left_cb)
+ self.shared_activity.connect('buddy-joined', self._buddy_joined_cb)
+ self.shared_activity.connect('buddy-left', self._buddy_left_cb)
channel = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES]
logger.error('This is my activity: offering a tube...')
@@ -247,13 +246,13 @@ class AbiWordActivity(activity.Activity):
def _sharing_setup(self):
logger.debug("_sharing_setup()")
- if self._shared_activity is None:
+ if self.shared_activity is None:
logger.error('Failed to share or join activity')
return
- self.conn = self._shared_activity.telepathy_conn
- self.tubes_chan = self._shared_activity.telepathy_tubes_chan
- self.text_chan = self._shared_activity.telepathy_text_chan
+ self.conn = self.shared_activity.telepathy_conn
+ self.tubes_chan = self.shared_activity.telepathy_tubes_chan
+ self.text_chan = self.shared_activity.telepathy_text_chan
self.tube_id = None
self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
'NewTube', self._new_tube_cb)
@@ -267,7 +266,7 @@ class AbiWordActivity(activity.Activity):
def _joined_cb(self, activity):
logger.error("_joined_cb()")
- if not self._shared_activity:
+ if not self.shared_activity:
return
self.joined = True
diff --git a/activity/activity.info b/activity/activity.info
index 9e945d2..499a708 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,7 +3,7 @@ name = Write
bundle_id = org.laptop.AbiWordActivity
exec = sugar-activity AbiWordActivity.AbiWordActivity
icon = activity-write
-activity_version = 86.1
+activity_version = 86.2
show_launcher = 1
mime_types = text/rtf;text/plain;application/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/xhtml+xml;text/html;application/vnd.oasis.opendocument.text
license = GPLv2+
--
1.7.11.7
|
