[Sugar-devel] [write PATCH] sl#4436: Making collaboration work again.

[Ajay Garg]

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 <ajay at activitycentral.com>wrote:

>
>
> On Wed, Feb 27, 2013 at 5:05 AM, Gonzalo Odiard <gonzalo at 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 <ajay at 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 <ajay at 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 at lists.sugarlabs.org
>>> http://lists.sugarlabs.org/listinfo/sugar-devel
>>>
>>
>>
>
>
> --
> Regards,
>
> Ajay Garg
> Dextrose Developer
> Activity Central: http://activitycentral.com




-- 
Regards,

Ajay Garg
Dextrose Developer
Activity Central: http://activitycentral.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20130227/2d5a052d/attachment-0001.html>