Re: [Sugar-devel] [PATCH] changes to Chat to support OSK and portrait mode

2013-02-26 Thread Peter Robinson
On Tue, Feb 26, 2013 at 3:17 AM, Walter Bender walter.ben...@gmail.com wrote:
 On Mon, Feb 25, 2013 at 9:57 PM, Hal Murray hmur...@megapathdsl.net wrote:

 walter.ben...@gmail.com said:
 (2) The chat is displayed from the top (most recent) down so that the recent
 messages are not occluded by the OSK and so that the recent messages are
 proximal to the text entry

 How well does that work out?  How long does it take to learn to read
 bottom-to-top?  I'd expect troubles if you were distracted for a few lines
 and then tried to catch up.

 Is that only for XO-4 or will people with non-touch XOs have to learn to read
 backwards too?

 I suppose we could make it specific to tablet modes... but maybe try
 it to see if you really think it is difficult.

I wouldn't have thought having different layouts for different devices
would be confusing to users and not a great UX experience. Can we not
just move the text chat up when they keyboard appears so the last
written/received line is just above the keyboard.

Peter
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [Feature] Starting an activity in a different locale than the system locale

2013-02-26 Thread Gonzalo Odiard
I think is a nice feature to have.
The tricky part should be how solve the UI.
Probably, can be done if we implement the new launcher screen,
instead of the menu in the home and the flashing animation.

Gonzalo


On Tue, Feb 19, 2013 at 7:20 AM, Simon Schampijer si...@schampijer.dewrote:

 Hi,

 when talking about the 'grab watch hands' feature [1] in the Clock
 activity I came across the desire to show the written clock information
 (e.g. ten minutes to 10 am) in different languages.

 To make that easily manageable without reloading translations on run-time
 I was wondering if there would be a general desire to run activities in
 different locales independent from the system. One scenario would be that a
 teacher in a Spanish speaking country would start the Clock activity in the
 English locale to teach the clock in English.

 The question is, if starting an activity in a different locale than the
 system locale that would be an interesting feature in general. Advantages
 would be that the locale of the system does not change, making
 experimenting with languages not as disruptive. Would people think that
 would be a pedagogical interesting feature?

 Technically, one of doing this would be to set the 'LANG/LANGUAGE' env
 variable in sugar-activity, reading the config from a system file. That
 file could be modified in an activity section (e.g. control panel or the
 activity list view...)

 diff --git a/bin/sugar-activity b/bin/sugar-activity
 index abaa091..070a196 100644
 --- a/bin/sugar-activity
 +++ b/bin/sugar-activity
 @@ -104,6 +104,8 @@ def main():
  os.environ['SUGAR_BUNDLE_ID'] = bundle.get_bundle_id()
  os.environ['SUGAR_BUNDLE_NAME'**] = bundle.get_name()
  os.environ['SUGAR_BUNDLE_**VERSION'] = str(bundle.get_activity_**
 version())
 +os.environ['LANG'] = 'de_DE'
 +os.environ['LANGUAGE'] = 'de_DE'

  # must be done early, some activities set translations globally, SL
 #3654
  locale_path = i18n.get_locale_path(bundle.**get_bundle_id())


 Regards,
Simon

 [1] 
 http://bugs.sugarlabs.org/**ticket/1959http://bugs.sugarlabs.org/ticket/1959
 __**_
 Sugar-devel mailing list
 Sugar-devel@lists.sugarlabs.**org Sugar-devel@lists.sugarlabs.org
 http://lists.sugarlabs.org/**listinfo/sugar-develhttp://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] Query regarding Wikipedia(EN) activity

2013-02-26 Thread Gonzalo Odiard
 Thanks Gonzalo.

 Has anyone tried bundling Wikipedia with all the images, so that the
 activity is completely usable in offline mode?
 If yes, how much did its size come to be?

 (I have got a 56KBPS connection; so don't want to start something which
 might take days to complete :P).



I haven't tried with the English version, but for reference, the Spanish
version took days with a 1MB connection.

Gonzalo
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] Query regarding Wikipedia(EN) activity

2013-02-26 Thread Gonzalo Odiard
 I haven't tried with the English version, but for reference, the Spanish
 version took days with a 1MB connection.


Another comment: to download the images, you will need a file with the list
of images needed by every page.
If you want download the images, I can provide that file.



 Gonzalo

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] changes to Chat to support OSK and portrait mode

