minimal, but working implementationt/gnome-session

5 files changed, 62 insertions, 3 deletions

diff --git a/bin/sugar.in b/bin/sugar.in
index 12098db..1a5d82d 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -77,6 +77,5 @@ if [ -f ~/.sugar/debug ]; then
 fi
 
 echo Xcursor.theme: sugar | xrdb -merge
-metacity --no-force-fullscreen -d $DISPLAY &
 
-exec sugar-session
+exec gnome-session --required-components-directory=/desktop/sugar/session/required_components --required-components-list-key=/desktop/sugar/session/required_components_list
diff --git a/data/Makefile.am b/data/Makefile.am
index 6a62d23..beb204e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,7 +24,7 @@ xsessionsdir = $(datadir)/xsessions
 xsessions_DATA = sugar.desktop
 
 applicationsdir = $(datadir)/applications
-applications_DATA = sugar-emulator.desktop
+applications_DATA = sugar-emulator.desktop sugar-session.desktop metacity-sugar.desktop
 
 mime_xml_in_files = sugar.xml.in
 mime_xml_files = $(mime_xml_in_files:.xml.in=.xml)
diff --git a/data/metacity-sugar.desktop b/data/metacity-sugar.desktop
new file mode 100644
index 0000000..cc44c1d
--- /dev/null
+++ b/data/metacity-sugar.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Metacity for Sugar
+Exec=metacity --no-force-fullscreen
+Type=Application
+NoDisplay=true
diff --git a/data/sugar-session.desktop b/data/sugar-session.desktop
new file mode 100644
index 0000000..3f931a5
--- /dev/null
+++ b/data/sugar-session.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Sugar session
+Exec=sugar-session
+Type=Application
+NoDisplay=true
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index cfa7edf..da4862a 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -2,6 +2,54 @@
 <gconfschemafile>
   <schemalist>
     <schema>
+      <key>/schemas/desktop/sugar/session/required_components_list</key>
+      <applyto>/desktop/sugar/session/required_components_list</applyto>
+      <owner>sugar</owner>
+	<type>list</type>
+	<list_type>string</list_type>
+	<default>[windowmanager,sugar-session]</default>
+	<locale name="C">
+	  <short>Required session components</short>
+	  <long>List of components that are required as part of the session.
+	    (Each element names a key under
+	    "/desktop/sugar/session/required_components").
+	    The Startup Applications preferences tool will not normally allow
+	    users to remove a required component from the session, and the
+	    session manager will automatically add the required components
+	    back to the session at login time if they do get removed.
+	  </long>
+	</locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/sugar/session/required_components/windowmanager</key>
+      <applyto>/desktop/sugar/session/required_components/windowmanager</applyto>
+      <owner>sugar</owner>
+	<type>string</type>
+	<default>metacity-sugar</default>
+	<locale name="C">
+	  <short>Window Manager</short>
+	  <long>The window manager is the program that draws the title bar and
+	    borders around windows, and allows you to move and resize windows.
+	  </long>
+	</locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/sugar/session/required_components/sugar-session</key>
+      <applyto>/desktop/sugar/session/required_components/sugar-session</applyto>
+      <owner>sugar</owner>
+	<type>string</type>
+	<default>sugar-session</default>
+	<locale name="C">
+	  <short>Sugar session</short>
+	  <long>A combination of all core parts of the Sugar desktop:
+	    Neighbourhood, Group View, Home View, Journal and the Frame.
+	  </long>
+	</locale>
+    </schema>
+
+    <schema>
       <key>/schemas/desktop/sugar/user/nick</key>
       <applyto>/desktop/sugar/user/nick</applyto>
       <owner>sugar</owner>