Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
Well, I compared the logs, and they appeared to be same :) I re-tested on build 30, with the same setup :: Write-86.2 (after applying this patch) on * build 30 for XO-4 (as the inviter) * build 30 for XO-1.75 (as the joiner) and if one waits for about 5 seconds before starting to write/do-anything in either of the collaborated canvas, collaboration does work. Gonzalo, I will be grateful if you try once again :) Again, I am extremely sorry to Gonzalo to others, for the minor hiccup. On Wed, Feb 27, 2013 at 10:58 AM, Ajay Garg a...@activitycentral.comwrote: On Wed, Feb 27, 2013 at 5:05 AM, Gonzalo Odiard gonz...@laptop.orgwrote: Thanks Ajay. I have a doubt. Testing after applying the patch, can start the activity and join other instance, but can't see the changes from one xo in the other. Can you? a) I tested with bundle-86.2 (after applying this patch) on * build 30 for XO-4 (as the inviter) * build 30 for XO-1.75 (as the joiner) Collaboration didn't work :( b) I then re-tested with the SAME bundle, on * DX4 build 14 on XO-4 (as the inviter) * DX4 build 14 on XO-1.75 (as the joiner) Collaboration worked fine (I tested with sharing text, and image). There seem to be some platform-exceptions on build 30 in the failure cases, most probably as a result of http://bugs.sugarlabs.org/ticket/2955. I will try and confirm, and see if I can make collaboration work on the build 30. Gonzalo On Thu, Feb 21, 2013 at 8:53 AM, Ajay Garg a...@activitycentral.comwrote: 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 a...@activitycentral.com --- AbiWordActivity.py | 21 ++--- 1 files changed, 10 insertions(+), 11 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 -- 1.7.11.7 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
Thanks Ajay. I have a doubt. Testing after applying the patch, can start the activity and join other instance, but can't see the changes from one xo in the other. Can you? Gonzalo On Thu, Feb 21, 2013 at 8:53 AM, Ajay Garg a...@activitycentral.com wrote: 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 a...@activitycentral.com --- AbiWordActivity.py | 21 ++--- 1 files changed, 10 insertions(+), 11 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 -- 1.7.11.7 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
On Wed, Feb 27, 2013 at 5:05 AM, Gonzalo Odiard gonz...@laptop.org wrote: Thanks Ajay. I have a doubt. Testing after applying the patch, can start the activity and join other instance, but can't see the changes from one xo in the other. Can you? a) I tested with bundle-86.2 (after applying this patch) on * build 30 for XO-4 (as the inviter) * build 30 for XO-1.75 (as the joiner) Collaboration didn't work :( b) I then re-tested with the SAME bundle, on * DX4 build 14 on XO-4 (as the inviter) * DX4 build 14 on XO-1.75 (as the joiner) Collaboration worked fine (I tested with sharing text, and image). There seem to be some platform-exceptions on build 30 in the failure cases, most probably as a result of http://bugs.sugarlabs.org/ticket/2955. I will try and confirm, and see if I can make collaboration work on the build 30. Gonzalo On Thu, Feb 21, 2013 at 8:53 AM, Ajay Garg a...@activitycentral.comwrote: 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 a...@activitycentral.com --- AbiWordActivity.py | 21 ++--- 1 files changed, 10 insertions(+), 11 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 -- 1.7.11.7 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Regards, Ajay Garg Dextrose Developer Activity Central: http://activitycentral.com ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
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 a...@activitycentral.com --- AbiWordActivity.py | 21 ++--- 1 files changed, 10 insertions(+), 11 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 -- 1.7.11.7 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
I've had to make a similar change in my activities as well. (I guess I missed the patch go by when self._shared_activity became self.shared_actvity) There is a also a method, self.get_shared_activity(), which might be better than directly referencing the instance variable. I suppose it is a style issue. -walter On Thu, Feb 21, 2013 at 6:53 AM, Ajay Garg a...@activitycentral.com wrote: 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 a...@activitycentral.com --- AbiWordActivity.py | 21 ++--- 1 files changed, 10 insertions(+), 11 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 -- 1.7.11.7 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
2013/2/21 Walter Bender walter.ben...@gmail.com: I've had to make a similar change in my activities as well. (I guess I missed the patch go by when self._shared_activity became self.shared_actvity) There is a also a method, self.get_shared_activity(), which might be better than directly referencing the instance variable. I suppose it is a style issue. Thanks both Ajay and Walter for looking at this. Yes, git log says to me that the usage of _shared_activity was marked as deprecated in the code for a long time, and get_shared_activity was the recommended form. This deprecation was removed in commit 70cee447 of toolkit-gtk3 in January 2012, and the API change was stated in 0.96 release notes: http://wiki.sugarlabs.org/go/0.96/Notes#API. We should check if other activities are still using it. Help welcome. -- .. manuq .. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
On 02/21/2013 04:35 PM, Manuel Quiñones wrote: 2013/2/21 Walter Bender walter.ben...@gmail.com: I've had to make a similar change in my activities as well. (I guess I missed the patch go by when self._shared_activity became self.shared_actvity) There is a also a method, self.get_shared_activity(), which might be better than directly referencing the instance variable. I suppose it is a style issue. Thanks both Ajay and Walter for looking at this. Thanks for digging that up! Yes, git log says to me that the usage of _shared_activity was marked as deprecated in the code for a long time, and get_shared_activity was the recommended form. This deprecation was removed in commit 70cee447 of toolkit-gtk3 in January 2012, and the API change was stated in 0.96 release notes: http://wiki.sugarlabs.org/go/0.96/Notes#API. We should check if other activities are still using it. Help welcome. I did it for Memorize in the GTK+ 3 work already [1]. I added an extra note to the 0.98 Notes [2]. [1] http://git.sugarlabs.org/memorize/mainline/commit/d23d46cac218d7495890904f84d4ef66de7bdb49 [2] http://wiki.sugarlabs.org/go/0.98/Notes#API Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.
On Thu, Feb 21, 2013 at 10:35 AM, Manuel Quiñones ma...@laptop.org wrote: 2013/2/21 Walter Bender walter.ben...@gmail.com: I've had to make a similar change in my activities as well. (I guess I missed the patch go by when self._shared_activity became self.shared_actvity) There is a also a method, self.get_shared_activity(), which might be better than directly referencing the instance variable. I suppose it is a style issue. Thanks both Ajay and Walter for looking at this. Yes, git log says to me that the usage of _shared_activity was marked as deprecated in the code for a long time, and get_shared_activity was the recommended form. This deprecation was removed in commit 70cee447 of toolkit-gtk3 in January 2012, and the API change was stated in 0.96 release notes: http://wiki.sugarlabs.org/go/0.96/Notes#API. We should check if other activities are still using it. Help welcome. I have a bunch of activities I never changed. Ooops. Will work on it ASAP. -walter -- .. manuq .. -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel