commit gnome-pilot

19 May 2006

Hello community,

here is the log from the commit of package gnome-pilot
checked in at Fri May 19 16:43:44 CEST 2006.

--------

--- GNOME/gnome-pilot/gnome-pilot.changes	2006-03-30 11:09:26.000000000 +0200
+++ gnome-pilot/gnome-pilot.changes	2006-05-19 02:43:36.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May 19 02:42:19 CEST 2006 - jpr@suse.de
+
+- Fix syncing with hal for non-visor devices by selecting the right
+protocol and letting the usb/serial devices settle (#165455)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-pilot.spec ++++++
--- /var/tmp/diff_new_pack.lFEBUC/_old	2006-05-19 16:43:27.000000000 +0200
+++ /var/tmp/diff_new_pack.lFEBUC/_new	2006-05-19 16:43:27.000000000 +0200
@@ -23,7 +23,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=302727
 Conflicts:      gnome-pilot-32bit
 Version:        2.0.13
-Release:        35
+Release:        43
 Summary:        GNOME PalmPilot Programs
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
 Patch:          gnome-pilot-no-susepath.patch
@@ -166,6 +166,9 @@
 %{prefix}/%_lib/pkgconfig/*.pc
 
 %changelog -n gnome-pilot
+* Fri May 19 2006 - jpr@suse.de
+- Fix syncing with hal for non-visor devices by selecting the right
+  protocol and letting the usb/serial devices settle (#165455)
 * Thu Mar 30 2006 - dgollub@suse.de
 - fixed build problem which appeared on downgrade to pilot-link 0.11.8
   (#161722) (-build-fix.patch)

++++++ gnome-pilot-hal.patch ++++++
--- /var/tmp/diff_new_pack.lFEBUC/_old	2006-05-19 16:43:27.000000000 +0200
+++ /var/tmp/diff_new_pack.lFEBUC/_new	2006-05-19 16:43:27.000000000 +0200
@@ -157,7 +157,7 @@
  	switch (device->type) {
  	case PILOT_DEVICE_SERIAL:
  		pf = PI_PF_PADP;
-@@ -207,30 +212,29 @@
+@@ -207,30 +212,32 @@
  	return sd;
  }
  
@@ -167,6 +167,9 @@
  {
  	dlp_EndOfSync (sd, 0);
  	pi_close (sd);
++
++	/* Allow the /dev/ttyUSB0 devices to "settle" */
++	sleep (1);
  }
  
 -static void write_sync_stamp (GPilotPilot *pilot,
@@ -202,7 +205,7 @@
  }
  
  /** pilot lookup methods **/
-@@ -284,7 +288,7 @@
+@@ -284,7 +291,7 @@
  	dlp_ReadStorageInfo (pfd, 0, &cardinfo);
  	dlp_ReadSysInfo (pfd, &sysinfo);
  
@@ -211,7 +214,7 @@
  		pilot = GPILOT_PILOT (g_list_nth (context->pilots, 0)->data);
  		g_message ("D: Only one pilot (%s) profile...", pilot->name);
  	} else {
-@@ -323,7 +327,7 @@
+@@ -323,7 +330,7 @@
   * This function handles when sync_device (...) encounters an unknown pilot
   */
  
@@ -220,7 +223,7 @@
  gpilot_syncing_unknown_pilot (struct PilotUser pu, 
  			      int pfd,
  			      GPilotDevice *device, 
-@@ -359,18 +363,19 @@
+@@ -359,18 +366,19 @@
  		 struct PilotUser *pu,
  		 GPilotDevice *device) 
  {
@@ -246,7 +249,7 @@
  	it = events;
  	
  	while (it) {
-@@ -444,72 +449,58 @@
+@@ -444,72 +452,58 @@
  
   */
  static void 
@@ -347,7 +350,7 @@
  	gpilot_unload_conduits (conduit_list);
  	gpilot_unload_conduits (backup_conduit_list);
  	gpilot_unload_conduits (file_conduit_list);
-@@ -530,9 +521,8 @@
+@@ -530,9 +524,8 @@
  	int ret;
  		
  	ret = stat (pilot->sync_options.basedir, &buf); 
@@ -359,7 +362,7 @@
  		g_message ("Invalid basedir: %s", pilot->sync_options.basedir);
  		gpilot_gui_warning_dialog (_("The base directory %s is invalid.\n"
  					     "Please fix it or use gnomecc to choose another directory."),
-@@ -543,18 +533,18 @@
+@@ -543,18 +536,18 @@
  		   on the pilot */
  		if (pilot->passwd) {
  			char *pwd;
@@ -384,7 +387,7 @@
  		}
  	}
  }
-@@ -583,12 +573,11 @@
+@@ -583,12 +576,11 @@
  sync_device (GPilotDevice *device, GPilotContext *context)
  {
  	GPilotPilot *pilot;
@@ -399,7 +402,7 @@
  	g_assert (context != NULL);
  	g_return_val_if_fail (device != NULL, FALSE);
  
-@@ -634,21 +623,20 @@
+@@ -634,21 +626,20 @@
  	return TRUE;
  }
  
@@ -428,7 +431,7 @@
  		g_warning ("cannot find device for active IO channel");
  		return FALSE;
  	}
-@@ -657,9 +645,9 @@
+@@ -657,9 +648,9 @@
  	if (context->paused) {
  		return FALSE; 
  	}	
@@ -441,7 +444,7 @@
  #ifdef WITH_IRDA
  	if (device->type == PILOT_DEVICE_IRDA) {
  		g_message ("Restarting irda funk...");
-@@ -669,20 +657,19 @@
+@@ -669,20 +660,19 @@
  		result = FALSE;
  	}
  #endif /* WITH_IRDA */
@@ -468,7 +471,7 @@
  	switch (condition) {
  	case G_IO_IN: tmp = g_strdup_printf ("G_IO_IN"); break;
  	case G_IO_OUT : tmp = g_strdup_printf ("G_IO_OUT"); break;
-@@ -694,8 +681,8 @@
+@@ -694,8 +684,8 @@
  	}
  	
  	element = g_list_find_custom (context->devices,io_channel,(GCompareFunc)device_equal_by_io);
@@ -479,7 +482,7 @@
  		/* We most likely end here if the device has just been removed.
  		   Eg. start gpilotd with a monitor on a XCopilot fake serial port,
  		   kill xcopilot and watch things blow up as the device fails */
-@@ -705,23 +692,21 @@
+@@ -705,23 +695,21 @@
  	}
  	
  	device = element->data;
