[maemo-commits] [maemo-commits] r8260 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . data test

[From: lucasr at stage.maemo.org]

Author: lucasr
Date: 2006-11-22 16:39:50 +0200 (Wed, 22 Nov 2006)
New Revision: 8260

Added:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/data/
   projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/data/desktop.conf
   projects/haf/branches/maemo-af-desktop/hildon-desktop/data/tasknavigator.conf
Removed:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/test/desktop.conf
   projects/haf/branches/maemo-af-desktop/hildon-desktop/test/tasknavigator.conf
Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
Log:
2006-11-22  Lucas Rocha  <lucas.rocha at nokia.com>

	* configure.ac, Makefile.am, data/desktop.conf, data/tasknavigator.conf,
	data/Makefile.am: new data directory with default configuration files
	that are installed on hildon-desktop global conf dir.


Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-22 14:39:15 UTC (rev 8259)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-22 14:39:50 UTC (rev 8260)
@@ -1,3 +1,9 @@
+2006-11-22  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* configure.ac, Makefile.am, data/desktop.conf, data/tasknavigator.conf,
+	data/Makefile.am: new data directory with default configuration files
+	that are installed on hildon-desktop global conf dir.
+
 2006-11-22  Moises Martinez  <moises.martinzes at nokia.com>
 
 	* libhildonwm/hd-*.[ch]: First import of window managemente code.

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/Makefile.am	2006-11-22 14:39:15 UTC (rev 8259)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/Makefile.am	2006-11-22 14:39:50 UTC (rev 8260)
@@ -1,3 +1 @@
-SUBDIRS = libhildondesktop src
-
-
+SUBDIRS = data libhildondesktop src

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2006-11-22 14:39:15 UTC (rev 8259)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2006-11-22 14:39:50 UTC (rev 8260)
@@ -146,4 +146,5 @@
 AC_OUTPUT(Makefile \
 	libhildondesktop/Makefile \
 	libhildondesktop/libhildondesktop.pc \
-    src/Makefile)
+	data/Makefile \
+	src/Makefile)

Added: projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am	2006-11-22 14:39:15 UTC (rev 8259)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am	2006-11-22 14:39:50 UTC (rev 8260)
@@ -0,0 +1 @@
+hildondesktopconf_DATA = desktop.conf tasknavigator.conf

Copied: projects/haf/branches/maemo-af-desktop/hildon-desktop/data/desktop.conf (from rev 8255, projects/haf/branches/maemo-af-desktop/hildon-desktop/test/desktop.conf)

Copied: projects/haf/branches/maemo-af-desktop/hildon-desktop/data/tasknavigator.conf (from rev 8255, projects/haf/branches/maemo-af-desktop/hildon-desktop/test/tasknavigator.conf)

Deleted: projects/haf/branches/maemo-af-desktop/hildon-desktop/test/desktop.conf
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/test/desktop.conf	2006-11-22 14:39:15 UTC (rev 8259)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/test/desktop.conf	2006-11-22 14:39:50 UTC (rev 8260)
@@ -1,8 +0,0 @@
-[Tasknavigator]
-X-Type=panel_box
-X-Position-X=0
-X-Position-Y=0
-X-Size-Width=100
-X-Size-Height=80
-X-Orientation=vertical
-X-Config-File=tasknavigator.conf

Deleted: projects/haf/branches/maemo-af-desktop/hildon-desktop/test/tasknavigator.conf
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/test/tasknavigator.conf	2006-11-22 14:39:15 UTC (rev 8259)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/test/tasknavigator.conf	2006-11-22 14:39:50 UTC (rev 8260)
@@ -1,2 +0,0 @@
-[/usr/share/applications/hildon-navigator/hildon-task-navigator-bookmarks.desktop]
-[/usr/share/applications/hildon-navigator/osso-contact-plugin.desktop]