nautilus-sendto r358 - in trunk: . src/plugins

[hadess svn gnome org]

Author: hadess
Date: Mon Sep 29 09:03:24 2008
New Revision: 358
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=358&view=rev

Log:
2008-09-29  Bastien Nocera  <hadess hadess net>

	* src/plugins/bluetooth.c (add_phone_to_list),
	(add_device_to_list), (device_found):
	Use the Alias property instead of the "Name", as it stops
	bluetooth addresses from showing up unmodified in the UI



Modified:
   trunk/ChangeLog
   trunk/src/plugins/bluetooth.c

Modified: trunk/src/plugins/bluetooth.c
==============================================================================
--- trunk/src/plugins/bluetooth.c	(original)
+++ trunk/src/plugins/bluetooth.c	Mon Sep 29 09:03:24 2008
@@ -136,14 +136,8 @@
 	found = find_iter_for_address (store, bdaddr, &iter);
 	if (found == FALSE) {
 		gtk_list_store_append (store, &iter);
-	} else {
-		if (name == NULL)
-			return;
 	}
 
-	if (name == NULL)
-		name = bdaddr;
-
 	gtk_list_store_set (store, &iter,
 			NAME_COL, name,
 			BDADDR_COL, bdaddr,
@@ -173,7 +167,7 @@
 
 		value = g_hash_table_lookup (props, "Address");
 		address = g_value_get_string (value);
-		value = g_hash_table_lookup (props, "Name");
+		value = g_hash_table_lookup (props, "Alias");
 		name = g_value_get_string (value);
 
 		//FIXME double check the obexftp support?
@@ -205,7 +199,7 @@
 	GValue *value;
 	const char *name;
 
-	value = g_hash_table_lookup (props, "Name");
+	value = g_hash_table_lookup (props, "Alias");
 	name = value ? g_value_get_string (value) : NULL;
 
 	add_phone_to_list (store, name, address);