gnome-bluetooth r504 - trunk/wizard

[hadess svn gnome org]

Author: hadess
Date: Thu Mar 19 18:37:32 2009
New Revision: 504
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=504&view=rev

Log:
Only set the pairing as completed when Connect finishes

And tell the user that we're setting up the device.



Modified:
   trunk/wizard/main.c

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Thu Mar 19 18:37:32 2009
@@ -281,6 +281,10 @@
 
 static void connect_callback(gpointer user_data)
 {
+	GtkAssistant *assistant = user_data;
+
+	gtk_widget_hide (label_passkey_help);
+	gtk_assistant_set_page_complete(assistant, page_setup, TRUE);
 }
 
 static void create_callback(const char *path, gpointer user_data)
@@ -313,9 +317,14 @@
 					target_type == BLUETOOTH_TYPE_OTHER_AUDIO) {
 			bluetooth_client_connect_audio(client, path,
 						connect_callback, assistant);
+		} else {
+			complete = TRUE;
+		}
+		if (complete == FALSE) {
+			gtk_label_set_text (GTK_LABEL (label_passkey_help),
+					    _("Please wait while setting up the device..."));
+			gtk_widget_show (label_passkey_help);
 		}
-
-		complete = TRUE;
 	} else {
 		/* translators:
 		 * The '%s' is the device name, for example: