[maemo-commits] [maemo-commits] r10318 - in projects/haf/trunk/hildon-desktop: . background-manager data

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-03-02 14:11:43 +0200 (Fri, 02 Mar 2007)
New Revision: 10318

Added:
   projects/haf/trunk/hildon-desktop/data/desktop.conf.in
   projects/haf/trunk/hildon-desktop/data/home.conf.in
   projects/haf/trunk/hildon-desktop/data/statusbar.conf.in
   projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in
Removed:
   projects/haf/trunk/hildon-desktop/data/desktop.conf
   projects/haf/trunk/hildon-desktop/data/home.conf
   projects/haf/trunk/hildon-desktop/data/statusbar.conf
   projects/haf/trunk/hildon-desktop/data/tasknavigator.conf
Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/background-manager/main.c
   projects/haf/trunk/hildon-desktop/configure.ac
Log:
2007-03-02  Lucas Rocha  <lucas.rocha at nokia.com>

	* background-manager/fix build warning.
	* configure.ac: expand nested variables to be used in
	desktop/container configuration files.
	* data/desktop.conf.in, data/tasknavigator.conf.in,
	data/statusbar.conf.in, data/home.conf.in: get paths from the
	configuration and don't hardcode them.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-02 12:11:43 UTC (rev 10318)
@@ -1,5 +1,14 @@
 2007-03-02  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* background-manager/fix build warning.
+	* configure.ac: expand nested variables to be used in
+	desktop/container configuration files.
+	* data/desktop.conf.in, data/tasknavigator.conf.in,
+	data/statusbar.conf.in, data/home.conf.in: get paths from the
+	configuration and don't hardcode them.
+
+2007-03-02  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-home-area.c: fix build warning.
 	* libhildondesktop/Makefile.am, libhildonwm/Makefile.am: added
 	dbus-glib cflags and libs to the build.

Modified: projects/haf/trunk/hildon-desktop/background-manager/main.c
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/main.c	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/background-manager/main.c	2007-03-02 12:11:43 UTC (rev 10318)
@@ -43,7 +43,7 @@
   DBusGConnection      *connection;
   DBusGProxy           *driver_proxy;
   GError               *error = NULL;
-  gint                  request_ret;
+  guint                  request_ret;
   
   g_type_init ();
   gnome_vfs_init ();

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-03-02 12:11:43 UTC (rev 10318)
@@ -160,16 +160,25 @@
 AC_SUBST(hildondesktopconfdir)
 
 hildonnavigatordesktopentrydir=${datadir}/applications/hildon-navigator
+# Expand nested variables
+eval "hildonnavigatordesktopentrydir=$hildonnavigatordesktopentrydir"
+eval "hildonnavigatordesktopentrydir=$hildonnavigatordesktopentrydir"
 hildonnavigatorlibdir=${libdir}/hildon-navigator
 AC_SUBST(hildonnavigatordesktopentrydir)
 AC_SUBST(hildonnavigatorlibdir)
 
 hildonhomedesktopentrydir=${datadir}/applications/hildon-home
+# Expand nested variables
+eval "hildonhomedesktopentrydir=$hildonhomedesktopentrydir"
+eval "hildonhomedesktopentrydir=$hildonhomedesktopentrydir"
 hildonhomelibdir=${libdir}/hildon-home
 AC_SUBST(hildonhomedesktopentrydir)
 AC_SUBST(hildonhomelibdir)
 
 hildonstatusbardesktopentrydir=${datadir}/applications/hildon-status-bar
+# Expand nested variables
+eval "hildonstatusbardesktopentrydir=$hildonstatusbardesktopentrydir"
+eval "hildonstatusbardesktopentrydir=$hildonstatusbardesktopentrydir"
 hildonstatusbarlibdir=${libdir}/hildon-status-bar
 AC_SUBST(hildonstatusbardesktopentrydir)
 AC_SUBST(hildonstatusbarlibdir)
@@ -209,7 +218,11 @@
 background-manager/hildon-background-manager.service 
 background-manager/background-manager.xml 
 background-manager/background-manager-dbus.h 
-data/Makefile 
+data/Makefile
+data/desktop.conf
+data/tasknavigator.conf
+data/statusbar.conf
+data/home.conf
 data/app-switcher.desktop 
 data/others-button.desktop 
 ])

Deleted: projects/haf/trunk/hildon-desktop/data/desktop.conf
===================================================================
--- projects/haf/trunk/hildon-desktop/data/desktop.conf	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/data/desktop.conf	2007-03-02 12:11:43 UTC (rev 10318)
@@ -1,25 +0,0 @@
-[Tasknavigator]
-X-Type=panel_box
-X-Position-X=0
-X-Position-Y=0
-X-Size-Width=480
-X-Size-Height=80
-X-Orientation=left
-X-Config-File=tasknavigator.conf
-X-Plugin-Dir=/usr/share/applications/hildon-navigator
-
-[Home]
-X-Type=home
-X-Config-File=home.conf
-X-Plugin-Dir=/usr/share/applications/hildon-home
-
-[Statusbar]
-X-Type=panel_expandable
-X-Position-X=423
-X-Position-Y=0
-X-Size-Width=270
-X-Size-Height=50
-X-Orientation=top
-X-Config-File=statusbar.conf
-X-Plugin-Dir=/usr/share/applications/hildon-status-bar
-

