gnome-pilot r1548 - in trunk: . applet capplet conduits/backup conduits/file conduits/test gpilotd po utils

[mcdavey svn gnome org]

Author: mcdavey
Date: Thu Jun 26 08:18:42 2008
New Revision: 1548
URL: http://svn.gnome.org/viewvc/gnome-pilot?rev=1548&view=rev

Log:
2008-06-26  Matt Davey  <mcdavey mrao cam ac uk>
	* gpilotd.c: Add support for hal pda.platform property, and
		keep info.bus for backwards compatibility.  With
		thanks to Frederic Crozat. Fixes #484509
	* capplet/Makefile.am: Add gpilotd/ to INCLUDES, to support VPATH builds
	* conduits/backup/Makefile.am: ditto
	* conduits/file/Makefile.am: ditto
	* conduits/test/Makefile.am: ditto
	* utils/Makefile.am: ditto
	* applet/Makefile.am: remove unused applet desktop file (fixes #528701)
	* applet/.cvsignore: ditto
	* po/POTFILES.in: ditto
	* applet/gpilot-applet.desktop.in: removed.
	* po/POTFILES.skip: added libgpilotdCM/gnome-pilot-conduit-management.c,
		to fix distcheck target.  intltool checks seem to have
		become more strict...



Removed:
   trunk/applet/gpilot-applet.desktop.in
Modified:
   trunk/ChangeLog
   trunk/applet/.cvsignore
   trunk/applet/Makefile.am
   trunk/capplet/Makefile.am
   trunk/conduits/backup/Makefile.am
   trunk/conduits/file/Makefile.am
   trunk/conduits/test/Makefile.am
   trunk/gpilotd/gpilotd.c
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip
   trunk/utils/Makefile.am

Modified: trunk/applet/.cvsignore
==============================================================================
--- trunk/applet/.cvsignore	(original)
+++ trunk/applet/.cvsignore	Thu Jun 26 08:18:42 2008
@@ -10,4 +10,3 @@
 GNOME_PilotApplet.server
 GNOME_PilotApplet.server.in
 pilot.schemas
-gpilot-applet.desktop

Modified: trunk/applet/Makefile.am
==============================================================================
--- trunk/applet/Makefile.am	(original)
+++ trunk/applet/Makefile.am	Thu Jun 26 08:18:42 2008
@@ -48,11 +48,6 @@
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = sync_paused.png sync_broken.png sync_icon.png syncing_icon.png
 
-desktopdir = $(datadir)/applications
-desktop_in_files = gpilot-applet.desktop.in
-desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
 serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_PilotApplet.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)
@@ -76,11 +71,10 @@
 	$(pixmap_DATA) 			\
 	$(glade_DATA) 			\
 	$(gobfiles)			\
-	$(desktop_in_files)		\
 	$(server_in_files)		\
 	$(schemas_in_files)		\
 	$(NULL)
 
-BUILT_SOURCES = $(GOB_BUILT_SRCS) $(schemas_DATA) $(server_DATA) $(desktop_DATA)
+BUILT_SOURCES = $(GOB_BUILT_SRCS) $(schemas_DATA) $(server_DATA)
 
-CLEANFILES = $(schemas_DATA) $(server_DATA) $(desktop_DATA)
+CLEANFILES = $(schemas_DATA) $(server_DATA)

Modified: trunk/capplet/Makefile.am
==============================================================================
--- trunk/capplet/Makefile.am	(original)
+++ trunk/capplet/Makefile.am	Thu Jun 26 08:18:42 2008
@@ -4,6 +4,7 @@
 
 INCLUDES = 						\
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/gpilotd				\
 	$(GNOME_PILOT_CFLAGS) 				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
 	-DGLADEDATADIR=\""$(gladedir)"\" 		\

Modified: trunk/conduits/backup/Makefile.am
==============================================================================
--- trunk/conduits/backup/Makefile.am	(original)
+++ trunk/conduits/backup/Makefile.am	Thu Jun 26 08:18:42 2008
@@ -1,5 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/ 			\
+	-I$(top_srcdir)/gpilotd			\
 	$(GNOME_PILOT_CFLAGS) 			\
 	-DG_LOG_DOMAIN=\"backupconduit\"
 

Modified: trunk/conduits/file/Makefile.am
==============================================================================
--- trunk/conduits/file/Makefile.am	(original)
+++ trunk/conduits/file/Makefile.am	Thu Jun 26 08:18:42 2008
@@ -1,5 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)	 			\
+	-I$(top_srcdir)/gpilotd			\
 	$(GNOME_PILOT_CFLAGS) 			\
 	-DG_LOG_DOMAIN=\"fileconduit\" 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"

Modified: trunk/conduits/test/Makefile.am
==============================================================================
--- trunk/conduits/test/Makefile.am	(original)
+++ trunk/conduits/test/Makefile.am	Thu Jun 26 08:18:42 2008
@@ -1,5 +1,6 @@
 INCLUDES = 			\
 	-I$(top_srcdir)		\
+	-I$(top_srcdir)/gpilotd	\
 	$(GNOME_PILOT_CFLAGS)
 
 test_conduitsdir=$(libdir)/gnome-pilot/conduits

Modified: trunk/gpilotd/gpilotd.c
==============================================================================
--- trunk/gpilotd/gpilotd.c	(original)
+++ trunk/gpilotd/gpilotd.c	Thu Jun 26 08:18:42 2008
@@ -1079,7 +1079,7 @@
 hal_device_added (LibHalContext *ctx, const char *udi)
 {
 	gboolean visor_net = FALSE;
-	char *bus, *match_str;
+	char *bus, *platform, *match_str;
 	int vendor_id, product_id, i;
 	GPilotDevice *device;
 	DBusError error;
@@ -1090,15 +1090,23 @@
 
 	load_devices_xml ();
 
-	/* HAL match rule: we look for info.bus == 'usb_device'
+	/* HAL match rule: we look for pda.platform == 'palm'
+	 * (or the legacy info.bus == 'usb_device')
 	 * and then try to match the usb_device.product_id and usb_device.vendor_id
 	 * against the list in devices.xml.
 	 */
-	if (!(bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)))
+	if (platform = libhal_device_get_property_string (hal_ctx, udi, "pda.platform", NULL)) {
+	    if (strcmp (platform, "palm") != 0) {
+		libhal_free_string (platform);
 		return;
-	if (strcmp (bus, "usb_device") != 0) {
+	    }
+	} 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;
+	    }
+	} else {
+	    return;
 	}
 
 	dbus_error_init (&error);

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Jun 26 08:18:42 2008
@@ -43,5 +43,3 @@
 libgpilotdCM/gnome-pilot-conduit-management.gob
 utils/gpilotd-client.c
 utils/gpilotdcm-client.c
-# files added by intltool-prepare
-applet/gpilot-applet.desktop.in

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Thu Jun 26 08:18:42 2008
@@ -2,3 +2,4 @@
 gpilot-fileman/multifile.c
 gpilot-fileman/pilotfunc.c
 gpilot-fileman/preferences.c
+libgpilotdCM/gnome-pilot-conduit-management.c

Modified: trunk/utils/Makefile.am
==============================================================================
--- trunk/utils/Makefile.am	(original)
+++ trunk/utils/Makefile.am	Thu Jun 26 08:18:42 2008
@@ -1,5 +1,6 @@
 INCLUDES = 								\
 	-I$(top_srcdir)							\
+	-I$(top_srcdir)/gpilotd						\
 	$(GNOME_PILOT_CFLAGS) 						\
         -DG_LOG_DOMAIN=\"gpilotd-client\" 				\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"