[maemo-commits] [maemo-commits] r10306 - in projects/haf/trunk/hildon-desktop: . libhildondesktop libhildonwm

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-03-02 11:44:06 +0200 (Fri, 02 Mar 2007)
New Revision: 10306

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
   projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am
Log:
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.
	* configure.ac: made osso-af-settings checks optional.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-02 09:00:47 UTC (rev 10305)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-02 09:44:06 UTC (rev 10306)
@@ -1,3 +1,10 @@
+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.
+	* configure.ac: made osso-af-settings checks optional.
+
 2007-03-01  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-home-area.c:

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-03-02 09:00:47 UTC (rev 10305)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-03-02 09:44:06 UTC (rev 10306)
@@ -68,8 +68,10 @@
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE(GETTEXT_PACKAGE, ["maemo-af-desktop"], [Package name for gettext])
 
-PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1)
-localedir=`pkg-config osso-af-settings --variable=localedir`
+PKG_CHECK_MODULES(OSSOSETTINGS, 
+		  [osso-af-settings >= 0.8.1],
+                  localedir=`pkg-config osso-af-settings --variable=localedir`, 
+		  localedir="${datadir}/locale")
 AC_SUBST(localedir)
 
 #+++++++++++++++++++++
@@ -80,7 +82,6 @@
 PKG_CHECK_MODULES(HILDON_FM,
                   [hildon-fm-2],
                   [AC_DEFINE(HAVE_HILDON_FM2, [], [Whether hildon-fm is present on the system])],
-                  
                   [PKG_CHECK_MODULES(HILDON_FM,
 		                    [hildon-fm >= 0.15],
                                     [AC_DEFINE(HAVE_HILDON_FM, [], [Whether hildon-fm is present on the system])], 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am	2007-03-02 09:00:47 UTC (rev 10305)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am	2007-03-02 09:44:06 UTC (rev 10306)
@@ -37,6 +37,7 @@
 	$(GNOME_VFS_CFLAGS)          \
 	$(OSSO_CFLAGS)               \
 	$(LIBXML_CFLAGS)             \
+	$(DBUS_GLIB_CFLAGS)          \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DHILDON_HOME_DESKTOP_ENTRY_DIR=\"$(hildonhomedesktopentrydir)\" \
 	-I$(top_srcdir)/libhildonwm
@@ -115,6 +116,7 @@
 	$(HILDON_LIBS)                            \
 	$(HILDONBASELIB_LIBS)                     \
 	$(GNOME_VFS_LIBS)                         \
+	$(DBUS_GLIB_LIBS)                         \
 	$(top_srcdir)/libhildonwm/libhildonwm.la
 
 CLEANFILES = *~

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-03-02 09:00:47 UTC (rev 10305)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-03-02 09:44:06 UTC (rev 10306)
@@ -741,7 +741,7 @@
   GKeyFile *keyfile;
   GError *local_error = NULL;
   gchar **groups = NULL;
-  gint n_groups;
+  guint n_groups;
   GList *applets = NULL;
 
   g_return_if_fail (area);

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am	2007-03-02 09:00:47 UTC (rev 10305)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am	2007-03-02 09:44:06 UTC (rev 10306)
@@ -23,7 +23,7 @@
 	$(LIBXML_CFLAGS) \
 	$(XLIBS_CFLAGS) \
 	$(XTEST_CFLAGS) \
-	$(DBUS_CFLAGS) \
+	$(DBUS_GLIB_CFLAGS) \
 	$(GNOME_VFS_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDESKTOPENTRYDIR=\"$(hildondesktopentrydir)\"
@@ -58,6 +58,6 @@
 	$(XLIBS_LIBS)       \
 	$(XTEST_LIBS)       \
 	$(GNOME_VFS_LIBS)   \
-	$(DBUS_LIBS)
+	$(DBUS_GLIB_LIBS)
 
 CLEANFILES = *~