gnome-pilot r1556 - in trunk: . capplet gpilotd po utils

[mcdavey svn gnome org]

Author: mcdavey
Date: Thu Jan  8 00:15:28 2009
New Revision: 1556
URL: http://svn.gnome.org/viewvc/gnome-pilot?rev=1556&view=rev

Log:
2009-01-07  Matt Davey <mcdavey mrao cam ac uk>
	* 2.0.17 release
	* Updated NEWS file
	* gpilotd/Makefile.am: remove trailing slashes from libsdir names,
	   to prevent rpath problems (#491921)
	* gpilotd/gpilotd.c: fix string leak (thanks to Bruce Schultz)
	* gpilotd/Makefile.am: reorganise libgpilotdCM stuff so that the include
	   files continue to be provided in prefix/include/libgpilotdCM instead of
	   prefix/include/gpilotd.  This is a partial revert of change 2008-10-07
	* po/POTFILES.skip: ditto
	* capplet/pilot.h: ditto
	* utils/gpilotdcm-client.c: ditto
	* gpilotd/gpilotd.c: ditto
	* gpilotd/manager.c: ditto
	* gpilotd/gnome-pilot-conduit-config.gob: ditto



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/capplet/pilot.h
   trunk/gpilotd/Makefile.am
   trunk/gpilotd/gnome-pilot-conduit-config.gob
   trunk/gpilotd/gpilotd.c
   trunk/gpilotd/manager.c
   trunk/po/POTFILES.skip
   trunk/utils/gpilotdcm-client.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Jan  8 00:15:28 2009
@@ -1,3 +1,29 @@
+gnome-pilot 2.0.17 'Pippi', 2009-01-07
+--------------------------------------
+Bug Fixes:
+   - #484509: Avoid obsolete HAL info.bus API.  Use hal pda.platform
+		property instead (keep info.bus for backwards compatibility).
+		With thanks to Frederic Crozat.
+   - #528701: remove unused applet desktop file
+   - #508262: fix long-standing build-order bug by moving libgpilotdcm
+		code to gpilotd/ directory.
+   - #491921: stray slash breaks rpath for libraries
+
+Updated translations:
+     ar (Djihed Afifi)
+     ca (Gil Forcada)
+     el (Simos Xenitellis)
+     en_GB (Philip Withnall)
+     fr (Stephane Raimbault)
+     it (Luca Ferretti)
+     fi (Ilkka Tuohela)
+     nb (Kjartan Maraas)
+     ne (Pawan Chitrakar)
+     oc (Yannig Marchegay)
+     pt_BR (Jonh Wendell)
+     sv (Daniel Nylander)
+     vi (Clytie Siddall)
+
 gnome-pilot 2.0.16 'Quixote', 2008-02-27
 ----------------------------------------
 New Features:

Modified: trunk/capplet/pilot.h
==============================================================================
--- trunk/capplet/pilot.h	(original)
+++ trunk/capplet/pilot.h	Thu Jan  8 00:15:28 2009
@@ -27,8 +27,8 @@
 
 #include <gpilotd/gnome-pilot-structures.h>
 #include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-management.h>
-#include <gpilotd/gnome-pilot-conduit-config.h>
+#include <libgpilotdCM/gnome-pilot-conduit-management.h>
+#include <libgpilotdCM/gnome-pilot-conduit-config.h>
 
 typedef struct _ConduitState ConduitState;
 struct _ConduitState {

Modified: trunk/gpilotd/Makefile.am
==============================================================================
--- trunk/gpilotd/Makefile.am	(original)
+++ trunk/gpilotd/Makefile.am	Thu Jan  8 00:15:28 2009
@@ -25,14 +25,14 @@
 	&& cp xgen-gmc $(@F) \
 	&& rm -f xgen-gmc
 
-gpilotdlibsdir=$(libdir)/
+gpilotdlibsdir=$(libdir)
 
 gpilotdlibs_LTLIBRARIES = 		\
 	libgpilotd.la 			\
 	libgpilotdconduit.la 		\
 	$(NULL)
 
-gpilotdcmlibsdir=$(libdir)/
+gpilotdcmlibsdir=$(libdir)
 
 gpilotdcmlibs_LTLIBRARIES =		\
 	libgpilotdcm.la
@@ -40,12 +40,12 @@
 ## GOB STUFF 
 
 GOB_LIBGPILOTDCM_BUILT_SRCS = 					\
-	gnome-pilot-conduit-management.c 		\
-	gnome-pilot-conduit-management-private.h 	\
-	gnome-pilot-conduit-management.h 		\
-	gnome-pilot-conduit-config.c			\
-	gnome-pilot-conduit-config-private.h 		\
-	gnome-pilot-conduit-config.h
+	../libgpilotdCM/gnome-pilot-conduit-management.c 		\
+	../libgpilotdCM/gnome-pilot-conduit-management-private.h 	\
+	../libgpilotdCM/gnome-pilot-conduit-management.h 		\
+	../libgpilotdCM/gnome-pilot-conduit-config.c			\
+	../libgpilotdCM/gnome-pilot-conduit-config-private.h 		\
+	../libgpilotdCM/gnome-pilot-conduit-config.h
 
 GOB_LIBGPILOTD_BUILT_SRCS = 			\
 	gnome-pilot-client.c 			\
@@ -84,6 +84,13 @@
 	$(srcdir)/gnome-pilot-conduit-standard.gob	\
 	$(NULL)
 
+# ugly: gnome-pilot-conduit-config.gob and gnome-pilot-conduit-management.gob
+# used to live in libgpilotdCM/, which led to a build-order bug as they're
+# dependendent on some gpilotd/ stuff.  However, third party code expects
+# the headers to be in include/libgpilotdCM so we continue to provide them there.
+../libgpilotdCM/%.c ../libgpilotdCM/%.h: %.gob
+	$(GOB) --always-private-header -o  ../libgpilotdCM -w $<
+
 %.c %.h: %.gob
 	$(GOB) --always-private-header -w $<
 
@@ -121,11 +128,11 @@
 libgpilotdcm_la_SOURCES = \
 	$(GOB_LIBGPILOTDCM_BUILT_SRCS)
 
-libgpilotdcmincludedir = $(includedir)/gpilotd
+libgpilotdcmincludedir = $(includedir)/libgpilotdCM
 
 libgpilotdcminclude_HEADERS = \
-	gnome-pilot-conduit-management.h 	\
-	gnome-pilot-conduit-config.h
+	../libgpilotdCM/gnome-pilot-conduit-management.h 	\
+	../libgpilotdCM/gnome-pilot-conduit-config.h
 
 libgpilotdcm_la_LIBADD =		\
 	$(GNOME_PILOT_LIBS)		\

Modified: trunk/gpilotd/gnome-pilot-conduit-config.gob
==============================================================================
--- trunk/gpilotd/gnome-pilot-conduit-config.gob	(original)
+++ trunk/gpilotd/gnome-pilot-conduit-config.gob	Thu Jan  8 00:15:28 2009
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <gtk/gtkobject.h>
 #include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-management.h>
+#include <libgpilotdCM/gnome-pilot-conduit-management.h>
 #include <gmodule.h>
 %}
 

Modified: trunk/gpilotd/gpilotd.c
==============================================================================
--- trunk/gpilotd/gpilotd.c	(original)
+++ trunk/gpilotd/gpilotd.c	Thu Jan  8 00:15:28 2009
@@ -74,7 +74,7 @@
 #include "gpilot-gui.h"
 #include "gnome-pilot-conduit-backup.h"
 
-#include "gnome-pilot-conduit-management.h"
+#include "../libgpilotdCM/gnome-pilot-conduit-management.h"
 
 static GPilotContext *context = NULL;
 
@@ -1100,11 +1100,13 @@
 		libhal_free_string (platform);
 		return;
 	    }
