[gcompris: 8/9] Merge branch 'git://git.sugarlabs.org/alsroot/gcompris.git' for Sugar

[Bruno Coudoin <bcoudoin src gnome org>]

commit 85bf06c241a114920173e8964711bebe1798c177
Merge: a91acb2 76c2409
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun May 20 01:01:53 2012 +0200

    Merge branch 'git://git.sugarlabs.org/alsroot/gcompris.git' for Sugar

 .gitignore                                         |    1 +
 .sweets/gatch-master                               |    4 +
 Makefile.am                                        |    2 +-
 configure.ac                                       |    5 +-
 po/POTFILES.in                                     |    8 +
 po/es.po                                           |   16 +-
 src/administration-activity/admin/Makefile.am      |    5 +-
 src/administration-activity/admin/board_list.py    |   28 +-
 src/administration-activity/admin/log_list.py      |    5 +-
 .../admin/module_activities.py                     |  103 ++
 src/administration-activity/admin/module_boards.py |    7 +-
 src/administration-activity/admin/module_logins.py |   94 ++
 src/administration-activity/admin/profile_edit.py  |  291 +------
 .../admin/profile_widget.py                        |  308 ++++++
 src/administration-activity/administration.py      |    8 +-
 .../resources/administration/Makefile.am           |    4 +-
 .../administration/config_activities.svgz          |  Bin 0 -> 19831 bytes
 .../resources/administration/config_logins.svgz    |  Bin 0 -> 7255 bytes
 src/anim-activity/anim.py                          |   28 +-
 src/boards/menu2.c                                 |    2 +-
 src/boards/py-mod-gcompris.c                       |   65 ++
 src/gcompris/Makefile.am                           |   11 +-
 src/gcompris/about.c                               |    4 +
 src/gcompris/bar.c                                 |    4 +
 src/gcompris/config.c                              |    3 +
 src/gcompris/gameutil.c                            |    3 +
 src/gcompris/gcompris.c                            |   46 +-
 src/gcompris/gcompris.h                            |    2 +
 src/gcompris/gcompris_db.c                         |   33 +
 src/gcompris/help.c                                |    3 +
 src/gcompris/images_selector.c                     |    7 +
 src/gcompris/log.c                                 |   20 +-
 src/gcompris/menu.c                                |   60 +-
 src/gcompris/profile.c                             |   15 +
 src/gcompris/profile.h                             |    8 +
 src/gcompris/sugar.c                               |  546 ++++++------
 src/gcompris/sugar.h                               |   43 +
 src/gcompris/sugar_cli.c                           |  389 ++++++++
 src/gcompris/sugar_db.c                            |  479 ++++++++++
 src/gcompris/sugar_db.h                            |   49 +
 src/gcompris/sugar_gc.c                            |  441 +++++++++
 src/gcompris/sugar_gc.h                            |   79 ++
 src/gcompris/sugar_share.c                         |  977 ++++++++++++++++++++
 src/gcompris/sugar_share.h                         |  113 +++
 src/gcompris/sugar_share.vala                      |  186 ++++
 src/gcompris/sugar_srv.c                           |  160 ++++
 src/goocanvas/src/Makefile.am                      |    2 -
 src/wordprocessor-activity/wordprocessor.c         |   31 +-
 sugar/GCompris.activity/activity.info              |    9 +
 sugar/GCompris.activity/gcompris.svg               |  286 ++++++
 .../GComprisAdministration.activity/activity.info  |    8 +
 .../administration.svg                             |  217 +++++
 sugar/Makefile.am                                  |   49 +
 sugar/gcompris-activity                            |   36 +
 sweets.recipe                                      |   47 +
 55 files changed, 4710 insertions(+), 640 deletions(-)
---
diff --cc src/gcompris/gcompris.c
index 4b7fb4c,616769b..0daf8a3
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@@ -1993,11 -1991,11 +2003,13 @@@ main (int argc, char *argv[]
     */
    if (popt_root_menu)
        gc_db_init(TRUE /* DISABLE DATABASE */);
 -    else
 +  else if (popt_no_database)
 +      gc_db_init(TRUE /* DISABLE DATABASE */);
 +  else
        gc_db_init(FALSE /* ENABLE DATABASE */);
  
+   sugar_setup_profile(popt_root_menu, popt_administration);
+ 
    /* An alternate profile is requested, check it does exists */
    if (popt_profile){
      properties->profile = gc_db_profile_from_name_get(popt_profile);
diff --cc src/wordprocessor-activity/wordprocessor.c
index d42c8d5,5de428f..3ae8f95
--- a/src/wordprocessor-activity/wordprocessor.c
+++ b/src/wordprocessor-activity/wordprocessor.c
@@@ -16,8 -16,8 +16,9 @@@
   *   along with this program; if not, see <http://www.gnu.org/licenses/>.
   */
  
+ #include <unistd.h>
  #include <string.h>
 +#include <stdlib.h>
  #include <glib/gstdio.h>
  #include <libxml/HTMLparser.h>
  
@@@ -367,9 -379,9 +392,10 @@@ static GooCanvasItem *wordprocessor_cre
    doctype_list[2] = &type_letter;
    doctype_list[3] = &type_small;
    doctype_list[4] = &type_big;
 +//  doctype_list[5] = &type_link;
  
    y = 20.0;
+   if (!sugar_detected()) {
    /*
     * The save button
     */