[maemo-commits] [maemo-commits] r10046 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop libhildonwm src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-20 15:43:54 +0200 (Tue, 20 Feb 2007)
New Revision: 10046

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.pc.in
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/libhildonwm.pc.in
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in
Log:

2007-02-20  Johan Bilien  <johan.bilien at nokia.com>

	* src/hildon-desktop.pc.in,
	  libhildondesktop/libhildondesktop.pc.in,
	  libhildonwm/libhildonwm.pc.in: require libhildon-1 rather
	  than hildon-libs
	* configure.ac, src/hd-home-background-dialog.c: Include
	  hildon/ instead of hildon-widgets/ when compiled
	  against libhildonfm-2



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-20 13:43:08 UTC (rev 10045)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-20 13:43:54 UTC (rev 10046)
@@ -1,5 +1,15 @@
-2007-02-15  Johan Bilien  <johan.bilien at nokia.com>
+2007-02-20  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hildon-desktop.pc.in,
+	  libhildondesktop/libhildondesktop.pc.in,
+	  libhildonwm/libhildonwm.pc.in: require libhildon-1 rather
+	  than hildon-libs
+	* configure.ac, src/hd-home-background-dialog.c: Include
+	  hildon/ instead of hildon-widgets/ when compiled
+	  against libhildonfm-2
+
+2007-02-20  Johan Bilien  <johan.bilien at nokia.com>
+
 	* configure.ac: Added check for libhildonfm2
 
 2007-02-19  Moises Martinez  <moises.martinez at nokia.com>

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-02-20 13:43:08 UTC (rev 10045)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-02-20 13:43:54 UTC (rev 10046)
@@ -78,7 +78,7 @@
 
 PKG_CHECK_MODULES(HILDON_FM,
                   [hildon-fm-2],
-                  [AC_DEFINE(HAVE_HILDON_FM, [], [Whether hildon-fm is present on the system])],
+                  [AC_DEFINE(HAVE_HILDON_FM2, [], [Whether hildon-fm is present on the system])],
                   
                   [PKG_CHECK_MODULES(HILDON_FM,
 		                    [hildon-fm >= 0.15],

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.pc.in
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.pc.in	2007-02-20 13:43:08 UTC (rev 10045)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.pc.in	2007-02-20 13:43:54 UTC (rev 10046)
@@ -6,7 +6,7 @@
 
 Name: libhildondesktop
 Description: Hildon Lib Desktop
-Requires: hildon-libs >= 0.7.1 libxml-2.0
+Requires: hildon-1 libxml-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lhildondesktop
 Cflags: -I${includedir}

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/libhildonwm.pc.in
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/libhildonwm.pc.in	2007-02-20 13:43:08 UTC (rev 10045)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/libhildonwm.pc.in	2007-02-20 13:43:54 UTC (rev 10046)
@@ -6,7 +6,7 @@
 
 Name: libhildonwm
 Description: Hildon WM Lib 
-Requires: hildon-libs >= 0.7.1 libxml-2.0 x11 xtst libosso
+Requires: libhildon-1 libxml-2.0 x11 xtst libosso
 Version: @VERSION@
 Libs: -L${libdir} -lhildonwm -lX11 -lXtst -losso
 Cflags: -I${includedir}

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c	2007-02-20 13:43:08 UTC (rev 10045)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c	2007-02-20 13:43:54 UTC (rev 10046)
@@ -34,8 +34,12 @@
 #include <libosso.h>
 #endif
 
-#ifdef HAVE_HILDON_FM
+#ifdef HAVE_HILDON_FM2
+#include <hildon/hildon-file-chooser-dialog.h>
+#elif defined HAVE_HILDON_FM
 #include <hildon-widgets/hildon-file-chooser-dialog.h>
+#else
+#include <gtk/gtkfilechooserdialog.h>
 #endif
 
 #ifdef HAVE_LIBHILDON
@@ -51,7 +55,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkliststore.h>
@@ -462,7 +465,7 @@
 
   priv = HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE (dialog);
 
-#ifdef HAVE_HILDON_FM  
+#if defined HAVE_HILDON_FM  || defined HAVE_HILDON_FM2
   fdialog = hildon_file_chooser_dialog_new_with_properties (
 					  GTK_WINDOW (dialog),
 					  HILDON_HOME_FILE_CHOOSER_ACTION_PROP,

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in	2007-02-20 13:43:08 UTC (rev 10045)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in	2007-02-20 13:43:54 UTC (rev 10046)
@@ -7,6 +7,6 @@
 
 Name: hildon-desktop
 Description: Hildon Desktop Headers
-Requires: hildon-libs >= 0.7.1 libhildonwm libhildondesktop
+Requires: libhildonwm libhildondesktop
 Version: @VERSION@
 Cflags: -I${includedir}