Imported Upstream version 0.81.5upstream/0.81.5

9 files changed, 601 insertions, 53 deletions

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 3d12f8f..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export ACLOCAL="aclocal -I m4"
-
-intltoolize
-autoreconf -i
-./configure "$@"
diff --git a/configure b/configure
index c50737f..e99829c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sugar-toolkit 0.81.4.
+# Generated by GNU Autoconf 2.61 for sugar-toolkit 0.81.5.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sugar-toolkit'
 PACKAGE_TARNAME='sugar-toolkit'
-PACKAGE_VERSION='0.81.4'
-PACKAGE_STRING='sugar-toolkit 0.81.4'
+PACKAGE_VERSION='0.81.5'
+PACKAGE_STRING='sugar-toolkit 0.81.5'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="configure.ac"
@@ -1450,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sugar-toolkit 0.81.4 to adapt to many kinds of systems.
+\`configure' configures sugar-toolkit 0.81.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1520,7 +1520,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sugar-toolkit 0.81.4:";;
+     short | recursive ) echo "Configuration of sugar-toolkit 0.81.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1624,7 +1624,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sugar-toolkit configure 0.81.4
+sugar-toolkit configure 0.81.5
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1638,7 +1638,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sugar-toolkit $as_me 0.81.4, which was
+It was created by sugar-toolkit $as_me 0.81.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2334,7 +2334,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sugar-toolkit'
- VERSION='0.81.4'
+ VERSION='0.81.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22300,7 +22300,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sugar-toolkit $as_me 0.81.4, which was
+This file was extended by sugar-toolkit $as_me 0.81.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22347,7 +22347,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sugar-toolkit config.status 0.81.4
+sugar-toolkit config.status 0.81.5
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/src/sugar/.gitignore b/src/sugar/.gitignore
deleted file mode 100644
index de24e35..0000000
--- a/src/sugar/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-sugar-marshal.c
-sugar-marshal.h
-_sugarext.c
-_sugarext.c
diff --git a/src/sugar/.license b/src/sugar/.license
deleted file mode 100644
index 6989ebe..0000000
--- a/src/sugar/.license
+++ /dev/null
@@ -1 +0,0 @@
-LGPL
diff --git a/src/sugar/Makefile.in b/src/sugar/Makefile.in
index 904a991..605103d 100644
--- a/src/sugar/Makefile.in
+++ b/src/sugar/Makefile.in
@@ -56,8 +56,11 @@ _sugarext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 = _sugarext_la-_sugarext.lo \
 	_sugarext_la-sugar-marshal.lo
 am__sugarext_la_OBJECTS = $(am__objects_1) \
-	_sugarext_la-_sugarextmodule.lo \
-	_sugarext_la-eggaccelerators.lo \
+	_sugarext_la-_sugarextmodule.lo _sugarext_la-gsm-app.lo \
+	_sugarext_la-gsm-client.lo _sugarext_la-gsm-client-xsmp.lo \
+	_sugarext_la-gsm-xsmp.lo _sugarext_la-gsm-session.lo \
+	_sugarext_la-eggaccelerators.lo _sugarext_la-eggdesktopfile.lo \
+	_sugarext_la-eggsmclient.lo _sugarext_la-eggsmclient-xsmp.lo \
 	_sugarext_la-sexy-icon-entry.lo \
 	_sugarext_la-sugar-address-entry.lo \
 	_sugarext_la-sugar-key-grabber.lo _sugarext_la-sugar-menu.lo \
@@ -265,6 +268,7 @@ sugar_PYTHON = \
 	env.py		\
         network.py	\
 	profile.py	\
+	session.py	\
 	util.py		\
 	wm.py
 
@@ -274,12 +278,28 @@ _sugarext_la_CFLAGS = \
 	$(PYTHON_INCLUDES)
 
 _sugarext_la_LDFLAGS = -module -avoid-version
-_sugarext_la_LIBADD = $(EXT_LIBS)
+_sugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE
 _sugarext_la_SOURCES = \
 	$(BUILT_SOURCES)		\
 	_sugarextmodule.c		\
+        gsm-app.h			\
+	gsm-app.c			\
+	gsm-client.h			\
+	gsm-client.c			\
+	gsm-client-xsmp.h		\
+	gsm-client-xsmp.c		\
+	gsm-xsmp.h			\
+	gsm-xsmp.c			\
+	gsm-session.h			\
+	gsm-session.c			\
 	eggaccelerators.c		\
 	eggaccelerators.h		\
+	eggdesktopfile.h		\
+	eggdesktopfile.c		\
+	eggsmclient.h			\
+	eggsmclient.c			\
+	eggsmclient-private.h		\
+	eggsmclient-xsmp.c		\
 	sexy-icon-entry.h		\
 	sexy-icon-entry.c		\
 	sugar-address-entry.c		\
@@ -371,6 +391,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-_sugarext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-_sugarextmodule.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggaccelerators.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggdesktopfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggsmclient-xsmp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggsmclient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-gsm-app.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-gsm-client-xsmp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-gsm-client.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-gsm-session.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-gsm-xsmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sexy-icon-entry.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-address-entry.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-key-grabber.Plo@am__quote@
@@ -420,6 +448,41 @@ _sugarext_la-_sugarextmodule.lo: _sugarextmodule.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-_sugarextmodule.lo `test -f '_sugarextmodule.c' || echo '$(srcdir)/'`_sugarextmodule.c
 
+_sugarext_la-gsm-app.lo: gsm-app.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-gsm-app.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-gsm-app.Tpo -c -o _sugarext_la-gsm-app.lo `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-gsm-app.Tpo $(DEPDIR)/_sugarext_la-gsm-app.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm-app.c' object='_sugarext_la-gsm-app.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-gsm-app.lo `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c
+
+_sugarext_la-gsm-client.lo: gsm-client.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-gsm-client.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-gsm-client.Tpo -c -o _sugarext_la-gsm-client.lo `test -f 'gsm-client.c' || echo '$(srcdir)/'`gsm-client.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-gsm-client.Tpo $(DEPDIR)/_sugarext_la-gsm-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm-client.c' object='_sugarext_la-gsm-client.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-gsm-client.lo `test -f 'gsm-client.c' || echo '$(srcdir)/'`gsm-client.c
+
+_sugarext_la-gsm-client-xsmp.lo: gsm-client-xsmp.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-gsm-client-xsmp.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-gsm-client-xsmp.Tpo -c -o _sugarext_la-gsm-client-xsmp.lo `test -f 'gsm-client-xsmp.c' || echo '$(srcdir)/'`gsm-client-xsmp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-gsm-client-xsmp.Tpo $(DEPDIR)/_sugarext_la-gsm-client-xsmp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm-client-xsmp.c' object='_sugarext_la-gsm-client-xsmp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-gsm-client-xsmp.lo `test -f 'gsm-client-xsmp.c' || echo '$(srcdir)/'`gsm-client-xsmp.c
+
+_sugarext_la-gsm-xsmp.lo: gsm-xsmp.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-gsm-xsmp.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-gsm-xsmp.Tpo -c -o _sugarext_la-gsm-xsmp.lo `test -f 'gsm-xsmp.c' || echo '$(srcdir)/'`gsm-xsmp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-gsm-xsmp.Tpo $(DEPDIR)/_sugarext_la-gsm-xsmp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm-xsmp.c' object='_sugarext_la-gsm-xsmp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-gsm-xsmp.lo `test -f 'gsm-xsmp.c' || echo '$(srcdir)/'`gsm-xsmp.c
+
+_sugarext_la-gsm-session.lo: gsm-session.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-gsm-session.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-gsm-session.Tpo -c -o _sugarext_la-gsm-session.lo `test -f 'gsm-session.c' || echo '$(srcdir)/'`gsm-session.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-gsm-session.Tpo $(DEPDIR)/_sugarext_la-gsm-session.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm-session.c' object='_sugarext_la-gsm-session.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-gsm-session.lo `test -f 'gsm-session.c' || echo '$(srcdir)/'`gsm-session.c
+
 _sugarext_la-eggaccelerators.lo: eggaccelerators.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-eggaccelerators.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-eggaccelerators.Tpo -c -o _sugarext_la-eggaccelerators.lo `test -f 'eggaccelerators.c' || echo '$(srcdir)/'`eggaccelerators.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-eggaccelerators.Tpo $(DEPDIR)/_sugarext_la-eggaccelerators.Plo
@@ -427,6 +490,27 @@ _sugarext_la-eggaccelerators.lo: eggaccelerators.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-eggaccelerators.lo `test -f 'eggaccelerators.c' || echo '$(srcdir)/'`eggaccelerators.c
 
+_sugarext_la-eggdesktopfile.lo: eggdesktopfile.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-eggdesktopfile.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-eggdesktopfile.Tpo -c -o _sugarext_la-eggdesktopfile.lo `test -f 'eggdesktopfile.c' || echo '$(srcdir)/'`eggdesktopfile.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-eggdesktopfile.Tpo $(DEPDIR)/_sugarext_la-eggdesktopfile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eggdesktopfile.c' object='_sugarext_la-eggdesktopfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-eggdesktopfile.lo `test -f 'eggdesktopfile.c' || echo '$(srcdir)/'`eggdesktopfile.c
+
+_sugarext_la-eggsmclient.lo: eggsmclient.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-eggsmclient.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-eggsmclient.Tpo -c -o _sugarext_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-eggsmclient.Tpo $(DEPDIR)/_sugarext_la-eggsmclient.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eggsmclient.c' object='_sugarext_la-eggsmclient.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c
+
+_sugarext_la-eggsmclient-xsmp.lo: eggsmclient-xsmp.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-eggsmclient-xsmp.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-eggsmclient-xsmp.Tpo -c -o _sugarext_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-eggsmclient-xsmp.Tpo $(DEPDIR)/_sugarext_la-eggsmclient-xsmp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eggsmclient-xsmp.c' object='_sugarext_la-eggsmclient-xsmp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c
+
 _sugarext_la-sexy-icon-entry.lo: sexy-icon-entry.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-sexy-icon-entry.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-sexy-icon-entry.Tpo -c -o _sugarext_la-sexy-icon-entry.lo `test -f 'sexy-icon-entry.c' || echo '$(srcdir)/'`sexy-icon-entry.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_sugarext_la-sexy-icon-entry.Tpo $(DEPDIR)/_sugarext_la-sexy-icon-entry.Plo
@@ -790,6 +874,7 @@ _sugarext.c: _sugarext.defs _sugarext.override
 	(cd $(srcdir)\
 	 && $(PYGTK_CODEGEN) \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
+	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
 	    --override $*.override \
 	    --prefix py$* $*.defs) > gen-$*.c \
diff --git a/src/sugar/_sugarext.c b/src/sugar/_sugarext.c
index 767f3e9..d464992 100644
--- a/src/sugar/_sugarext.c
+++ b/src/sugar/_sugarext.c
@@ -13,11 +13,16 @@
 #include "sugar-menu.h"
 #include "sugar-preview.h"
 #include "sexy-icon-entry.h"
+#include "gsm-session.h"
+
+#define EGG_SM_CLIENT_BACKEND_XSMP
+#include "eggsmclient.h"
+#include "eggsmclient-private.h"
 
 #include <pygtk/pygtk.h>
 #include <glib.h>
 
-#line 21 "_sugarext.c"
+#line 26 "_sugarext.c"
 
 
 /* ---------- types from other modules ---------- */
@@ -43,8 +48,11 @@ PyTypeObject G_GNUC_INTERNAL PySugarKeyGrabber_Type;
 PyTypeObject G_GNUC_INTERNAL PySugarMenu_Type;
 PyTypeObject G_GNUC_INTERNAL PySugarPreview_Type;
 PyTypeObject G_GNUC_INTERNAL PySexyIconEntry_Type;
+PyTypeObject G_GNUC_INTERNAL PyEggSMClientXSMP_Type;
+PyTypeObject G_GNUC_INTERNAL PyEggSMClient_Type;
+PyTypeObject G_GNUC_INTERNAL PyGsmSession_Type;
 
-#line 48 "_sugarext.c"
+#line 56 "_sugarext.c"
 
 
 
@@ -156,11 +164,50 @@ _wrap_sugar_key_grabber_get_key(PyGObject *self, PyObject *args, PyObject *kwarg
     return Py_None;
 }
 
+static PyObject *
+_wrap_sugar_key_grabber_is_modifier(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *kwlist[] = { "keycode", "mask", NULL };
+    PyObject *py_keycode = NULL, *py_mask = NULL;
+    int ret;
+    guint keycode = 0, mask = -1;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O|O:SugarKeyGrabber.is_modifier", kwlist, &py_keycode, &py_mask))
+        return NULL;
+    if (py_keycode) {
+        if (PyLong_Check(py_keycode))
+            keycode = PyLong_AsUnsignedLong(py_keycode);
+        else if (PyInt_Check(py_keycode))
+            keycode = PyInt_AsLong(py_keycode);
+        else
+            PyErr_SetString(PyExc_TypeError, "Parameter 'keycode' must be an int or a long");
+        if (PyErr_Occurred())
+            return NULL;
+    }
+    if (py_mask) {
+        if (PyLong_Check(py_mask))
+            mask = PyLong_AsUnsignedLong(py_mask);
+        else if (PyInt_Check(py_mask))
+            mask = PyInt_AsLong(py_mask);
+        else
+            PyErr_SetString(PyExc_TypeError, "Parameter 'mask' must be an int or a long");
+        if (PyErr_Occurred())
+            return NULL;
+    }
+    
+    ret = sugar_key_grabber_is_modifier(SUGAR_KEY_GRABBER(self->obj), keycode, mask);
+    
+    return PyBool_FromLong(ret);
+
+}
+
 static const PyMethodDef _PySugarKeyGrabber_methods[] = {
     { "grab", (PyCFunction)_wrap_sugar_key_grabber_grab, METH_VARARGS|METH_KEYWORDS,
       NULL },
     { "get_key", (PyCFunction)_wrap_sugar_key_grabber_get_key, METH_VARARGS|METH_KEYWORDS,
       NULL },
+    { "is_modifier", (PyCFunction)_wrap_sugar_key_grabber_is_modifier, METH_VARARGS|METH_KEYWORDS,
+      NULL },
     { NULL, NULL, 0, NULL }
 };
 
@@ -599,9 +646,305 @@ PyTypeObject G_GNUC_INTERNAL PySexyIconEntry_Type = {
 
 
 
+/* ----------- EggSMClient ----------- */
+
+static PyObject *
+_wrap_egg_sm_client_is_resumed(PyGObject *self)
+{
+    int ret;
+
+    
+    ret = egg_sm_client_is_resumed(EGG_SM_CLIENT(self->obj));
+    
+    return PyBool_FromLong(ret);
+
+}
+
+static PyObject *
+_wrap_egg_sm_client_startup(PyGObject *self)
+{
+    
+    egg_sm_client_startup(EGG_SM_CLIENT(self->obj));
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+_wrap_egg_sm_client_will_quit(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *kwlist[] = { "will_quit", NULL };
+    int will_quit;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:EggSMClient.will_quit", kwlist, &will_quit))
+        return NULL;
+    
+    egg_sm_client_will_quit(EGG_SM_CLIENT(self->obj), will_quit);
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static const PyMethodDef _PyEggSMClient_methods[] = {
+    { "is_resumed", (PyCFunction)_wrap_egg_sm_client_is_resumed, METH_NOARGS,
+      NULL },
+    { "startup", (PyCFunction)_wrap_egg_sm_client_startup, METH_NOARGS,
+      NULL },
+    { "will_quit", (PyCFunction)_wrap_egg_sm_client_will_quit, METH_VARARGS|METH_KEYWORDS,
+      NULL },
+    { NULL, NULL, 0, NULL }
+};
+
+PyTypeObject G_GNUC_INTERNAL PyEggSMClient_Type = {
+    PyObject_HEAD_INIT(NULL)
+    0,                                 /* ob_size */
+    "sugar._sugarext.SMClient",                   /* tp_name */
+    sizeof(PyGObject),          /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)0,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)0,       /* tp_getattr */
+    (setattrfunc)0,       /* tp_setattr */
+    (cmpfunc)0,           /* tp_compare */
+    (reprfunc)0,             /* tp_repr */
+    (PyNumberMethods*)0,     /* tp_as_number */
+    (PySequenceMethods*)0, /* tp_as_sequence */
+    (PyMappingMethods*)0,   /* tp_as_mapping */
+    (hashfunc)0,             /* tp_hash */
+    (ternaryfunc)0,          /* tp_call */
+    (reprfunc)0,              /* tp_str */
+    (getattrofunc)0,     /* tp_getattro */
+    (setattrofunc)0,     /* tp_setattro */
+    (PyBufferProcs*)0,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                      /* tp_flags */
+    NULL,                        /* Documentation string */
+    (traverseproc)0,     /* tp_traverse */
+    (inquiry)0,             /* tp_clear */
+    (richcmpfunc)0,   /* tp_richcompare */
+    offsetof(PyGObject, weakreflist),             /* tp_weaklistoffset */
+    (getiterfunc)0,          /* tp_iter */
+    (iternextfunc)0,     /* tp_iternext */
+    (struct PyMethodDef*)_PyEggSMClient_methods, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    (struct PyGetSetDef*)0,  /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)0,    /* tp_descr_get */
+    (descrsetfunc)0,    /* tp_descr_set */
+    offsetof(PyGObject, inst_dict),                 /* tp_dictoffset */
+    (initproc)0,             /* tp_init */
+    (allocfunc)0,           /* tp_alloc */
+    (newfunc)0,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)0              /* tp_is_gc */
+};
+
+
+
+/* ----------- EggSMClientXSMP ----------- */
+
+PyTypeObject G_GNUC_INTERNAL PyEggSMClientXSMP_Type = {
+    PyObject_HEAD_INIT(NULL)
+    0,                                 /* ob_size */
+    "sugar._sugarext.SMClientXSMP",                   /* tp_name */
+    sizeof(PyGObject),          /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)0,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)0,       /* tp_getattr */
+    (setattrfunc)0,       /* tp_setattr */
+    (cmpfunc)0,           /* tp_compare */
+    (reprfunc)0,             /* tp_repr */
+    (PyNumberMethods*)0,     /* tp_as_number */
+    (PySequenceMethods*)0, /* tp_as_sequence */
+    (PyMappingMethods*)0,   /* tp_as_mapping */
+    (hashfunc)0,             /* tp_hash */
+    (ternaryfunc)0,          /* tp_call */
+    (reprfunc)0,              /* tp_str */
+    (getattrofunc)0,     /* tp_getattro */
+    (setattrofunc)0,     /* tp_setattro */
+    (PyBufferProcs*)0,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                      /* tp_flags */
+    NULL,                        /* Documentation string */
+    (traverseproc)0,     /* tp_traverse */
+    (inquiry)0,             /* tp_clear */
+    (richcmpfunc)0,   /* tp_richcompare */
+    offsetof(PyGObject, weakreflist),             /* tp_weaklistoffset */
+    (getiterfunc)0,          /* tp_iter */
+    (iternextfunc)0,     /* tp_iternext */
+    (struct PyMethodDef*)NULL, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    (struct PyGetSetDef*)0,  /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)0,    /* tp_descr_get */
+    (descrsetfunc)0,    /* tp_descr_set */
+    offsetof(PyGObject, inst_dict),                 /* tp_dictoffset */
+    (initproc)0,             /* tp_init */
+    (allocfunc)0,           /* tp_alloc */
+    (newfunc)0,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)0              /* tp_is_gc */
+};
+
+
+
+/* ----------- GsmSession ----------- */
+
+static PyObject *
+_wrap_gsm_session_set_name(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *kwlist[] = { "name", NULL };
+    char *name;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:GsmSession.set_name", kwlist, &name))
+        return NULL;
+    
+    gsm_session_set_name(GSM_SESSION(self->obj), name);
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+_wrap_gsm_session_start(PyGObject *self)
+{
+    
+    gsm_session_start(GSM_SESSION(self->obj));
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+_wrap_gsm_session_initiate_shutdown(PyGObject *self)
+{
+    
+    gsm_session_initiate_shutdown(GSM_SESSION(self->obj));
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static const PyMethodDef _PyGsmSession_methods[] = {
+    { "set_name", (PyCFunction)_wrap_gsm_session_set_name, METH_VARARGS|METH_KEYWORDS,
+      NULL },
+    { "start", (PyCFunction)_wrap_gsm_session_start, METH_NOARGS,
+      NULL },
+    { "initiate_shutdown", (PyCFunction)_wrap_gsm_session_initiate_shutdown, METH_NOARGS,
+      NULL },
+    { NULL, NULL, 0, NULL }
+};
+
+PyTypeObject G_GNUC_INTERNAL PyGsmSession_Type = {
+    PyObject_HEAD_INIT(NULL)
+    0,                                 /* ob_size */
+    "sugar._sugarext.Session",                   /* tp_name */
+    sizeof(PyGObject),          /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)0,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)0,       /* tp_getattr */
+    (setattrfunc)0,       /* tp_setattr */
+    (cmpfunc)0,           /* tp_compare */
+    (reprfunc)0,             /* tp_repr */
+    (PyNumberMethods*)0,     /* tp_as_number */
+    (PySequenceMethods*)0, /* tp_as_sequence */
+    (PyMappingMethods*)0,   /* tp_as_mapping */
+    (hashfunc)0,             /* tp_hash */
+    (ternaryfunc)0,          /* tp_call */
+    (reprfunc)0,              /* tp_str */
+    (getattrofunc)0,     /* tp_getattro */
+    (setattrofunc)0,     /* tp_setattro */
+    (PyBufferProcs*)0,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                      /* tp_flags */
+    NULL,                        /* Documentation string */
+    (traverseproc)0,     /* tp_traverse */
+    (inquiry)0,             /* tp_clear */
+    (richcmpfunc)0,   /* tp_richcompare */
+    offsetof(PyGObject, weakreflist),             /* tp_weaklistoffset */
+    (getiterfunc)0,          /* tp_iter */
+    (iternextfunc)0,     /* tp_iternext */
+    (struct PyMethodDef*)_PyGsmSession_methods, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    (struct PyGetSetDef*)0,  /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)0,    /* tp_descr_get */
+    (descrsetfunc)0,    /* tp_descr_set */
+    offsetof(PyGObject, inst_dict),                 /* tp_dictoffset */
+    (initproc)0,             /* tp_init */
+    (allocfunc)0,           /* tp_alloc */
+    (newfunc)0,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)0              /* tp_is_gc */
+};
+
+
+
 /* ----------- functions ----------- */
 
+static PyObject *
+_wrap_gsm_xsmp_init(PyObject *self)
+{
+    gchar *ret;
+
+    
+    ret = gsm_xsmp_init();
+    
+    if (ret) {
+        PyObject *py_ret = PyString_FromString(ret);
+        g_free(ret);
+        return py_ret;
+    }
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+_wrap_gsm_xsmp_run(PyObject *self)
+{
+    
+    gsm_xsmp_run();
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+_wrap_gsm_xsmp_shutdown(PyObject *self)
+{
+    
+    gsm_xsmp_shutdown();
+    
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+_wrap_gsm_session_create_global(PyObject *self)
+{
+    GsmSession *ret;
+
+    
+    ret = gsm_session_create_global();
+    
+    /* pygobject_new handles NULL checking */
+    return pygobject_new((GObject *)ret);
+}
+
 const PyMethodDef py_sugarext_functions[] = {
+    { "xsmp_init", (PyCFunction)_wrap_gsm_xsmp_init, METH_NOARGS,
+      NULL },
+    { "xsmp_run", (PyCFunction)_wrap_gsm_xsmp_run, METH_NOARGS,
+      NULL },
+    { "xsmp_shutdown", (PyCFunction)_wrap_gsm_xsmp_shutdown, METH_NOARGS,
+      NULL },
+    { "session_create_global", (PyCFunction)_wrap_gsm_session_create_global, METH_NOARGS,
+      NULL },
     { NULL, NULL, 0, NULL }
 };
 
@@ -688,7 +1031,7 @@ py_sugarext_register_classes(PyObject *d)
     }
 
 
-#line 692 "_sugarext.c"
+#line 1035 "_sugarext.c"
     pygobject_register_class(d, "SugarAddressEntry", SUGAR_TYPE_ADDRESS_ENTRY, &PySugarAddressEntry_Type, Py_BuildValue("(O)", &PyGtkEntry_Type));
     pygobject_register_class(d, "SugarKeyGrabber", SUGAR_TYPE_KEY_GRABBER, &PySugarKeyGrabber_Type, Py_BuildValue("(O)", &PyGObject_Type));
     pyg_set_object_has_new_constructor(SUGAR_TYPE_KEY_GRABBER);
@@ -697,4 +1040,10 @@ py_sugarext_register_classes(PyObject *d)
     pyg_set_object_has_new_constructor(SUGAR_TYPE_PREVIEW);
     pygobject_register_class(d, "SexyIconEntry", SEXY_TYPE_ICON_ENTRY, &PySexyIconEntry_Type, Py_BuildValue("(O)", &PyGtkEntry_Type));
     pyg_set_object_has_new_constructor(SEXY_TYPE_ICON_ENTRY);
+    pygobject_register_class(d, "EggSMClient", EGG_TYPE_SM_CLIENT, &PyEggSMClient_Type, Py_BuildValue("(O)", &PyGObject_Type));
+    pyg_set_object_has_new_constructor(EGG_TYPE_SM_CLIENT);
+    pygobject_register_class(d, "EggSMClientXSMP", EGG_TYPE_SM_CLIENT_XSMP, &PyEggSMClientXSMP_Type, Py_BuildValue("(O)", &PyEggSMClient_Type));
+    pyg_set_object_has_new_constructor(EGG_TYPE_SM_CLIENT_XSMP);
+    pygobject_register_class(d, "GsmSession", GSM_TYPE_SESSION, &PyGsmSession_Type, Py_BuildValue("(O)", &PyGObject_Type));
+    pyg_set_object_has_new_constructor(GSM_TYPE_SESSION);
 }
diff --git a/src/sugar/_sugarext.defs b/src/sugar/_sugarext.defs
index 1c9812e..6e741dc 100644
--- a/src/sugar/_sugarext.defs
+++ b/src/sugar/_sugarext.defs
@@ -36,6 +36,27 @@
   (gtype-id "SEXY_TYPE_ICON_ENTRY")
 )
 
+(define-object SMClientXSMP
+  (in-module "Egg")
+  (parent "EggSMClient")
+  (c-name "EggSMClientXSMP")
+  (gtype-id "EGG_TYPE_SM_CLIENT_XSMP")
+)
+
+(define-object SMClient
+  (in-module "Egg")
+  (parent "GObject")
+  (c-name "EggSMClient")
+  (gtype-id "EGG_TYPE_SM_CLIENT")
+)
+
+(define-object Session
+  (in-module "Gsm")
+  (parent "GObject")
+  (c-name "GsmSession")
+  (gtype-id "GSM_TYPE_SESSION")
+)
+
 ;; Enumerations and flags ...
 
 (define-enum IconEntryPosition
@@ -100,6 +121,16 @@
   )
 )
 
+(define-method is_modifier
+  (of-object "SugarKeyGrabber")
+  (c-name "sugar_key_grabber_is_modifier")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "keycode")
+    '("guint" "mask" (default "-1"))
+  )
+)
+
 ;; From sexy-icon-entry.h
 
 (define-function sexy_icon_entry_get_type
@@ -194,3 +225,123 @@
   (c-name "sugar_preview_get_pixbuf")
   (return-type "GdkPixbuf*")
 )
+
+;; From eggsmclient.h
+
+(define-function egg_sm_client_get_type
+  (c-name "egg_sm_client_get_type")
+  (return-type "GType")
+)
+
+(define-function egg_sm_client_get_option_group
+  (c-name "egg_sm_client_get_option_group")
+  (return-type "GOptionGroup*")
+)
+
+(define-method is_resumed
+  (of-object "EggSMClient")
+  (c-name "egg_sm_client_is_resumed")
+  (return-type "gboolean")
+)
+
+(define-method get_state_file
+  (of-object "EggSMClient")
+  (c-name "egg_sm_client_get_state_file")
+  (return-type "GKeyFile*")
+)
+
+(define-method set_restart_command
+  (of-object "EggSMClient")
+  (c-name "egg_sm_client_set_restart_command")
+  (return-type "none")
+  (parameters
+    '("int" "argc")
+    '("const-char**" "argv")
+  )
+)
+
+(define-method startup
+  (of-object "EggSMClient")
+  (c-name "egg_sm_client_startup")
+  (return-type "none")
+)
+
+(define-method will_quit
+  (of-object "EggSMClient")
+  (c-name "egg_sm_client_will_quit")
+  (return-type "none")
+  (parameters
+    '("gboolean" "will_quit")
+  )
+)
+
+(define-function egg_sm_client_end_session
+  (c-name "egg_sm_client_end_session")
+  (return-type "gboolean")
+  (parameters
+    '("EggSMClientEndStyle" "style")
+    '("gboolean" "request_confirmation")
+  )
+)
+
+;; From xsmp.h
+
+(define-function xsmp_init
+  (c-name "gsm_xsmp_init")
+  (return-type "char*")
+)
+
+(define-function xsmp_run
+  (c-name "gsm_xsmp_run")
+  (return-type "none")
+)
+
+(define-function xsmp_shutdown
+  (c-name "gsm_xsmp_shutdown")
+  (return-type "none")
+)
+
+;; From session.h
+
+(define-method set_name
+  (of-object "GsmSession")
+  (c-name "gsm_session_set_name")
+  (return-type "none")
+  (parameters
+    '("const-char*" "name")
+  )
+)
+
+(define-method start
+  (of-object "GsmSession")
+  (c-name "gsm_session_start")
+  (return-type "none")
+)
+
+(define-method get_phase
+  (of-object "GsmSession")
+  (c-name "gsm_session_get_phase")
+  (return-type "GsmSessionPhase")
+)
+
+(define-method initiate_shutdown
+  (of-object "GsmSession")
+  (c-name "gsm_session_initiate_shutdown")
+  (return-type "none")
+)
+
+(define-method register_client
+  (of-object "GsmSession")
+  (c-name "gsm_session_register_client")
+  (return-type "char*")
+  (parameters
+    '("GsmClient*" "client")
+    '("const-char*" "previous_id")
+  )
+)
+
+(define-function session_create_global
+  (c-name "gsm_session_create_global")
+  (return-type "GsmSession*")
+)
+
diff --git a/src/sugar/activity/__init__py b/src/sugar/activity/__init__py
deleted file mode 100644
index e69de29..0000000
--- a/src/sugar/activity/__init__py
+++ /dev/null
diff --git a/src/sugar/presence/test_presence.txt b/src/sugar/presence/test_presence.txt
deleted file mode 100644
index d0736a9..0000000
--- a/src/sugar/presence/test_presence.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-This is a test of presence.
-
-To test this service we will start up a mock dbus library:
-
-    >>> from sugar.testing import mockdbus
-    >>> import dbus
-    >>> pres_service = mockdbus.MockService(
-    ...     'org.laptop.Presence', '/org/laptop/Presence', name='pres')
-    >>> pres_service.install()
-    >>> pres_interface = dbus.Interface(pres_service, 'org.laptop.Presence')
-
-Then we import the library (second, to make sure it connects to our
-mocked system, though the lazy instantiation in get_instance() should
-handle it):
-
-    >>> from sugar.presence import PresenceService
-    >>> ps = PresenceService.get_instance()
-    >>> pres_interface.make_response('getServices', [])
-    >>> ps.get_services()
-    Called pres.org.laptop.Presence:getServices()
-    []
-    >>> pres_interface.make_response('getBuddies', [])
-    >>> ps.get_buddies()
-    Called pres.org.laptop.Presence:getBuddies()
-    []
-