Re: [Sugar-devel] [PATCH v2][sucrose-0.94][RFC] Add capability to connect to WPA/WPA2-Enterprise networks

2011-12-13 Thread Daniel Drake
On Mon, Dec 12, 2011 at 7:54 AM, Sascha Silbe
sascha-ml-reply-to-201...@silbe.org wrote:
 The patch we're talking about is a Request For Discussion (RFC) based on
 sucrose-0.94; we'd appreciate feedback on the chosen approach (including
 design and implementation). When the patch is ready (including
 integrating useful feedback we hopefully get from sugar-devel), we'll
 try to upstream it, which will include porting it to the future master
 branch (Sugar 0.96 is already Feature frozen). However our short-term
 goal is to fix a downstream problem, so we need a version based on Sugar
 0.94 and for practical reasons (testing) this is the version we'll work
 on first.

I don't think there would be any resistance to a technically sound
implementation of WPA enterprise connectivity - I certainly am happy
to see this work being done.

However, it would be easier for the community to collaborate here if
the work were done on master first, then collectively reviewed and
committed, *then* backported by you.

Given that I do not know too much about WPA-enterprise, and given that
the secrets management changed quite a bit in NM-0.9, I'm not
convinced that the current implementation would 'stick' in master.
Happy to be proven wrong though (with a patch) :)

I would be happy to review a functional description of the work, but
this was not included in the commit message. Perhaps it could be
extended to briefly explain the WPA-enterprise mechanics, and then how
the implementation is done.

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


Re: [Sugar-devel] [PATCH] sugar-activity: make independent of sugar-toolkit GTK versions

2011-12-13 Thread Sascha Silbe
Excerpts from Daniel Drake's message of 2011-12-09 22:25:28 +0100:

 As we move to adding support for a second UI toolkit (GTK+ 3.x),
 the sugar-activity binary used by all activities must become
 backend-toolkit-independent.

Given that sugar-activity is the only thing in sugar that Python-based
activities (i.e. those based on the sugar-toolkit Activity framework)
need to run and that non-Python activities don't have a use for it, it
would be cleaner to move sugar-activity to sugar-toolkit.

The only reason this isn't straightforward is that some activity authors
will want their activities to run on both GTK2 and GTK3 based systems,
so hard-coding sugar-activity (GTK2) or sugar-activity-gtk3 in
activity.info isn't going to work.


One way to achieve this is by shipping a small wrapper script with each
activity capable of running on both GTK2 and GTK3 based systems that
will use sugar-activity-gtk3 from sugar-toolkit-gtk3 if available and
fall back to sugar-activity from sugar (on pre-GTK3 systems). We already
ship a stub setup.py with all activities, so a small wrapper file for
some activities doesn't really make things worse. This is the most
simple solution (KISS), so the way to go IMO.


If we'd want to avoid the wrapper script, the way we invoke
sugar-activity would need to be backwards compatible with pre-0.96 Sugar
systems, so the only variable we can tweak is how to invoke the GTK3
based sugar-activity on systems with GTK3 for activities supporting
GTK3. Since sugar-activity chokes on unknown parameters, we can't even
pass an additional flag to indicate the activity supports GTK3 (as it
would break on pre-GTK3 systems).

A potential solution avoiding wrapper scripts would be:

1. Move sugar-activity from sugar to both sugar-toolkit and
   sugar-toolkit-gtk3. Name it sugar-activity-gtk2 in sugar-toolkit and
   sugar-activity in sugar-toolkit-gtk3.

2. Modify sugar-activity in sugar-toolkit-gtk3 to check an X-Sugar-GTK3
   field in activity.info that needs to be set to true for activities
   supporting GTK3. Fall back to exec'ing sugar-activity-gtk2 (from
   sugar-toolkit) if X-Sugar-GTK3 is unset or false.

There are three different paths:

1. On pre-GTK3 systems, sugar-activity from sugar gets invoked and uses
   sugar-toolkit (GTK2).

2. On GTK3 systems, for a GTK3 activity sugar-activity
   (sugar-toolkit-gtk3) gets called and uses sugar-toolkit-gtk3.

