[maemo-commits] [maemo-commits] r15898 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-08-27 09:36:55 +0300 (Wed, 27 Aug 2008)
New Revision: 15898

Modified:
   projects/haf/trunk/hildon-initscripts/configure.ac
   projects/haf/trunk/hildon-initscripts/debian/changelog
   projects/haf/trunk/hildon-initscripts/osso-gtk.defs
Log:
  * Set XDG_DATA_HOME only if root in osso-gtk.defs
  * Fixes: NB#87815


Modified: projects/haf/trunk/hildon-initscripts/configure.ac
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure.ac	2008-08-26 16:00:13 UTC (rev 15897)
+++ projects/haf/trunk/hildon-initscripts/configure.ac	2008-08-27 06:36:55 UTC (rev 15898)
@@ -1,4 +1,4 @@
-AC_INIT([hildon-initscripts], [1.15])
+AC_INIT([hildon-initscripts], [1.16])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([run-standalone.sh])
 

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2008-08-26 16:00:13 UTC (rev 15897)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2008-08-27 06:36:55 UTC (rev 15898)
@@ -1,3 +1,10 @@
+hildon-initscripts (1.16-1) unstable; urgency=low
+
+  * Set XDG_DATA_HOME only if root in osso-gtk.defs
+  * Fixes: NB#87815
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 27 Aug 2008 09:32:05 +0300
+
 hildon-initscripts (1.15-1) unstable; urgency=low
 
   * Do not kill -9 a process inside scratchbox-launcher.sh. Do a plain kill instead.

Modified: projects/haf/trunk/hildon-initscripts/osso-gtk.defs
===================================================================
--- projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2008-08-26 16:00:13 UTC (rev 15897)
+++ projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2008-08-27 06:36:55 UTC (rev 15898)
@@ -27,7 +27,9 @@
 ORIGHOME=$HOME
 HOME=/home/user  ;# needed for some root processes
 
-export XDG_DATA_HOME=$PREFIX/share/mime
+if [ $(id -u) -eq 0 ]; then
+  export XDG_DATA_HOME=$PREFIX/share/mime
+fi
 
 DEFAULTMBTHEME=default
 DEFAULTGTKTHEME=default