Copied: projects/haf/trunk/hildon-desktop/data/desktop.conf.in (from rev 10306, projects/haf/trunk/hildon-desktop/data/desktop.conf)
===================================================================
--- projects/haf/trunk/hildon-desktop/data/desktop.conf	2007-03-02 09:44:06 UTC (rev 10306)
+++ projects/haf/trunk/hildon-desktop/data/desktop.conf.in	2007-03-02 12:11:43 UTC (rev 10318)
@@ -0,0 +1,25 @@
+[Tasknavigator]
+X-Type=panel_box
+X-Position-X=0
+X-Position-Y=0
+X-Size-Width=480
+X-Size-Height=80
+X-Orientation=left
+X-Config-File=tasknavigator.conf
+X-Plugin-Dir=@hildonnavigatordesktopentrydir@
+
+[Home]
+X-Type=home
+X-Config-File=home.conf
+X-Plugin-Dir=@hildonhomedesktopentrydir@
+
+[Statusbar]
+X-Type=panel_expandable
+X-Position-X=423
+X-Position-Y=0
+X-Size-Width=270
+X-Size-Height=50
+X-Orientation=top
+X-Config-File=statusbar.conf
+X-Plugin-Dir=@hildonstatusbardesktopentrydir@
+

Deleted: projects/haf/trunk/hildon-desktop/data/home.conf
===================================================================
--- projects/haf/trunk/hildon-desktop/data/home.conf	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/data/home.conf	2007-03-02 12:11:43 UTC (rev 10318)
@@ -1 +0,0 @@
-[/usr/share/applications/hildon-home/isearch-applet.desktop]

Copied: projects/haf/trunk/hildon-desktop/data/home.conf.in (from rev 10306, projects/haf/trunk/hildon-desktop/data/home.conf)
===================================================================
--- projects/haf/trunk/hildon-desktop/data/home.conf	2007-03-02 09:44:06 UTC (rev 10306)
+++ projects/haf/trunk/hildon-desktop/data/home.conf.in	2007-03-02 12:11:43 UTC (rev 10318)
@@ -0,0 +1 @@
+[@hildonhomedesktopentrydir@/isearch-applet.desktop]

Deleted: projects/haf/trunk/hildon-desktop/data/statusbar.conf
===================================================================
--- projects/haf/trunk/hildon-desktop/data/statusbar.conf	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/data/statusbar.conf	2007-03-02 12:11:43 UTC (rev 10318)
@@ -1,4 +0,0 @@
-[/usr/share/applications/hildon-status-bar/presence.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-battery.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-usb.desktop]
-[/usr/share/applications/hildon-status-bar/sound.desktop]

Copied: projects/haf/trunk/hildon-desktop/data/statusbar.conf.in (from rev 10306, projects/haf/trunk/hildon-desktop/data/statusbar.conf)
===================================================================
--- projects/haf/trunk/hildon-desktop/data/statusbar.conf	2007-03-02 09:44:06 UTC (rev 10306)
+++ projects/haf/trunk/hildon-desktop/data/statusbar.conf.in	2007-03-02 12:11:43 UTC (rev 10318)
@@ -0,0 +1,4 @@
+[@hildonstatusbardesktopentrydir@/presence.desktop]
+[@hildonstatusbardesktopentrydir@/hildon-status-bar-battery.desktop]
+[@hildonstatusbardesktopentrydir@/hildon-status-bar-usb.desktop]
+[@hildonstatusbardesktopentrydir@/sound.desktop]

Deleted: projects/haf/trunk/hildon-desktop/data/tasknavigator.conf
===================================================================
--- projects/haf/trunk/hildon-desktop/data/tasknavigator.conf	2007-03-02 12:07:12 UTC (rev 10317)
+++ projects/haf/trunk/hildon-desktop/data/tasknavigator.conf	2007-03-02 12:11:43 UTC (rev 10318)
@@ -1,4 +0,0 @@
-[/usr/share/applications/hildon-navigator/hildon-task-navigator-bookmarks.desktop]
-[/usr/share/applications/hildon-navigator/osso-contact-plugin.desktop]
-[/usr/share/applications/hildon-navigator/others-button.desktop]
-[/usr/share/applications/hildon-navigator/app-switcher.desktop]

Copied: projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in (from rev 10306, projects/haf/trunk/hildon-desktop/data/tasknavigator.conf)
===================================================================
--- projects/haf/trunk/hildon-desktop/data/tasknavigator.conf	2007-03-02 09:44:06 UTC (rev 10306)
+++ projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in	2007-03-02 12:11:43 UTC (rev 10318)
@@ -0,0 +1,4 @@
+[@hildonnavigatordesktopentrydir@/hildon-task-navigator-bookmarks.desktop]
+[@hildonnavigatordesktopentrydir@/osso-contact-plugin.desktop]
+[@hildonnavigatordesktopentrydir@/others-button.desktop]
+[@hildonnavigatordesktopentrydir@/app-switcher.desktop]