gnome-bluetooth r419 - trunk/sendto

[hadess svn gnome org]

Author: hadess
Date: Mon Mar  2 11:16:54 2009
New Revision: 419
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=419&view=rev

Log:
Also get the device name from the chooser

When it's shown.



Modified:
   trunk/sendto/main.c

Modified: trunk/sendto/main.c
==============================================================================
--- trunk/sendto/main.c	(original)
+++ trunk/sendto/main.c	Mon Mar  2 11:16:54 2009
@@ -684,7 +684,7 @@
 }
 
 static char *
-show_browse_dialog (void)
+show_browse_dialog (char **device_name)
 {
 	GtkWidget *dialog, *selector, *button, *image;
 	char *bdaddr;
@@ -720,7 +720,10 @@
 	bdaddr = NULL;
 	response_id = gtk_dialog_run (GTK_DIALOG (dialog));
 	if (response_id == GTK_RESPONSE_ACCEPT)
-		g_object_get (G_OBJECT (selector), "device-selected", &bdaddr, NULL);
+		g_object_get (G_OBJECT (selector),
+			      "device-selected", &bdaddr,
+			      "device-selected-name", device_name,
+			      NULL);
 
 	gtk_widget_destroy (dialog);
 
@@ -802,7 +805,7 @@
 	}
 
 	if (option_device == NULL) {
-		option_device = show_browse_dialog();
+		option_device = show_browse_dialog(&device_name);
 		if (option_device == NULL) {
 			g_strfreev(option_files);
 			return 1;
@@ -857,7 +860,8 @@
 	dbus_g_object_register_marshaller(marshal_VOID__UINT64,
 				G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID);
 
-	device_name = get_device_name(option_device);
+	if (device_name == NULL)
+		device_name = get_device_name(option_device);
 	if (device_name == NULL)
 		device_name = g_strdup(option_device);