@@ -512,7 +515,7 @@
  	GPilotDevice *device;
  	GList *element;
  	gboolean result = TRUE;
-@@ -747,17 +732,15 @@
+@@ -747,17 +735,15 @@
  	return result;
  }
  
@@ -535,7 +538,7 @@
  	switch (condition) {
  		case G_IO_IN: tmp = g_strdup_printf ("G_IO_IN"); break;
  		case G_IO_OUT : tmp = g_strdup_printf ("G_IO_OUT"); break;
-@@ -769,8 +752,8 @@
+@@ -769,8 +755,8 @@
  	}
  	
  	element = g_list_find_custom (context->devices,io_channel,(GCompareFunc)device_equal_by_io);
@@ -546,7 +549,7 @@
  		/* We most likely end here if the device has just been removed.
  		   Eg. start gpilotd with a monitor on a XCopilot fake serial port,
  		   kill xcopilot and watch things blow up as the device fails */
-@@ -780,161 +763,20 @@
+@@ -780,161 +766,20 @@
  	}
  	
  	device = element->data;
@@ -715,7 +718,7 @@
  {
  	g_assert (context != NULL);
  	
-@@ -962,37 +804,27 @@
+@@ -962,37 +807,27 @@
  		g_assert_not_reached ();
  #endif /* WITH_NETWORK */
  	} if (dev->type == PILOT_DEVICE_USB_VISOR) {
@@ -759,7 +762,7 @@
  	g_message (_("Exiting (caught SIGTERM)..."));
  	remove_pid_file ();
  	gpilotd_corba_quit ();
-@@ -1000,7 +832,8 @@
+@@ -1000,7 +835,8 @@
  }
  
  static void 
@@ -769,7 +772,7 @@
  	g_message (_("Exiting (caught SIGINT)..."));
  	remove_pid_file ();
  	gpilotd_corba_quit ();
-@@ -1008,23 +841,14 @@
+@@ -1008,23 +844,14 @@
  }
  
  /* This deletes the ~/.gpilotd.pid file */
@@ -801,7 +804,7 @@
  }
  
  /*
-@@ -1033,43 +857,43 @@
+@@ -1033,43 +860,43 @@
     SIGHUPS
  */
  static void 
@@ -881,7 +884,7 @@
  }
  
  /*  
-@@ -1082,13 +906,14 @@
+@@ -1082,13 +909,14 @@
  */
  
  static void 
@@ -902,7 +905,7 @@
  	while (1) {
  		if (reread_config) {
  			g_message (_("Shutting down devices"));
-@@ -1106,7 +931,7 @@
+@@ -1106,7 +934,7 @@
  /* This function display which pilot-link version was used
     and which features were enabled at compiletime */
  static void
@@ -911,14 +914,14 @@
  {
  	GString *str = g_string_new (NULL);
  	g_message ("compiled for pilot-link version %s",
-@@ -1129,38 +954,221 @@
+@@ -1129,38 +957,222 @@
  	g_string_free (str, TRUE);
  }
  
 +static void
 +hal_device_added (LibHalContext *ctx, const char *udi)
 +{
-+	gboolean visor_net = FALSE;
++	gboolean visor_net = TRUE;
 +	char *platform, *parent;
 +	GPilotDevice *device;
 +	DBusError error;
@@ -942,19 +945,20 @@
 +	g_message ("palm pda detected by HAL");
 +	
 +	libhal_free_string (platform);
-+	
++
 +	if (!(parent = libhal_device_get_property_string (hal_ctx, udi, "info.parent", NULL)))
 +		return;
 +	
 +	if (libhal_device_get_property_int (hal_ctx, parent, "usb.vendor_id", NULL) == 0x082d)
 +		if (libhal_device_get_property_int (hal_ctx, parent, "usb.product_id", NULL) == 0x0100)
-+			visor_net = TRUE;
++			visor_net = FALSE;
 +	
 +	libhal_free_string (parent);
 +	
 +	dev = context->devices;
 +	while (dev != NULL) {
 +		device = dev->data;
++
 +		if (device->type == PILOT_DEVICE_USB_VISOR) {
 +			if (!visor_net)
 +				device->type = PILOT_DEVICE_SERIAL;


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)