gvfs r2193 - in trunk: . daemon

[hadess svn gnome org]

Author: hadess
Date: Tue Feb  3 11:32:18 2009
New Revision: 2193
URL: http://svn.gnome.org/viewvc/gvfs?rev=2193&view=rev

Log:
2009-02-03  Bastien Nocera  <hadess hadess net>

	* daemon/gvfsbackendobexftp.c (do_mount): Fix
	possible double-free when the display name is freed
	Avoid errors when the icon name couldn't be gathered



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendobexftp.c

Modified: trunk/daemon/gvfsbackendobexftp.c
==============================================================================
--- trunk/daemon/gvfsbackendobexftp.c	(original)
+++ trunk/daemon/gvfsbackendobexftp.c	Tue Feb  3 11:32:18 2009
@@ -882,7 +882,9 @@
         }
       op_backend->display_name = _get_bluetooth_device_properties (op_backend->bdaddr, &op_backend->icon_name);
       if (!op_backend->display_name)
-        op_backend->display_name = g_strdelimit (op_backend->bdaddr, ":", '-');
+        op_backend->display_name = g_strdelimit (g_strdup (op_backend->bdaddr), ":", '-');
+      if (!op_backend->icon_name)
+        op_backend->icon_name = g_strdup ("bluetooth");
       g_print ("  do_mount: %s (%s) mounted\n", op_backend->display_name, op_backend->bdaddr);
     }
   else