+	    libhal_free_string (platform);
 	} else if (bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)) {
 	    if (strcmp (bus, "usb_device") != 0) {
 		libhal_free_string (bus);
 		return;
 	    }
+	    libhal_free_string (bus);
 	} else {
 	    return;
 	}

Modified: trunk/gpilotd/manager.c
==============================================================================
--- trunk/gpilotd/manager.c	(original)
+++ trunk/gpilotd/manager.c	Thu Jan  8 00:15:28 2009
@@ -45,8 +45,8 @@
 #include "gnome-pilot-dbinfo.h"
 #include "gpilot-gui.h"
 
-#include "gnome-pilot-conduit-management.h"
-#include "gnome-pilot-conduit-config.h"
+#include "../libgpilotdCM/gnome-pilot-conduit-management.h"
+#include "../libgpilotdCM/gnome-pilot-conduit-config.h"
 
 #define GPCM_LABEL "conduit_mgmt"
 #define GPCC_LABEL "conduit_cfg"

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Thu Jan  8 00:15:28 2009
@@ -2,4 +2,4 @@
 gpilot-fileman/multifile.c
 gpilot-fileman/pilotfunc.c
 gpilot-fileman/preferences.c
-gpilotd/gnome-pilot-conduit-management.c
+libgpilotdCM/gnome-pilot-conduit-management.c

Modified: trunk/utils/gpilotdcm-client.c
==============================================================================
--- trunk/utils/gpilotdcm-client.c	(original)
+++ trunk/utils/gpilotdcm-client.c	Thu Jan  8 00:15:28 2009
@@ -8,8 +8,8 @@
 #include <gnome.h>
 #include <bonobo-activation/bonobo-activation.h>
 
-#include <gpilotd/gnome-pilot-conduit-management.h>
-#include <gpilotd/gnome-pilot-conduit-config.h>
+#include <libgpilotdCM/gnome-pilot-conduit-management.h>
+#include <libgpilotdCM/gnome-pilot-conduit-config.h>
 
 int     arg_listconduits,
 	arg_listconduitsstate,