gnome-pilot r1560 - in trunk: . capplet gpilotd utils

[mcdavey svn gnome org]

Author: mcdavey
Date: Sun Feb  8 22:37:47 2009
New Revision: 1560
URL: http://svn.gnome.org/viewvc/gnome-pilot?rev=1560&view=rev

Log:
2009-02-08  Matt Davey  <mcdavey mrao cam ac uk>
	* capplet/gpilotd-control-applet.desktop.in.in: use stock
		gnome pda icon. #569481. Thanks Andrew Higginson.
	* gpilotd/gnome-pilot-conduit-management.gob: remove obsolete
		SUSE-specific GNOMEPATH. #569193. Thanks Vincent Untz.
	* gpilotd/gnome-pilot-conduit-management.gob: avoid using
		deprecated gnome-i18n in favour or glib-i18n. #570724.
	* utils/gpilotdcm-client.c: ditto.  Thanks Andre Klapper.
	* configure.in, gpilotd/Makefile.am: only gpilotd binary
		needs to be linked with libhal. #568404.  Thanks Mandriva.



Modified:
   trunk/ChangeLog
   trunk/capplet/gpilotd-control-applet.desktop.in.in
   trunk/configure.in
   trunk/gpilotd/Makefile.am
   trunk/gpilotd/gnome-pilot-conduit-management.gob
   trunk/utils/gpilotdcm-client.c

Modified: trunk/capplet/gpilotd-control-applet.desktop.in.in
==============================================================================
--- trunk/capplet/gpilotd-control-applet.desktop.in.in	(original)
+++ trunk/capplet/gpilotd-control-applet.desktop.in.in	Sun Feb  8 22:37:47 2009
@@ -3,7 +3,7 @@
 _Name=PalmOS Devices
 _Comment=Configure PalmOS devices
 Exec=gpilotd-control-applet
-Icon=gnome-palm
+Icon=pda
 Terminal=false
 StartupNotify=true
 Type=Application

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Feb  8 22:37:47 2009
@@ -172,7 +172,7 @@
 ])
 
 GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS $HAL_CFLAGS"
-GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS $HAL_LIBS"
+GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS"
 
 AC_SUBST(GNOME_PILOT_CFLAGS)
 AC_SUBST(GNOME_PILOT_LIBS)

Modified: trunk/gpilotd/Makefile.am
==============================================================================
--- trunk/gpilotd/Makefile.am	(original)
+++ trunk/gpilotd/Makefile.am	Sun Feb  8 22:37:47 2009
@@ -220,6 +220,7 @@
 		./libgpilotdcm.la 	\
 		./libgpilotd.la				\
 		$(GNOME_PILOT_LIBS) 			\
+		$(HAL_LIBS) 				\
 		$(NULL)
 
 gpilotd_session_wrapper_SOURCES = 		\

Modified: trunk/gpilotd/gnome-pilot-conduit-management.gob
==============================================================================
--- trunk/gpilotd/gnome-pilot-conduit-management.gob	(original)
+++ trunk/gpilotd/gnome-pilot-conduit-management.gob	Sun Feb  8 22:37:47 2009
@@ -269,21 +269,17 @@
 	private GList*
 	get_conduit_file_names (gchar *path, gchar *ext) {
 		gchar *gnome_path = NULL;
-		const gchar *susepath, *gnome2path;
+		const gchar *gnome2path;
 		GList *result = NULL;
 		GDir *dir;
 		const char *name;
 		gchar **paths;
 		int idx;
 		
-		susepath = g_getenv ("GNOMEPATH");
 		gnome2path = g_getenv ("GNOME2_PATH");
-		/* Concat SuSE's GNOMEPATH, GNOME2_PATH, and CONDUITDIR
+		/* Concat GNOME2_PATH, and CONDUITDIR
 		   This is so that we can load all conduits in these paths */
 		gnome_path = g_strconcat (CONDUITDIR, ":",
-					  susepath ? susepath : "", 
-					  susepath ? "/share" : "", 
-					  ":",
 					  gnome2path ? gnome2path : "",
 					  gnome2path ? "/share": "",
 					  NULL);
@@ -412,13 +408,13 @@
 		return TRUE;
 	}
 
-	private const char *
+	private const gchar *
 	get_lang (void)
 	{
-		const GList *ll;
+		const gchar * const *ll;
 	
-		ll = gnome_i18n_get_language_list (NULL);
-		return ll->data;
+		ll = g_get_language_names();
+		return ll[0];
 	}
 	
 	/* This loads the correct <name ...> tag, taking the correct i18n */

Modified: trunk/utils/gpilotdcm-client.c
==============================================================================
--- trunk/utils/gpilotdcm-client.c	(original)
+++ trunk/utils/gpilotdcm-client.c	Sun Feb  8 22:37:47 2009
@@ -95,7 +95,7 @@
 	GnomePilotConduitManagement *gpcm;
 	GnomePilotConduitConfig *gpcc;
 	GList *conduits = NULL,*it;
-	const GList *ll;
+	const gchar* const *ll;
 	
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
@@ -107,8 +107,8 @@
 
 	gnome_pilot_conduit_management_get_conduits (&conduits, GNOME_PILOT_CONDUIT_MGMT_ID);
 	
-	ll = gnome_i18n_get_language_list (NULL);
-	g_message ("lang = %s", (char *) ll->data);
+	ll = g_get_language_names();
+	g_message ("lang = %s", (char *) ll[0]);
 
 	/* default to list all conduit attributes,
 	   unless a pilot id is given, then dump status */