[gnome-bluetooth] Bug 573738 – Make sendto call pass --name

[Bastien Nocera <hadess src gnome org>]

commit 65f311ea04ea86a385fa2750fb589fc7016ec9bc
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jun 10 23:48:14 2009 +0100

    Bug 573738 â?? Make sendto call pass --name
    
    And make sure that we call sendto correctly when the top-level
    "Send Files..." menu item is passed.
---
 applet/main.c |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/applet/main.c b/applet/main.c
index 7e75f5f..2df0bcb 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -158,17 +158,40 @@ void browse_callback(GObject *widget, gpointer user_data)
 
 void sendto_callback(GObject *widget, gpointer user_data)
 {
-	char *cmd;
-	const char *address;
+	GPtrArray *a;
+	GError *err = NULL;
+	guint i;
+	const char *address, *alias;
 
 	address = g_object_get_data (widget, "address");
+	alias = g_object_get_data (widget, "alias");
 
-	cmd = g_strdup_printf("%s --device=\"%s\"", "bluetooth-sendto", address);
+	a = g_ptr_array_new ();
+	g_ptr_array_add (a, "bluetooth-sendto");
+	if (address != NULL) {
+		char *s;
 
-	if (!g_spawn_command_line_async(cmd, NULL))
-		g_printerr("Couldn't execute command: %s\n", cmd);
+		s = g_strdup_printf ("--device=\"%s\"", address);
+		g_ptr_array_add (a, s);
+	}
+	if (address != NULL && alias != NULL) {
+		char *s;
 
-	g_free (cmd);
+		s = g_strdup_printf ("--name=\"%s\"", alias);
+		g_ptr_array_add (a, s);
+	}
+	g_ptr_array_add (a, NULL);
+
+	if (g_spawn_async(NULL, (char **) a->pdata, NULL,
+			  G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err) == FALSE) {
+		g_printerr("Couldn't execute command: %s\n", err->message);
+		g_error_free (err);
+	}
+
+	for (i = 1; a->pdata[i] != NULL; i++)
+		g_free (a->pdata[i]);
+
+	g_ptr_array_free (a, TRUE);
 }
 
 static void keyboard_callback(GObject *widget, gpointer user_data)
@@ -750,6 +773,8 @@ update_device_list (GtkTreeIter *parent)
 					       uimanager,
 					       menu_merge_id,
 					       G_CALLBACK (sendto_callback));
+				g_object_set_data_full (G_OBJECT (action),
+							"alias", g_strdup (alias), g_free);
 			}
 			if (device_has_uuid ((const char **) uuids, "OBEXFileTransfer") != FALSE) {
 				add_menu_item (address,