3. On GTK3 systems, for a non-GTK3 activity sugar-activity
   (sugar-toolkit-gtk3) gets called and invokes sugar-activity-gtk2
   (sugar-toolkit) which in turn uses sugar-toolkit (GTK2).

Not really more comfortable for activity authors than shipping the
wrapper script, but much more complex.


A simpler approach would be using an additional X-Sugar-Exec-GTK3 key to
invoke sugar-activity-gtk3 (for GTK3 activities) on systems supporting
GTK3. This would move some of the logic into sugar, but doesn't tie
directly into sugar-toolkit (so non-Python activities could use it as
well, e.g. to call a binary linked against GTK3) and still avoids the
wrapper script. It would also align well with the plans to make
activity.info a plain desktop entry file [1], as we'd probably need to
rename the exec key to X-Sugar-Exec anyway (activities supporting
running outside of Sugar would additionally use the Exec key).

Sascha

[1] https://bugs.sugarlabs.org/ticket/2435
-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/


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


[Sugar-devel] [MINUTES] Development team meeting --- 13. Dec 2011 (15:00 UTC)

2011-12-13 Thread Simon Schampijer

Hi,

for those that could not attend, here the logs:

Minutes: 
http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-12-13T15:00:22.html
Log: 
http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-12-13T15:00:22


Regards,
   Simon


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


[Sugar-devel] sugar-toolkit-gtk3 maintainers: Daniel Drake, Simon Schampijer

2011-12-13 Thread Sascha Silbe
Hello everyone!

During todays Development Team meeting [1], we we agreed that Daniel
Drake will maintain the new sugar-toolkit-gtk3 together with Simon
Schampijer, leaving me free to focus on the existing Glucose modules
(also together with Simon).

Good luck to the new (and old) maintainers!

Sascha

[1] http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-12-13T15:00:22
-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/


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


[Sugar-devel] badges for collaborative activities

2011-12-13 Thread C. Scott Ananian
I was playing with Sugar collaboration between my XO-1.75 and my
crazy-nephew's XO-1.5 over the weekend.  We wanted to play together,
but it was hard to find which activities would let us do so.

What if we added a small badge (perhaps the ring of dots used to
switch an activity from 'private' to 'shared') to activities on the
home screen to indicate that they support collaboration?  That would
make it easy to tell which activities allow us to play together.
  --scott

ps. Typing Turtle is a great new activity which I hadn't seen before
-- but it doesn't support collaboration.  What if we could play the
balloon-popping game together, with the first person to type the word
getting points for popping the balloon?

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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread David Van Assche
How much has been done in terms of centralising the collaborative aspects
of applications by using the latest and greatest innovations to telepathy,
which surely must by now have many many hooks to allow for the funkiest of
ways to quickly and easily integrate collaborative sessions.
I suppose the main problem is still finding the creative aspects of this,
ie... what is the best way for students to share/collaborate an activity,
and should that activity then even collaborate across activites with others.
I took quite a stab at this a year or so ago, but got boggled down in the
serious intricacies of telepathy and the way it fits with dbus and how to
make the communication of elements be they on the same computer or across a
network easy to understand with examples of implementation. The examples
back when I was looking (tic tac toe was one) were so complex for such a
simple application that it scared me away completely. I wanted to
collaboratively create a quiz based app which would allow a class to take
turns answering questions, and then the program could keep track of how
well students where doing based on subject/timing/spelling, or whatever
else the program was supposed to help students with.

kind regards,
David Van Assche

On Tue, Dec 13, 2011 at 7:26 PM, C. Scott Ananian csc...@cscott.net wrote:

 I was playing with Sugar collaboration between my XO-1.75 and my
 crazy-nephew's XO-1.5 over the weekend.  We wanted to play together,
 but it was hard to find which activities would let us do so.

 What if we added a small badge (perhaps the ring of dots used to
 switch an activity from 'private' to 'shared') to activities on the
 home screen to indicate that they support collaboration?  That would
 make it easy to tell which activities allow us to play together.
  --scott

 ps. Typing Turtle is a great new activity which I hadn't seen before
 -- but it doesn't support collaboration.  What if we could play the
 balloon-popping game together, with the first person to type the word
 getting points for popping the balloon?

 --
  ( http://cscott.net/ )
 ___
 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] badges for collaborative activities

