[PATCH] Don't show (null) in wizard

[PATCH] Don't show (null) in wizard

[Mario_Limonciello]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

Hi:

I've noticed that the wizard will show (null) if the device name is not yet recognized when pairing.  This is a bit confusing to the user experience.  The attached patch makes the behavior a little bit better.

Regards

Mario Limonciello 
Dell | Linux Engineering 
Mario_Limonciello@Dell.com 



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 07_null_device_name.patch --]
[-- Type: text/x-patch; name="07_null_device_name.patch", Size: 407 bytes --]

diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/wizard/main.c bluez-gnome-1.8.new/wizard/main.c
--- bluez-gnome-1.8/wizard/main.c	2008-10-04 14:32:56.000000000 -0500
+++ bluez-gnome-1.8.new/wizard/main.c	2008-10-06 01:18:54.000000000 -0500
@@ -362,6 +362,8 @@
 		g_free(target_address);
 		target_address = address;
 
+		if (name == NULL)
+			name = "device";
 		g_free(target_name);
 		target_name = name;
 

Re: [PATCH] Don't show (null) in wizard

[David Woodhouse]

On Mon, 2008-10-06 at 01:21 -0500, Mario_Limonciello@Dell.com wrote:
> I've noticed that the wizard will show (null) if the device name is
> not yet recognized when pairing.  This is a bit confusing to the user
> experience.  The attached patch makes the behavior a little bit
> better.

Thanks; I noticed that too a couple of days ago but hadn't got round to
the patch yet.

Perhaps showing the bdaddr would be better, though?

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: [PATCH] Don't show (null) in wizard

[Bastien Nocera]

On Mon, 2008-10-06 at 07:25 +0100, David Woodhouse wrote:
> On Mon, 2008-10-06 at 01:21 -0500, Mario_Limonciello@Dell.com wrote:
> > I've noticed that the wizard will show (null) if the device name is
> > not yet recognized when pairing.  This is a bit confusing to the user
> > experience.  The attached patch makes the behavior a little bit
> > better.
> 
> Thanks; I noticed that too a couple of days ago but hadn't got round to
> the patch yet.
> 
> Perhaps showing the bdaddr would be better, though?

That should fix both problems:

diff --git a/wizard/main.c b/wizard/main.c
index 3accd7f..3c9e017 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -351,7 +351,7 @@ static void select_callback(GtkTreeSelection *selection, gpointer user_data)
                gtk_tree_model_get(model, &iter,
                                BLUETOOTH_COLUMN_PAIRED, &paired,
                                BLUETOOTH_COLUMN_ADDRESS, &address,
-                               BLUETOOTH_COLUMN_NAME, &name,
+                               BLUETOOTH_COLUMN_ALIAS, &name,
                                BLUETOOTH_COLUMN_TYPE, &type, -1);
 
                if (paired == TRUE)

Re: [PATCH] Don't show (null) in wizard

[Marcel Holtmann]

Hi Bastien,

> > > I've noticed that the wizard will show (null) if the device name is
> > > not yet recognized when pairing.  This is a bit confusing to the user
> > > experience.  The attached patch makes the behavior a little bit
> > > better.
> > 
> > Thanks; I noticed that too a couple of days ago but hadn't got round to
> > the patch yet.
> > 
> > Perhaps showing the bdaddr would be better, though?
> 
> That should fix both problems:
> 
> diff --git a/wizard/main.c b/wizard/main.c
> index 3accd7f..3c9e017 100644
> --- a/wizard/main.c
> +++ b/wizard/main.c
> @@ -351,7 +351,7 @@ static void select_callback(GtkTreeSelection *selection, gpointer user_data)
>                 gtk_tree_model_get(model, &iter,
>                                 BLUETOOTH_COLUMN_PAIRED, &paired,
>                                 BLUETOOTH_COLUMN_ADDRESS, &address,
> -                               BLUETOOTH_COLUMN_NAME, &name,
> +                               BLUETOOTH_COLUMN_ALIAS, &name,
>                                 BLUETOOTH_COLUMN_TYPE, &type, -1);
>  

this is the right fix. Let bluetoothd do the hard work for you :)

Regards

Marcel