gnome-panel r10760 - in trunk: . applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Sun Jan 27 23:20:12 2008
New Revision: 10760
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10760&view=rev

Log:
2008-01-28  Vincent Untz  <vuntz gnome org>

	* configure.in: look for Locations.xml through pkg-config.
	Fix bug #509888.
	Patch by Patryk Zawadzki <patrys pld-linux org>

2008-01-28  Vincent Untz  <vuntz gnome org>

	* Makefile.am: define where Locations.xml is (via pkg-config)
	* gweather-xml.c: (gweather_xml_load_locations): updated for the
	change
	Fix bug #509888.
	Patch by Patryk Zawadzki <patrys pld-linux org>


Modified:
   trunk/ChangeLog
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/Makefile.am
   trunk/applets/clock/gweather-xml.c
   trunk/configure.in

Modified: trunk/applets/clock/Makefile.am
==============================================================================
--- trunk/applets/clock/Makefile.am	(original)
+++ trunk/applets/clock/Makefile.am	Sun Jan 27 23:20:12 2008
@@ -20,6 +20,7 @@
 	-DCLOCK_TIME_UTILITY="\"$(CLOCK_TIME_UTILITY)\""	\
 	-DEVOLUTION_TEXTDOMAIN=\"evolution-2.12\"		\
 	-DSYSTEM_ZONEINFODIR=\"/usr/share/zoneinfo\"		\
+	-DGWEATHER_XML_LOCATION=\"$(LIBGWEATHER_LOCATIONS)\"	\
 	-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
 if HAVE_LIBECAL

Modified: trunk/applets/clock/gweather-xml.c
==============================================================================
--- trunk/applets/clock/gweather-xml.c	(original)
+++ trunk/applets/clock/gweather-xml.c	Sun Jan 27 23:20:12 2008
@@ -357,7 +357,7 @@
 
   /* Open the xml file containing the different locations */
 #ifdef GWEATHER_XML_LOCATION
-  xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml");
+  xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION);
 #else
   xml = xmlNewTextReaderFilename ("/usr/share/gnome-applets/gweather/Locations.xml");
 #endif

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 27 23:20:12 2008
@@ -115,6 +115,9 @@
 AC_SUBST(CLOCK_CFLAGS)
 AC_SUBST(CLOCK_LIBS)
 
+LIBGWEATHER_LOCATIONS=`pkg-config --variable=locations_file gweather`
+AC_SUBST(LIBGWEATHER_LOCATIONS)
+
 dnl Hmm, we already checked for these above.  Is there a way to avoid checking twice?
 PKG_CHECK_MODULES(CLOCK_MECHANISM, [ gthread-2.0 dbus-glib-1 ])
 AC_SUBST(CLOCK_MECHANISM_CFLAGS)