2011-12-13 Thread C. Scott Ananian
I'm trying not to open the can of worms which is how should we best
implement collaboration.  In this thread, let's just concentrate on
how do we discover collaborative activities when we're playing with
our friends?
  --scott

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


[Sugar-devel] public collaboration servers

2011-12-13 Thread C. Scott Ananian
Are any of the public collaboration servers still up?

I worked my way pretty far down
http://wiki.sugarlabs.org/go/Community_Jabber_servers without finding
a server that would let me register.  I am using an XO-1.75 build, so
perhaps collaboration is just busted in this build?  If someone could
point me to a known-good collaboration server, that would help with my
debugging.
  --scott

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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread David Van Assche
Yeah, I'm sorry if it came across that way, its just that I've got a sort
of halted project which I really want to make collaborative, but am unsure
how to move forward and include... I guess I was asking for some pointers
towards really good documentation to make this a reality.

kind regards,
David

On Tue, Dec 13, 2011 at 7:35 PM, C. Scott Ananian csc...@cscott.net wrote:

 I'm trying not to open the can of worms which is how should we best
 implement collaboration.  In this thread, let's just concentrate on
 how do we discover collaborative activities when we're playing with
 our friends?
   --scott

 --
  ( http://cscott.net/ )

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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread Benjamin M. Schwartz
On 12/13/2011 01:37 PM, David Van Assche wrote:
 I've got a sort
 of halted project which I really want to make collaborative, but am unsure
 how to move forward and include... I guess I was asking for some pointers
 towards really good documentation to make this a reality.

You might like

http://bemasc.net/~bens/groupthink/

a library I wrote for Sugar-GSoC 2009 that (under some circumstances)
makes it easier to write collaborative python activities.  It's currently
used by Pippy, Stopwatch, and possibly a few other things.



signature.asc
Description: OpenPGP digital signature
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread David Van Assche
Played with that, wasnt quite what I was looking for. It basically skins an
app (lets say a gtk app) and makes it look like its a part of sugar... but
it doesn't really gie u access to how the collaborative functions work...

but its a good step for quickly porting apps to sugar sure

kind regards,
David

On Tue, Dec 13, 2011 at 7:53 PM, Benjamin M. Schwartz 
bmsch...@fas.harvard.edu wrote:

 On 12/13/2011 01:37 PM, David Van Assche wrote:
  I've got a sort
  of halted project which I really want to make collaborative, but am
 unsure
  how to move forward and include... I guess I was asking for some pointers
  towards really good documentation to make this a reality.

 You might like

 http://bemasc.net/~bens/groupthink/

 a library I wrote for Sugar-GSoC 2009 that (under some circumstances)
 makes it easier to write collaborative python activities.  It's currently
 used by Pippy, Stopwatch, and possibly a few other things.


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


Re: [Sugar-devel] public collaboration servers

2011-12-13 Thread Peter Robinson
On Tue, Dec 13, 2011 at 6:37 PM, C. Scott Ananian csc...@laptop.org wrote:
 Are any of the public collaboration servers still up?

 I worked my way pretty far down
 http://wiki.sugarlabs.org/go/Community_Jabber_servers without finding
 a server that would let me register.  I am using an XO-1.75 build, so
 perhaps collaboration is just busted in this build?  If someone could
 point me to a known-good collaboration server, that would help with my
 debugging.

I believe we just use jabber.sugarlabs.org for SoaS, it can be a bit
buggy but generally works OK.

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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread Benjamin M. Schwartz
On 12/13/2011 01:57 PM, David Van Assche wrote:
 Played with that, wasnt quite what I was looking for. It basically skins
 an app (lets say a gtk app) and makes it look like its a part of sugar...
 but it doesn't really gie u access to how the collaborative functions work...

Uhh, nope.  Maybe you're thinking of Sugarize?

(as documented on
http://wiki.sugarlabs.org/go/Running_Linux_Applications_Under_Sugar)

Groupthink is a python module for writing collaborative Activities.  It
works by providing data structures that automatically share themselves
over the Tubes, synchronize their state, and even serialize to disk.  No
relation to Sugarize.

--Ben



signature.asc
Description: OpenPGP digital signature
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread David Van Assche
you're right, confused the 2.. groupthink was indeed promising I was
thinking about sugarize :-) I'll delve deeper into groupthink... IF I
understand enough of it before it makes my head explode...

kind regards,
David

On Tue, Dec 13, 2011 at 8:08 PM, Benjamin M. Schwartz 
bmsch...@fas.harvard.edu wrote:

 On 12/13/2011 01:57 PM, David Van Assche wrote:
  Played with that, wasnt quite what I was looking for. It basically skins
  an app (lets say a gtk app) and makes it look like its a part of sugar...
  but it doesn't really gie u access to how the collaborative functions
 work...

 Uhh, nope.  Maybe you're thinking of Sugarize?

 (as documented on
 http://wiki.sugarlabs.org/go/Running_Linux_Applications_Under_Sugar)

 Groupthink is a python module for writing collaborative Activities.  It
 works by providing data structures that automatically share themselves
 over the Tubes, synchronize their state, and even serialize to disk.  No
 relation to Sugarize.

 --Ben


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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread Gonzalo Odiard
Simon proposed a feature http://wiki.sugarlabs.org/go/Features/Can_share
with a similar use case. Right now, the shell doesn't know if the activity
can share or not.

Gonzalo

On Tue, Dec 13, 2011 at 3:26 PM, C. Scott Ananian csc...@cscott.net wrote:

 I was playing with Sugar collaboration between my XO-1.75 and my
 crazy-nephew's XO-1.5 over the weekend.  We wanted to play together,
 but it was hard to find which activities would let us do so.

 What if we added a small badge (perhaps the ring of dots used to
 switch an activity from 'private' to 'shared') to activities on the
 home screen to indicate that they support collaboration?  That would
 make it easy to tell which activities allow us to play together.
  --scott

 ps. Typing Turtle is a great new activity which I hadn't seen before
 -- but it doesn't support collaboration.  What if we could play the
 balloon-popping game together, with the first person to type the word
 getting points for popping the balloon?

 --
  ( http://cscott.net/ )
 ___
 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


[Sugar-devel] [PATCH sugar-toolkit-gtk3] sugar-activity: import and make independent of sugar-toolkit GTK versions

2011-12-13 Thread Daniel Drake
As we move to adding support for a second UI toolkit (GTK+ 3.x),
the sugar-activity binary used by all activities must become
backend-toolkit-independent. It would be wasteful to have two backend
toolkits loaded in memory, and in the GTK2/GTK3 case, it is impossible
(importing both results in an instant crash).

To achieve this, we split the existing sugar-toolkit activity/main.py:main()
functionality into two parts, moving it into the sugar-activity binary and
the Activity class as follows:
 1. All toolkit-specific stuff is moved into the Activity class (i.e.
   everything that interacts with GTK)
 2. Everything that can be reasonably/easily moved into the Activity class
   is also moved.
 3. What remains is the stuff that is inherently involved with the
   construction of the Activity object, not related to UI toolkits. This
   is moved into the sugar-activity binary.

main.py is then removed from sugar-toolkit, and sugar-activity is moved
from sugar to sugar-toolkit-gtk3 in order to keep toolkit-related code
with the toolkit itself.

With this work done, the one remaining question is how to invoke the main
loop. An optional run_main_loop() method is added to the activity class,
for GTK2 this will run the GTK2 main loop, for GTK3 the GTK3 main loop will
be run, etc.

Signed-off-by: Daniel Drake d...@laptop.org
---
 Makefile.am |2 +-
 bin/Makefile.am |1 +
 bin/sugar-activity  |  147 +++
 configure.ac|1 +
 src/sugar3/activity/Makefile.am |1 -
 src/sugar3/activity/activity.py |   21 +
 src/sugar3/activity/main.py |  160 ---
 7 files changed, 171 insertions(+), 162 deletions(-)
 create mode 100644 bin/Makefile.am
 create mode 100644 bin/sugar-activity
 delete mode 100644 src/sugar3/activity/main.py

Replaces the earlier sugar patch:
 [PATCH] sugar-activity: make independent of sugar-toolkit GTK versions

sugar-activity is now moved into sugar-toolkit-gtk3
A followup sugar patch will remove sugar-activity from there, and
a followup sugar-toolkit patch will adapt the GTK2 toolkit for the
new behaviour.

diff --git a/Makefile.am b/Makefile.am
index 6359a2b..86a095c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,4 +11,4 @@ EXTRA_DIST =\
intltool-update.in  \
intltool-extract.in
 
-SUBDIRS = src po
+SUBDIRS = bin src po
diff --git a/bin/Makefile.am b/bin/Makefile.am
new file mode 100644
index 000..0d78267
--- /dev/null
+++ b/bin/Makefile.am
@@ -0,0 +1 @@
+dist_bin_SCRIPTS = sugar-activity
diff --git a/bin/sugar-activity b/bin/sugar-activity
new file mode 100644
index 000..2b1b9b3
--- /dev/null
+++ b/bin/sugar-activity
@@ -0,0 +1,147 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2006-2008, Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+import sys
+import gettext
+from optparse import OptionParser
+
+import dbus
+import dbus.service
+import dbus.glib
+
+import sugar
+from sugar.activity import activityhandle
+from sugar.bundle.activitybundle import ActivityBundle
+from sugar import logger
+
+
+def create_activity_instance(constructor, handle):
+activity = constructor(handle)
+activity.show()
+return activity
+
+
+def get_single_process_name(bundle_id):
+return bundle_id
+
+
+def get_single_process_path(bundle_id):
+return '/' + bundle_id.replace('.', '/')
+
+
+class SingleProcess(dbus.service.Object):
+
+def __init__(self, name_service, constructor):
+self.constructor = constructor
+
+bus = dbus.SessionBus()
+bus_name = dbus.service.BusName(name_service, bus=bus)
+object_path = get_single_process_path(name_service)
+dbus.service.Object.__init__(self, bus_name, object_path)
+
+@dbus.service.method('org.laptop.SingleProcess', in_signature='a{sv}')
+def create(self, handle_dict):
+handle = activityhandle.create_from_dict(handle_dict)
+create_activity_instance(self.constructor, handle)
+
+def main():
+parser = OptionParser()
+parser.add_option('-b', '--bundle-id', dest='bundle_id',
+  help='identifier of the activity bundle')
+parser.add_option('-a', '--activity-id', dest='activity_id',
+  

[Sugar-devel] [PATCH sugar-toolkit-gtk3] SugarExt: fix compile without pygtk

2011-12-13 Thread Daniel Drake
We no longer compile this against pygtk, so remove the include.
Add the now-required Python.h include in its place.
---
 src/sugar3/_sugarbaseextmodule.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/sugar3/_sugarbaseextmodule.c b/src/sugar3/_sugarbaseextmodule.c
index 01a70d7..ebc1310 100644
--- a/src/sugar3/_sugarbaseextmodule.c
+++ b/src/sugar3/_sugarbaseextmodule.c
@@ -22,7 +22,7 @@
 #endif
 
 /* include this first, before NO_IMPORT_PYGOBJECT is defined */
-#include pygobject.h
+#include Python.h
 
 extern PyMethodDef py_sugarbaseext_functions[];
 
-- 
1.7.7.4

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


[Sugar-devel] [PATCH sugar-toolkit-gtk3] Add MAINTAINERS file

2011-12-13 Thread Daniel Drake
Just point at the wiki where the info is kept.
Requested by Sascha Silbe.
---
 MAINTAINERS |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 000..379f8ba
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1 @@
+See http://wiki.sugarlabs.org/go/Development_Team/Release/Modules
-- 
1.7.7.4

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


[Sugar-devel] [PATCH] Remove sugar-activity

2011-12-13 Thread Daniel Drake
This binary has been moved to sugar-toolkit-gtk3 in a commit
titled:
 sugar-activity: import and make independent of sugar-toolkit GTK versions

sugar-toolkit-gtk3 is deemed as a more suitable home as sugar-activity
is somewhat specific to activities built with sugar-toolkit.
From this point onwards sugar-toolkit-gtk3 will become a required
part of the platform and hence installed on all user's systems.
---
 bin/Makefile.am|1 -
 bin/sugar-activity |   21 -
 2 files changed, 0 insertions(+), 22 deletions(-)
 delete mode 100644 bin/sugar-activity

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 05a9215..8fc5692 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,4 @@
 python_scripts =   \
-   sugar-activity  \
sugar-control-panel \
sugar-emulator  \
sugar-install-bundle\
diff --git a/bin/sugar-activity b/bin/sugar-activity
deleted file mode 100644
index 4abdd80..000
--- a/bin/sugar-activity
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2006-2008, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-from sugar.activity import main
-
-main.main()
-- 
1.7.7.4

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


Re: [Sugar-devel] [PATCH] sugar-activity: make independent of sugar-toolkit GTK versions

2011-12-13 Thread Daniel Drake
On Tue, Dec 13, 2011 at 8:53 AM, Sascha Silbe si...@sugarlabs.org wrote:
 Excerpts from Daniel Drake's message of 2011-12-09 22:25:28 +0100:

 As we move to adding support for a second UI toolkit (GTK+ 3.x),
 the sugar-activity binary used by all activities must become
 backend-toolkit-independent.

Just to complete the thread:

The above options were debated at length with the team at the Prague
hackfest in October. We decided that the approach taken in the patch
is the way forward as the least intrusive (it is just moving code
around), doesn't require further changes for activity developers, and
doesn't require activity developers to make multiple declarations that
the activity has been ported (just the one is needed: import sugar3
instead of sugar).

This was then discussed again in todays development meeting; Sascha
was not overly excited by the approach chosen as it moves some
toolkit-related code into sugar, and hence strengthens the
relationship between sugar-toolkit and sugar. We came to a consensus
by retaining the above approach but moving sugar-activity into
sugar-toolkit-gtk3 alongside other toolkit code. now posted in another
thread titled sugar-activity: import and make independent of
sugar-toolkit GTK versions

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


Re: [Sugar-devel] sugar-toolkit-gtk3 maintainers: Daniel Drake, Simon Schampijer

2011-12-13 Thread Daniel Drake
On Tue, Dec 13, 2011 at 11:55 AM, Sascha Silbe
sascha-ml-reply-to-201...@silbe.org wrote:
 During todays Development Team meeting [1], we we agreed that Daniel
 Drake will maintain the new sugar-toolkit-gtk3 together with Simon
 Schampijer, leaving me free to focus on the existing Glucose modules
 (also together with Simon).

Thanks again for being open to this (and actually suggesting it!), i
think it is a very sensible move that will benefit everyone: a more
focused Sascha, and a faster rate of toolkit development at this time
of important technology shift.

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


Re: [Sugar-devel] [PATCH sugar-toolkit] Restructure for new /usr/bin/sugar-activity behaviour

2011-12-13 Thread Daniel Drake
On Fri, Dec 9, 2011 at 3:26 PM, Daniel Drake d...@laptop.org wrote:
 This patch accompanies a sugar patch titled
 sugar-activity: make independent of sugar-toolkit GTK versions

Just to unconfuse me and others that may be reading, this patch is
still required in its exact form even despite the slight change of
direction with the accompanying patches. However the commit message
needs updating. Here is the new one to be applied at commit time:


This patch accompanies a sugar-toolkit-gtk3 patch
titledsugar-activity: import and make independent of sugar-toolkit
GTK versionsand a sugar patch titled Remove sugar-activity

The core Activity-instantiating functionality of main.py has been
movedinto the sugar-activity binary and can be removed from here.
The remaining functionality (and everything that is GTK-specific) is
movedinto the Activity class in this commit.
This is needed to make /usr/bin/sugar-activity independent of
sugar/sugar3and GTK2/GTK3, which is a crucial step for GTK3 activity
support.


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


Re: [Sugar-devel] [PATCH sugar-toolkit-gtk3] sugar-activity: import and make independent of sugar-toolkit GTK versions

2011-12-13 Thread Simon Schampijer

On 13/12/11 16:47, Daniel Drake wrote:

As we move to adding support for a second UI toolkit (GTK+ 3.x),
the sugar-activity binary used by all activities must become
backend-toolkit-independent. It would be wasteful to have two backend
toolkits loaded in memory, and in the GTK2/GTK3 case, it is impossible
(importing both results in an instant crash).

To achieve this, we split the existing sugar-toolkit activity/main.py:main()
functionality into two parts, moving it into the sugar-activity binary and
the Activity class as follows:
  1. All toolkit-specific stuff is moved into the Activity class (i.e.
everything that interacts with GTK)
  2. Everything that can be reasonably/easily moved into the Activity class
is also moved.
  3. What remains is the stuff that is inherently involved with the
construction of the Activity object, not related to UI toolkits. This
is moved into the sugar-activity binary.

main.py is then removed from sugar-toolkit, and sugar-activity is moved
from sugar to sugar-toolkit-gtk3 in order to keep toolkit-related code
with the toolkit itself.

With this work done, the one remaining question is how to invoke the main
loop. An optional run_main_loop() method is added to the activity class,
for GTK2 this will run the GTK2 main loop, for GTK3 the GTK3 main loop will
be run, etc.

Signed-off-by: Daniel Draked...@laptop.org


Looks good, thanks for updating the patch.

Please push with the appropriate sugar-toolkit-gtk2 patch.
   Simon


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


Re: [Sugar-devel] [PATCH sugar-toolkit-gtk3] SugarExt: fix compile without pygtk

2011-12-13 Thread Simon Schampijer

On 13/12/11 16:54, Daniel Drake wrote:

We no longer compile this against pygtk, so remove the include.
Add the now-required Python.h include in its place.
---
  src/sugar3/_sugarbaseextmodule.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/sugar3/_sugarbaseextmodule.c b/src/sugar3/_sugarbaseextmodule.c
index 01a70d7..ebc1310 100644
--- a/src/sugar3/_sugarbaseextmodule.c
+++ b/src/sugar3/_sugarbaseextmodule.c
@@ -22,7 +22,7 @@
  #endif

  /* include this first, before NO_IMPORT_PYGOBJECT is defined */
-#includepygobject.h
+#includePython.h

  extern PyMethodDef py_sugarbaseext_functions[];


Looks good! Please go ahead.

Regards,
   Simon


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


Re: [Sugar-devel] [PATCH sugar-toolkit-gtk3] SugarExt: fix compile without pygtk

2011-12-13 Thread Sascha Silbe
Excerpts from Daniel Drake's message of 2011-12-13 20:54:25 +0100:

 We no longer compile this against pygtk, so remove the include.
 Add the now-required Python.h include in its place.

Reviewed-By: Sascha Silbe si...@activitycentral.com


Sascha

-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/


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


Re: [Sugar-devel] [PATCH] Remove sugar-activity

2011-12-13 Thread Sascha Silbe
Excerpts from Daniel Drake's message of 2011-12-13 21:01:10 +0100:

 This binary has been moved to sugar-toolkit-gtk3 in a commit
 titled:
  sugar-activity: import and make independent of sugar-toolkit GTK versions
 
 sugar-toolkit-gtk3 is deemed as a more suitable home as sugar-activity
 is somewhat specific to activities built with sugar-toolkit.
 From this point onwards sugar-toolkit-gtk3 will become a required
 part of the platform and hence installed on all user's systems.

Acked-by: Sascha Silbe si...@activitycentral.com

Please hold off on pushing this until sugar-jhbuild has been updated to
build sugar-toolkit-gtk3. Otherwise you'd hose everyone who develops
features based on mainline master rather than the stable branches
(sucrose-*).

Sascha

-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/


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


Re: [Sugar-devel] [PATCH sugar-toolkit-gtk3] Add MAINTAINERS file

2011-12-13 Thread Sascha Silbe
Excerpts from Daniel Drake's message of 2011-12-13 20:55:01 +0100:
 Just point at the wiki where the info is kept.
 Requested by Sascha Silbe.

Reviewed-by: Sascha Silbe si...@activitycentral.com

Thanks for the patch.

Sascha

-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/


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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread Gary Martin
On 13 Dec 2011, at 19:20, Gonzalo Odiard wrote:

 Simon proposed a feature http://wiki.sugarlabs.org/go/Features/Can_share
 with a similar use case. Right now, the shell doesn't know if the activity 
 can share or not.

+1

A standard variable was introduced into the activity side quite some time back 
so that the then new activity toolbar could automatically enable/disable the 
sharing toolbar button state, unfortunately the sugar shell has no access to 
that data :( 

 Gonzalo
 
 On Tue, Dec 13, 2011 at 3:26 PM, C. Scott Ananian csc...@cscott.net wrote:
 I was playing with Sugar collaboration between my XO-1.75 and my
 crazy-nephew's XO-1.5 over the weekend.  We wanted to play together,
 but it was hard to find which activities would let us do so.
 
 What if we added a small badge (perhaps the ring of dots used to
 switch an activity from 'private' to 'shared') to activities on the
 home screen to indicate that they support collaboration?  That would
 make it easy to tell which activities allow us to play together.
  --scott

One design that has been discussed in the past is related to the proposed home 
favourite view launch dialogue (the replacement for the hover/right-click 
palettes) – with all the additional space available in such a dialogue, a 
'Start shared' option could be included for activities that flag that they 
support collaboration.

--Gary

 ps. Typing Turtle is a great new activity which I hadn't seen before
 -- but it doesn't support collaboration.  What if we could play the
 balloon-popping game together, with the first person to type the word
 getting points for popping the balloon?
 
 --
  ( http://cscott.net/ )
 ___
 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

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


Re: [Sugar-devel] badges for collaborative activities

2011-12-13 Thread Walter Bender
On Tue, Dec 13, 2011 at 7:45 PM, Gary Martin garycmar...@googlemail.com wrote:
 On 13 Dec 2011, at 19:20, Gonzalo Odiard wrote:

 Simon proposed a feature http://wiki.sugarlabs.org/go/Features/Can_share
 with a similar use case. Right now, the shell doesn't know if the activity 
 can share or not.

 +1

 A standard variable was introduced into the activity side quite some time 
 back so that the then new activity toolbar could automatically enable/disable 
 the sharing toolbar button state, unfortunately the sugar shell has no access 
 to that data :(

 Gonzalo

 On Tue, Dec 13, 2011 at 3:26 PM, C. Scott Ananian csc...@cscott.net wrote:
 I was playing with Sugar collaboration between my XO-1.75 and my
 crazy-nephew's XO-1.5 over the weekend.  We wanted to play together,
 but it was hard to find which activities would let us do so.

 What if we added a small badge (perhaps the ring of dots used to
 switch an activity from 'private' to 'shared') to activities on the
 home screen to indicate that they support collaboration?  That would
 make it easy to tell which activities allow us to play together.
  --scott

 One design that has been discussed in the past is related to the proposed 
 home favourite view launch dialogue (the replacement for the 
 hover/right-click palettes) – with all the additional space available in such 
 a dialogue, a 'Start shared' option could be included for activities that 
 flag that they support collaboration.

+1 In many of my activities (most of which support sharing) being able
to launch directly into sharing mode would be a real win... the logic
to negotiating the transition between stand-alone and sharing would be
eliminated, leading to less confusion all around.

-walter

 --Gary

 ps. Typing Turtle is a great new activity which I hadn't seen before
 -- but it doesn't support collaboration.  What if we could play the
 balloon-popping game together, with the first person to type the word
 getting points for popping the balloon?

 --
                          ( http://cscott.net/ )
 ___
 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

 ___
 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