SOURCES: entrance-conf.in.patch - up for 0.9.0.005

[sparky]

Author: sparky                       Date: Sat Jan 14 19:21:14 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 0.9.0.005

---- Files affected:
SOURCES:
   entrance-conf.in.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/entrance-conf.in.patch
diff -u SOURCES/entrance-conf.in.patch:1.2 SOURCES/entrance-conf.in.patch:1.3
--- SOURCES/entrance-conf.in.patch:1.2	Sun Oct 30 13:41:31 2005
+++ SOURCES/entrance-conf.in.patch	Sat Jan 14 20:21:08 2006
@@ -8,21 +8,21 @@
  
  # set auth to 1 for pam, 2 for shadow
 @@ -19,6 +19,8 @@
- #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
- ecore_config $DB set /entrance/greeting/before str "Welcome to"
- ecore_config $DB set /entrance/greeting/after str ""
+ #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
+ ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
+ ecore_config -c $DB -k /entrance/greeting/after -s ""
 +
 +dont_run() {
- ecore_config $DB set /entrance/session/count int 8
- ecore_config $DB set /entrance/session/0/session str "default"
- ecore_config $DB set /entrance/session/0/title str "Default"
+ ecore_config -c $DB -k /entrance/session/count -i 7
+ ecore_config -c $DB -k /entrance/session/0/session -s "default"
+ ecore_config -c $DB -k /entrance/session/0/title -s "Default"
 @@ -41,6 +43,23 @@
- ecore_config $DB set /entrance/session/6/session str "failsafe"
- ecore_config $DB set /entrance/session/6/title str "Failsafe"
- ecore_config $DB set /entrance/session/6/icon str "failsafe.png"
+ ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
+ ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe"
+ ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png"
 +}
 +
-+ecore_config $DB set /entrance/session/count int @COUNT@
++ecore_config -c $DB -k /entrance/session/count -i @COUNT@
 +# lines starting with ^#session: will be parsed for each .desktop file
 +# in /usr/share/xsessions where:
 +# @SESSION@	is Exec=(*)
@@ -31,18 +31,29 @@
 +# 			see /usr/share/entrance/images/sessions/
 +# everything will be in /tmp/sessions
 +
-+#session:ecore_config $DB set /entrance/session/@NUM@/session str "@SESSION@"
-+#session:ecore_config $DB set /entrance/session/@NUM@/title str "@TITLE@"
-+#session:ecore_config $DB set /entrance/session/@NUM@/icon str "@ICON@"
++#session:ecore_config -c $DB -k /entrance/session/@NUM@/session -s "@SESSION@"
++#session:ecore_config -c $DB -k /entrance/session/@NUM@/title -s "@TITLE@"
++#session:ecore_config -c $DB -k /entrance/session/@NUM@/icon -s "@ICON@"
 +
 +. /tmp/sessions
 +
- ecore_config $DB set /entrance/system/reboot int 1
- ecore_config $DB set /entrance/system/halt int 1
- ecore_config $DB set /entrance/user/remember int 1
+ ecore_config -c $DB -k /entrance/system/reboot -i 1
+ ecore_config -c $DB -k /entrance/system/halt -i 1
+ ecore_config -c $DB -k /entrance/user/remember -i 1
 --- entrance/data/Makefile.am	2003-10-22 13:29:59.000000000 +0200
 +++ entrance/data/Makefile.am.new	2005-01-08 15:50:12.962107936 +0100
 @@ -1,2 +1,2 @@
 -SUBDIRS = config images themes fonts users
 +SUBDIRS = images themes fonts users
- 
+
+--- entrance-0.9.0.005/data/Makefile.in~	2006-01-14 19:13:50.000000000 +0000
++++ entrance-0.9.0.005/data/Makefile.in	2006-01-14 19:17:52.000000000 +0000
+@@ -123,7 +123,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ xsession = @xsession@
+-SUBDIRS = config images themes fonts users
++SUBDIRS = images themes fonts users
+ subdir = data
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/entrance-conf.in.patch?r1=1.2&r2=1.3&f=u