summaryrefslogtreecommitdiff
path: root/wizard/main.c
diff options
context:
space:
mode:
authorDaniele Forsi <dforsi@src.gnome.org>2011-12-18 17:44:48 +0100
committerDaniele Forsi <dforsi@src.gnome.org>2011-12-18 18:05:44 +0100
commit88e0eed221a32e4c770c40b635f43176e021b081 (patch)
treed748c4b8cfcfff906164f7f12a1522b9ccc82cfc /wizard/main.c
parentf1e5d9186155a07dd2e51e2df7c28728861a1b9c (diff)
downloadgnome-bluetooth-88e0eed221a32e4c770c40b635f43176e021b081.tar.gz
wizard: fix the "Do not pair" choice in the dialog
The choice in the dialog was overridden by the value read from the PIN database.
Diffstat (limited to 'wizard/main.c')
-rw-r--r--wizard/main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/wizard/main.c b/wizard/main.c
index a87920a3..4b3eb16a 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -454,7 +454,6 @@ void prepare_callback (GtkWidget *assistant,
if ((page == page_setup || page == page_connecting) && (create_started == FALSE)) {
const char *path = AGENT_PATH;
- char *pin_ret;
/* Set the filter on the selector, so we can use it to get more
* info later, in page_summary */
@@ -463,10 +462,8 @@ void prepare_callback (GtkWidget *assistant,
NULL);
/* Do we pair, or don't we? */
- pin_ret = get_pincode_for_device (target_type, target_address, target_name, NULL);
- if (pin_ret != NULL && g_str_equal (pin_ret, "NULL"))
+ if (g_strcmp0 (user_pincode, "NULL") == 0)
path = NULL;
- g_free (pin_ret);
g_object_ref(agent);
bluetooth_client_create_device (client, target_address,