Thanks Ajay.<div>I have a doubt. Testing after applying the patch,</div><div>can start the activity and join other instance, but can't see the changes</div><div>from one xo in the other. Can you?</div><div><br></div><div>
Gonzalo<br><br><div class="gmail_quote">On Thu, Feb 21, 2013 at 8:53 AM, Ajay Garg <span dir="ltr"><<a href="mailto:ajay@activitycentral.com" target="_blank">ajay@activitycentral.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This stopped working (for "Write"), since the time<br>
<a href="http://git.sugarlabs.org/sugar-toolkit-gtk3/sugar-toolkit-gtk3/commit/70cee44717d46129419992cd6a7e15472dc1f568" target="_blank">http://git.sugarlabs.org/sugar-toolkit-gtk3/sugar-toolkit-gtk3/commit/70cee44717d46129419992cd6a7e15472dc1f568</a><br>
was pushed.<br>
<br>
Signed-off-by: Ajay Garg <<a href="mailto:ajay@activitycentral.com">ajay@activitycentral.com</a>><br>
---<br>
AbiWordActivity.py | 21 ++++++++++-----------<br>
1 files changed, 10 insertions(+), 11 deletions(-)<br>
<br>
diff --git a/AbiWordActivity.py b/AbiWordActivity.py<br>
index 35b248c..e95718e 100644<br>
--- a/AbiWordActivity.py<br>
+++ b/AbiWordActivity.py<br>
@@ -67,7 +67,6 @@ class AbiWordActivity(activity.Activity):<br>
<br>
# create our main abiword canvas<br>
self.abiword_canvas = DocumentView()<br>
- self._shared_activity = None<br>
self._new_instance = True<br>
toolbar_box = ToolbarBox()<br>
<br>
@@ -182,13 +181,13 @@ class AbiWordActivity(activity.Activity):<br>
<br>
self.connect('shared', self._shared_cb)<br>
<br>
- if self._shared_activity:<br>
+ if self.shared_activity:<br>
# we are joining the activity<br>
logger.error('We are joining an activity')<br>
self.connect('joined', self._joined_cb)<br>
- self._shared_activity.connect('buddy-joined',<br>
+ self.shared_activity.connect('buddy-joined',<br>
self._buddy_joined_cb)<br>
- self._shared_activity.connect('buddy-left', self._buddy_left_cb)<br>
+ self.shared_activity.connect('buddy-left', self._buddy_left_cb)<br>
if self.get_shared():<br>
# # oh, OK, we've already joined<br>
self._joined_cb()<br>
@@ -236,8 +235,8 @@ class AbiWordActivity(activity.Activity):<br>
logger.error('My Write activity was shared')<br>
self._sharing_setup()<br>
<br>
- self._shared_activity.connect('buddy-joined', self._buddy_joined_cb)<br>
- self._shared_activity.connect('buddy-left', self._buddy_left_cb)<br>
+ self.shared_activity.connect('buddy-joined', self._buddy_joined_cb)<br>
+ self.shared_activity.connect('buddy-left', self._buddy_left_cb)<br>
<br>
channel = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES]<br>
logger.error('This is my activity: offering a tube...')<br>
@@ -247,13 +246,13 @@ class AbiWordActivity(activity.Activity):<br>
def _sharing_setup(self):<br>
logger.debug("_sharing_setup()")<br>
<br>
- if self._shared_activity is None:<br>
+ if self.shared_activity is None:<br>
logger.error('Failed to share or join activity')<br>
return<br>
<br>
- self.conn = self._shared_activity.telepathy_conn<br>
- self.tubes_chan = self._shared_activity.telepathy_tubes_chan<br>
- self.text_chan = self._shared_activity.telepathy_text_chan<br>
+ self.conn = self.shared_activity.telepathy_conn<br>
+ self.tubes_chan = self.shared_activity.telepathy_tubes_chan<br>
+ self.text_chan = self.shared_activity.telepathy_text_chan<br>
self.tube_id = None<br>
self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(<br>
'NewTube', self._new_tube_cb)<br>
@@ -267,7 +266,7 @@ class AbiWordActivity(activity.Activity):<br>
<br>
def _joined_cb(self, activity):<br>
logger.error("_joined_cb()")<br>
- if not self._shared_activity:<br>
+ if not self.shared_activity:<br>
return<br>
<br>
self.joined = True<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.11.7<br>
<br>
_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
</font></span></blockquote></div><br></div>