2013-02-26 Thread Walter Bender
On Tue, Feb 26, 2013 at 3:59 AM, Peter Robinson pbrobin...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 3:17 AM, Walter Bender walter.ben...@gmail.com 
 wrote:
 On Mon, Feb 25, 2013 at 9:57 PM, Hal Murray hmur...@megapathdsl.net wrote:

 walter.ben...@gmail.com said:
 (2) The chat is displayed from the top (most recent) down so that the 
 recent
 messages are not occluded by the OSK and so that the recent messages are
 proximal to the text entry

 How well does that work out?  How long does it take to learn to read
 bottom-to-top?  I'd expect troubles if you were distracted for a few lines
 and then tried to catch up.

 Is that only for XO-4 or will people with non-touch XOs have to learn to 
 read
 backwards too?

 I suppose we could make it specific to tablet modes... but maybe try
 it to see if you really think it is difficult.

 I wouldn't have thought having different layouts for different devices
 would be confusing to users and not a great UX experience. Can we not
 just move the text chat up when they keyboard appears so the last
 written/received line is just above the keyboard.

 Peter

And why is moving the text chat not a different layout? I don't follow
your logic.

-walter

-- 
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] [PATCH] changes to Chat to support OSK and portrait mode

2013-02-26 Thread Peter Robinson
On Tue, Feb 26, 2013 at 2:28 PM, Walter Bender walter.ben...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 3:59 AM, Peter Robinson pbrobin...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 3:17 AM, Walter Bender walter.ben...@gmail.com 
 wrote:
 On Mon, Feb 25, 2013 at 9:57 PM, Hal Murray hmur...@megapathdsl.net wrote:

 walter.ben...@gmail.com said:
 (2) The chat is displayed from the top (most recent) down so that the 
 recent
 messages are not occluded by the OSK and so that the recent messages are
 proximal to the text entry

 How well does that work out?  How long does it take to learn to read
 bottom-to-top?  I'd expect troubles if you were distracted for a few lines
 and then tried to catch up.

 Is that only for XO-4 or will people with non-touch XOs have to learn to 
 read
 backwards too?

 I suppose we could make it specific to tablet modes... but maybe try
 it to see if you really think it is difficult.

 I wouldn't have thought having different layouts for different devices
 would be confusing to users and not a great UX experience. Can we not
 just move the text chat up when they keyboard appears so the last
 written/received line is just above the keyboard.

 Peter

 And why is moving the text chat not a different layout? I don't follow
 your logic.

Well you read it the same way whether it's on the screen or not rather
than having it top down for one type of device and bottom up for the
others.

Peter
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] changes to Chat to support OSK and portrait mode

2013-02-26 Thread Walter Bender
On Tue, Feb 26, 2013 at 9:42 AM, Peter Robinson pbrobin...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 2:28 PM, Walter Bender walter.ben...@gmail.com 
 wrote:
 On Tue, Feb 26, 2013 at 3:59 AM, Peter Robinson pbrobin...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 3:17 AM, Walter Bender walter.ben...@gmail.com 
 wrote:
 On Mon, Feb 25, 2013 at 9:57 PM, Hal Murray hmur...@megapathdsl.net 
 wrote:

 walter.ben...@gmail.com said:
 (2) The chat is displayed from the top (most recent) down so that the 
 recent
 messages are not occluded by the OSK and so that the recent messages are
 proximal to the text entry

 How well does that work out?  How long does it take to learn to read
 bottom-to-top?  I'd expect troubles if you were distracted for a few lines
 and then tried to catch up.

 Is that only for XO-4 or will people with non-touch XOs have to learn to 
 read
 backwards too?

 I suppose we could make it specific to tablet modes... but maybe try
 it to see if you really think it is difficult.

 I wouldn't have thought having different layouts for different devices
 would be confusing to users and not a great UX experience. Can we not
 just move the text chat up when they keyboard appears so the last
 written/received line is just above the keyboard.

 Peter

 And why is moving the text chat not a different layout? I don't follow
 your logic.

 Well you read it the same way whether it's on the screen or not rather
 than having it top down for one type of device and bottom up for the
 others.

 Peter

So what you are claiming is that your different layout is more
intuitive than my different layout.

-walter

-- 
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] Query regarding Wikipedia(EN) activity

