gnome-session r5041 - in trunk: . data gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Tue Sep  2 14:10:21 2008
New Revision: 5041
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5041&view=rev

Log:
2008-09-02  Vincent Untz  <vuntz gnome org>

	* data/gnome-session.schemas.in:
	* data/gnome-wm:
	* gnome-session/main.c:
	Do not use dash but underscore to separate words in gconf keys, as
	recommended by the gconf naming conventions. Since they keys are new in
	2.23, it's not too late to do this change.


Modified:
   trunk/ChangeLog
   trunk/data/gnome-session.schemas.in
   trunk/data/gnome-wm
   trunk/gnome-session/main.c

Modified: trunk/data/gnome-session.schemas.in
==============================================================================
--- trunk/data/gnome-session.schemas.in	(original)
+++ trunk/data/gnome-session.schemas.in	Tue Sep  2 14:10:21 2008
@@ -59,8 +59,8 @@
       </schema>
 
       <schema>
-         <key>/schemas/desktop/gnome/session/default-session</key>
-         <applyto>/desktop/gnome/session/default-session</applyto>
+         <key>/schemas/desktop/gnome/session/default_session</key>
+         <applyto>/desktop/gnome/session/default_session</applyto>
          <owner>gnome</owner>
          <type>list</type>
          <list_type>string</list_type>
@@ -71,20 +71,20 @@
          </locale>
       </schema>
       <schema>
-         <key>/schemas/desktop/gnome/session/required-components</key>
-         <applyto>/desktop/gnome/session/required-components</applyto>
+         <key>/schemas/desktop/gnome/session/required_components</key>
+         <applyto>/desktop/gnome/session/required_components</applyto>
          <owner>gnome</owner>
          <type>list</type>
          <list_type>string</list_type>
          <default>[windowmanager,panel,filemanager]</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/gnome/session/required-components".) The Session Preferences 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 if they do get removed.</long>
+            <long>List of components that are required as part of the session. (Each element names a key under "/desktop/gnome/session/required_components".) The Session Preferences 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 if they do get removed.</long>
          </locale>
       </schema>
       <schema>
-         <key>/schemas/desktop/gnome/session/required-components/windowmanager</key>
-         <applyto>/desktop/gnome/session/required-components/windowmanager</applyto>
+         <key>/schemas/desktop/gnome/session/required_components/windowmanager</key>
+         <applyto>/desktop/gnome/session/required_components/windowmanager</applyto>
          <owner>gnome</owner>
          <type>string</type>
          <default>metacity</default>
@@ -94,8 +94,8 @@
          </locale>
       </schema>
       <schema>
-         <key>/schemas/desktop/gnome/session/required-components/panel</key>
-         <applyto>/desktop/gnome/session/required-components/panel</applyto>
+         <key>/schemas/desktop/gnome/session/required_components/panel</key>
+         <applyto>/desktop/gnome/session/required_components/panel</applyto>
          <owner>gnome</owner>
          <type>string</type>
          <default>gnome-panel</default>
@@ -105,8 +105,8 @@
          </locale>
       </schema>
       <schema>
-         <key>/schemas/desktop/gnome/session/required-components/filemanager</key>
-         <applyto>/desktop/gnome/session/required-components/filemanager</applyto>
+         <key>/schemas/desktop/gnome/session/required_components/filemanager</key>
+         <applyto>/desktop/gnome/session/required_components/filemanager</applyto>
          <owner>gnome</owner>
          <type>string</type>
          <default>nautilus</default>

Modified: trunk/data/gnome-wm
==============================================================================
--- trunk/data/gnome-wm	(original)
+++ trunk/data/gnome-wm	Tue Sep  2 14:10:21 2008
@@ -8,7 +8,7 @@
 #
 # NOTE: DON'T USE THIS.  Please have your window manager install
 # a desktop file and change the gconf key
-# /desktop/gnome/session/required-components/windowmanager
+# /desktop/gnome/session/required_components/windowmanager
 
 # sm-client-id value
 SMID=
@@ -42,7 +42,7 @@
 
 # WINDOW_MANAGER overrides all
 if [ -z "$WINDOW_MANAGER" ] ; then
-    WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required-components/windowmanager 2> /dev/null`
+    WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required_components/windowmanager 2> /dev/null`
 fi
 
 if [ -z "$WINDOW_MANAGER" ] ; then

Modified: trunk/gnome-session/main.c
==============================================================================
--- trunk/gnome-session/main.c	(original)
+++ trunk/gnome-session/main.c	Tue Sep  2 14:10:21 2008
@@ -46,9 +46,9 @@
 #include "gsm-xsmp-server.h"
 #include "gsm-store.h"
 
-#define GSM_GCONF_DEFAULT_SESSION_KEY           "/desktop/gnome/session/default-session"
-#define GSM_GCONF_REQUIRED_COMPONENTS_DIRECTORY "/desktop/gnome/session/required-components"
-#define GSM_GCONF_REQUIRED_COMPONENTS_KEY       "/desktop/gnome/session/required-components"
+#define GSM_GCONF_DEFAULT_SESSION_KEY           "/desktop/gnome/session/default_session"
+#define GSM_GCONF_REQUIRED_COMPONENTS_DIRECTORY "/desktop/gnome/session/required_components"
+#define GSM_GCONF_REQUIRED_COMPONENTS_KEY       "/desktop/gnome/session/required_components"
 
 #define GSM_DBUS_NAME "org.gnome.SessionManager"