libmbca r5 - in trunk: . src

[kaijanma svn gnome org]

Author: kaijanma
Date: Sat Jul 26 07:44:39 2008
New Revision: 5
URL: http://svn.gnome.org/viewvc/libmbca?rev=5&view=rev

Log:
use  mobile-broadband-provider-info.pc

Modified:
   trunk/configure.ac
   trunk/src/common.h
   trunk/src/provider_thread.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jul 26 07:44:39 2008
@@ -22,7 +22,14 @@
 
 AC_PROG_LIBTOOL
 
-PKG_CHECK_MODULES(LIBMBCA, [glib-2.0 >= 2.16, libxml-2.0 >= 2.6, gweather, gio-2.0, hal, gthread-2.0, dbus-glib-1])
+PKG_CHECK_MODULES(LIBMBCA, [glib-2.0 >= 2.16,
+			    libxml-2.0 >= 2.6,
+			    gweather,
+			    gio-2.0,
+			    hal,
+			    gthread-2.0,
+			    dbus-glib-1,
+			    mobile-broadband-provider-info])
 AC_SUBST(LIBMBCA_CFLAGS)
 AC_SUBST(LIBMBCA_LIBS)
 

Modified: trunk/src/common.h
==============================================================================
--- trunk/src/common.h	(original)
+++ trunk/src/common.h	Sat Jul 26 07:44:39 2008
@@ -50,9 +50,6 @@
 #define RESOURCE_DIR PACKAGE_DATA_DIR "/" PACKAGE
 #define MBCA_UI_DEFINITION RESOURCE_DIR "/mbca.ui"
 
-/** @todo make me a configure option */
-#define SERVICE_PROVIDERS_FILE "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"
-
 G_BEGIN_DECLS
 
 /**

Modified: trunk/src/provider_thread.c
==============================================================================
--- trunk/src/provider_thread.c	(original)
+++ trunk/src/provider_thread.c	Sat Jul 26 07:44:39 2008
@@ -424,7 +424,8 @@
 		return NULL;
 	}
 	
-	ret = parse_service_provider_xml (SERVICE_PROVIDERS_FILE, &(priv->database));
+	ret = parse_service_provider_xml (MOBILE_BROADBAND_PROVIDER_INFO,
+							    &(priv->database));
 	if (priv->abort_provider_thread)
 	{
 		return NULL;