2013-02-26 Thread Gonzalo Odiard
 Thanks Gonzalo, but won't the steps listed at
 http://wiki.sugarlabs.org/go/Activities/Wikipedia/HowTo generate this
 images-metainfo file automatically? If not, please provide me the file :)


Yes. But you need do all the process to get the images-metainfo before
download the images. I already did the process, then I can provide the
files to you and skip the previous steps.
You can download the files favorites_en.txt
and enwiki-20111201-pages-articles.xml.page_images from
http://dev.laptop.org/~gonzalo/wikiserver/



 Another thing, did you happen to calculate the total size of the
 WikipediaES activity, after including the images?
 If this comes out to be in gigabytes, obviously there is no point in
 including the activity-with-images on the XO.


Are not gigabytes, but remember we download the images scaled to the size
displayed in the wiki page (usually really small). To see the full size
images you need be connected anyway. In the case of the Spanish wiki, are
26MB.

Of course, if you want have the images stored in the school server, you can
modify download_images.py

Gonzalo



 Thanks again Gonzalo for all the replies.








 Gonzalo





 --
 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


Re: [Sugar-devel] [PATCH] changes to Chat to support OSK and portrait mode

2013-02-26 Thread Peter Robinson
On Tue, Feb 26, 2013 at 2:46 PM, Walter Bender walter.ben...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 9:42 AM, Peter Robinson pbrobin...@gmail.com wrote:
 On Tue, Feb 26, 2013 at 2:28 PM, Walter Bender walter.ben...@gmail.com 
 wrote:
 On Tue, Feb 26, 2013 at 3:59 AM, Peter Robinson pbrobin...@gmail.com 
 wrote:
 On Tue, Feb 26, 2013 at 3:17 AM, Walter Bender walter.ben...@gmail.com 
 wrote:
 On Mon, Feb 25, 2013 at 9:57 PM, Hal Murray hmur...@megapathdsl.net 
 wrote:

 walter.ben...@gmail.com said:
 (2) The chat is displayed from the top (most recent) down so that the 
 recent
 messages are not occluded by the OSK and so that the recent messages are
 proximal to the text entry

 How well does that work out?  How long does it take to learn to read
 bottom-to-top?  I'd expect troubles if you were distracted for a few 
 lines
 and then tried to catch up.

 Is that only for XO-4 or will people with non-touch XOs have to learn to 
 read
 backwards too?

 I suppose we could make it specific to tablet modes... but maybe try
 it to see if you really think it is difficult.

 I wouldn't have thought having different layouts for different devices
 would be confusing to users and not a great UX experience. Can we not
 just move the text chat up when they keyboard appears so the last
 written/received line is just above the keyboard.

 Peter

 And why is moving the text chat not a different layout? I don't follow
 your logic.

 Well you read it the same way whether it's on the screen or not rather
 than having it top down for one type of device and bottom up for the
 others.

 Peter

 So what you are claiming is that your different layout is more
 intuitive than my different layout.

No Walter, I never said that at all! I said that having a different
layout on one device to that of another device is not intuitive to the
user. Hal mentioned that reading the conversation upside down likely
wasn't intuitive to the user based on other experiences. I merely was
trying to suggest another alternative.
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] We have a problem: activity._shared_activity

2013-02-26 Thread Gonzalo Odiard
After reading the information about Write ticket sl#4436 Making
collaboration work again
(Thanks Ajay!) I decided check what other activities use
activity._shared_activity,
and this is the list:

[gonzalo@localhost honey]$ grep -r \._shared_activity * --include=*.py

calculate: (shareable_activity.py)

distance: (activity.py)

maze: (olpcgames/mesh.py)

memorize: (activity.py)

physics: (mesh.py)

pippy: groupthink/sugar_tools.py and pippy/mainline/pippy_app.py)

portfolio: (PortfolioActivity.py)

record: (collab.py)

speak: (toolkit/activity.py)

stopwatch: (activity.py)

tamtam: (JamMain.py)

turtleart: (tacollaboration.py and gnome_plugins/collaboration_plugin.py)

write: (AbiWordActivity.py)

This is only in the activities distributed by default!

I have filled http://bugs.sugarlabs.org/ticket/4446 to coordinate the fix
in the activities.

Please maintainers, we need your help with this issue.
The fix is trivial, but need be tested and will need new releases.
If any of the maintainers does not have time available,
tell us and we will try to help.

As a lesson, we should avoid use private properties

Gonzalo
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] Do backup now activity

2013-02-26 Thread lionel
 

