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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-01-23 13:37:17 +0200 (Tue, 23 Jan 2007)
New Revision: 9248

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/src/hd-home-background-dialog.c
Log:
2007-01-23  Lucas Rocha  <lucas.rocha at nokia.com>

	* configure.ac, src/hd-home-background-dialog.c: make hildon-fm an
	optional dependency. If it's not present, use standard
	GtkFileChooserDialog instead.


Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-23 11:16:47 UTC (rev 9247)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-23 11:37:17 UTC (rev 9248)
@@ -1,3 +1,9 @@
+2007-01-23  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* configure.ac, src/hd-home-background-dialog.c: make hildon-fm an
+	optional dependency. If it's not present, use standard
+	GtkFileChooserDialog instead.
+
 2007-01-22  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-home-background.c:

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-01-23 11:16:47 UTC (rev 9247)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-01-23 11:37:17 UTC (rev 9248)
@@ -75,22 +75,13 @@
 # Dependencies checks
 #+++++++++++++++++++++
 
-PKG_CHECK_MODULES(ESD, esound)
-AC_SUBST(ESD_LIBS)
-AC_SUBST(ESD_CFLAGS)
-
-PKG_CHECK_MODULES(XTEST, xtst)
-AC_SUBST(XTEST_LIBS)
-AC_SUBST(XTEST_CFLAGS)
-
-PKG_CHECK_MODULES(HILDON_FM,hildon-fm >= 0.15)
+PKG_CHECK_MODULES(HILDON_FM,
+		  [hildon-fm >= 0.15],
+                  AC_DEFINE(HAVE_HILDON_FM, [], [Whether hildon-fm is present on the system]), 
+		  [AC_MSG_NOTICE([hildon-fm not present.])])
 AC_SUBST(HILDON_FM_LIBS)
 AC_SUBST(HILDON_FM_CFLAGS)
 
-PKG_CHECK_MODULES(LIBXML, libxml-2.0)
-AC_SUBST(LIBXML_LIBS)
-AC_SUBST(LIBXML_CFLAGS)
-
 PKG_CHECK_MODULES(OSSO, 
 		  [libosso >= 0.9.19],
                   AC_DEFINE(HAVE_LIBOSSO, [], [Whether libosso is present on the system]), 
@@ -98,9 +89,12 @@
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)
 
-PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
-AC_SUBST(DBUS_GLIB_LIBS)
-AC_SUBST(DBUS_GLIB_CFLAGS)
+PKG_CHECK_MODULES(OSSO_HELP, 
+		  [libossohelp],
+                  AC_DEFINE(HAVE_LIBOSSOHELP, [], [Whether libossohelp is present on the system]), 
+		  [AC_MSG_NOTICE([libossohelp not present.])])
+AC_SUBST(OSSO_HELP_CFLAGS)
+AC_SUBST(OSSO_HELP_LIBS)
 
 PKG_CHECK_MODULES(HILDONBASELIB, hildon-base-lib >= 0.7.4)
 AC_SUBST(HILDONBASELIB_LIBS)
@@ -110,31 +104,40 @@
 AC_SUBST(HILDON_LIBS)
 AC_SUBST(HILDON_CFLAGS)
 
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+
+PKG_CHECK_MODULES(GDK, gdk-2.0 >= 1.3.12)
+AC_SUBST(GDK_LIBS)
+
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
+AC_SUBST(DBUS_GLIB_LIBS)
+AC_SUBST(DBUS_GLIB_CFLAGS)
+
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.2)
 AC_SUBST(GCONF_LIBS)
 AC_SUBST(GCONF_CFLAGS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
-
 PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.8.3)
 AC_SUBST(GNOME_VFS_CFLAGS)
 AC_SUBST(GNOME_VFS_LIBS)
 
-PKG_CHECK_MODULES(GDK, gdk-2.0 >= 1.3.12)
-AC_SUBST(GDK_LIBS)
+PKG_CHECK_MODULES(LIBXML, libxml-2.0)
+AC_SUBST(LIBXML_LIBS)
+AC_SUBST(LIBXML_CFLAGS)
 
+PKG_CHECK_MODULES(ESD, esound)
+AC_SUBST(ESD_LIBS)
+AC_SUBST(ESD_CFLAGS)
+
 PKG_CHECK_MODULES(XLIBS, x11)
 AC_SUBST(XLIBS_CFLAGS)
 AC_SUBST(XLIBS_ERROR_LIBS)
 
-PKG_CHECK_MODULES(OSSO_HELP, 
-		  [libossohelp],
-                  AC_DEFINE(HAVE_LIBOSSOHELP, [], [Whether libossohelp is present on the system]), 
-		  [AC_MSG_NOTICE([libossohelp not present.])])
-AC_SUBST(OSSO_HELP_CFLAGS)
-AC_SUBST(OSSO_HELP_LIBS)
+PKG_CHECK_MODULES(XTEST, xtst)
+AC_SUBST(XTEST_LIBS)
+AC_SUBST(XTEST_CFLAGS)
 
 #+++++++++++++++++++
 # Directories setup

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-01-23 11:16:47 UTC (rev 9247)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c	2007-01-23 11:37:17 UTC (rev 9248)
@@ -34,7 +34,10 @@
 #include <libosso.h>
 #endif
 
+#ifdef HAVE_HILDON_FM
 #include <hildon-widgets/hildon-file-chooser-dialog.h>
+#endif
+
 #include <hildon-widgets/hildon-color-button.h>
 #include <hildon-widgets/hildon-caption.h>
 
@@ -43,6 +46,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
+#include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkliststore.h>
@@ -232,7 +236,6 @@
 
 
   g_type_class_add_private (klass, sizeof (HDHomeBackgroundDialogPrivate));
-
 }
 
 static void
@@ -373,6 +376,7 @@
 
     case PROP_OSSO_CONTEXT:
         priv->osso_context = g_value_get_pointer (value);
+
 #ifdef HAVE_LIBOSSOHELP
         /* Add help button */
         if (priv->osso_context)
@@ -458,8 +462,9 @@
   gchar                            *image_dir;
 
   priv = HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE (dialog);
-  
-  fdialog = hildon_file_chooser_dialog_new_with_properties(
+
+#ifdef HAVE_HILDON_FM  
+  fdialog = hildon_file_chooser_dialog_new_with_properties (
 					  GTK_WINDOW (dialog),
 					  HILDON_HOME_FILE_CHOOSER_ACTION_PROP,
 					  GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -470,7 +475,15 @@
 					  HILDON_HOME_FILE_CHOOSER_EMPTY_PROP,
 					  HILDON_HOME_FILE_CHOOSER_EMPTY,
 					  NULL);
-
+#else
+  fdialog = gtk_file_chooser_dialog_new (HILDON_HOME_FILE_CHOOSER_TITLE,
+					 GTK_WINDOW (dialog),
+					 GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         HILDON_HOME_FILE_CHOOSER_SELECT, GTK_RESPONSE_OK, 
+                                         HILDON_HOME_FILE_CHOOSER_EMPTY, GTK_RESPONSE_CANCEL, 
+					 NULL);
+#endif
+  
 #ifdef HAVE_LIBOSSOHELP
   if (priv->osso_context)
     ossohelp_dialog_help_enable (GTK_DIALOG(fdialog),