Hi all,

 

We're trying to use XS to back up the XOs from our Saint-Denis deployment.

 

XO are used there only one or two hours each week. BTW our need is that
teachers could access backup of each XO at the end of each XO session.

 

However the current way of working of registered XO is to check every 30
minutes whether it's appropriate to attempt a backup run. So of course it's
not compatible with our expectation.

 

We're thinking to write a Launch backup now activity. 

Do you have any experience with this? Is there another way to solve this
problem?

 

Thanks in advance for your advices.

 

Best regards from France.

 

Lionel.

 

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] Portfolio failing on Record

2013-02-26 Thread Rafael Ortiz
Thanks Walter bits from git doesn't have this problem!.





On Fri, Feb 22, 2013 at 2:03 PM, Walter Bender walter.ben...@gmail.comwrote:

 On Fri, Feb 22, 2013 at 2:00 PM, Rafael Ortiz
 raf...@activitycentral.com wrote:
  Hi Walter.
 
  odd V37 is having the same problem here.

 Where is here? I've just tested on OS30 on an XO4.

 Did you try the bits from git?

 -walter
 
 
 
  Thanks.
 
 
 
 
 
  On Fri, Feb 22, 2013 at 12:45 PM, Walter Bender walter.ben...@gmail.com
 
  wrote:
 
  On Fri, Feb 22, 2013 at 12:30 PM, Rafael Ortiz
  raf...@activitycentral.com wrote:
   Hi.
  
   In portfolio activity v36, when clicked on Record audio icon,
   the  activity exits.
  
   Are others experimenting the same?
 
  Please try v37 (on ASLO) or better yet, grab the latest version -- 41
  -- from git (not yet released but that problem is definitely fixed)
 
  -walter
  
  
   Thanks.
  
  
  
   ___
   Sugar-devel mailing list
   Sugar-devel@lists.sugarlabs.org
   http://lists.sugarlabs.org/listinfo/sugar-devel
  
 
 
 
  --
  Walter Bender
  Sugar Labs
  http://www.sugarlabs.org
 
 



 --
 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] Portfolio failing on Record

2013-02-26 Thread Walter Bender
On Tue, Feb 26, 2013 at 5:12 PM, Rafael Ortiz
raf...@activitycentral.com wrote:
 Thanks Walter bits from git doesn't have this problem!.

There is a new audio driver for XO 4 coming soon that hopefully fixes
all the problems... I'll keep you posted.

-walter





 On Fri, Feb 22, 2013 at 2:03 PM, Walter Bender walter.ben...@gmail.com
 wrote:

 On Fri, Feb 22, 2013 at 2:00 PM, Rafael Ortiz
 raf...@activitycentral.com wrote:
  Hi Walter.
 
  odd V37 is having the same problem here.

 Where is here? I've just tested on OS30 on an XO4.

 Did you try the bits from git?

 -walter
 
 
 
  Thanks.
 
 
 
 
 
  On Fri, Feb 22, 2013 at 12:45 PM, Walter Bender
  walter.ben...@gmail.com
  wrote:
 
  On Fri, Feb 22, 2013 at 12:30 PM, Rafael Ortiz
  raf...@activitycentral.com wrote:
   Hi.
  
   In portfolio activity v36, when clicked on Record audio icon,
   the  activity exits.
  
   Are others experimenting the same?
 
  Please try v37 (on ASLO) or better yet, grab the latest version -- 41
  -- from git (not yet released but that problem is definitely fixed)
 
  -walter
  
  
   Thanks.
  
  
  
   ___
   Sugar-devel mailing list
   Sugar-devel@lists.sugarlabs.org
   http://lists.sugarlabs.org/listinfo/sugar-devel
  
 
 
 
  --
  Walter Bender
  Sugar Labs
  http://www.sugarlabs.org
 
 



 --
 Walter Bender
 Sugar Labs
 http://www.sugarlabs.org





-- 
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-02-26 Thread Gonzalo Odiard
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.

2013-02-26 Thread Ajay Garg
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] [ASLO] Release Butialo-5

2013-02-26 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4457

Sugar Platform:
0.86 - 0.98

Download Now:
http://activities.sugarlabs.org/downloads/file/28495/butialo-5.xo

Release notes:
-Compatibility with new Butia 2.0
-Remove compatibility with Butia 1.0


Sugar Labs Activities
http://activities.sugarlabs.org

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel