gnome-bluetooth r444 - trunk/wizard

[hadess svn gnome org]

Author: hadess
Date: Tue Mar  3 18:16:18 2009
New Revision: 444
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=444&view=rev

Log:
Move the passkey options to the action area

Instead of packing it with the chooser.



Modified:
   trunk/wizard/main.c

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Tue Mar  3 18:16:18 2009
@@ -57,6 +57,7 @@
 
 static GtkWidget *window_assistant = NULL;
 static GtkWidget *page_search = NULL;
+static GtkWidget *passkey_button = NULL;
 static GtkWidget *page_setup = NULL;
 static GtkWidget *page_summary = NULL;
 
@@ -301,10 +302,16 @@
 	const char *path = AGENT_PATH;
 
 	if (page == page_search) {
+		gtk_assistant_add_action_widget (GTK_ASSISTANT (assistant), passkey_button);
 		complete = set_page_search_complete ();
 		bluetooth_client_start_discovery(client);
-	} else
+	} else {
+		if (gtk_widget_get_parent (passkey_button) != NULL) {
+			g_object_ref (passkey_button);
+			gtk_assistant_remove_action_widget (GTK_ASSISTANT (assistant), passkey_button);
+		}
 		bluetooth_client_stop_discovery(client);
+	}
 
 	if (page == page_setup) {
 		gchar *text, *markup, *address, *name;
@@ -689,12 +696,14 @@
 
 	gtk_container_add(GTK_CONTAINER(vbox), GTK_WIDGET (selector));
 
+	page_search = vbox;
+
 	button = gtk_button_new_with_mnemonic (_("Passkey _options..."));
-	gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (passkey_option_button_clicked), assistant);
+	gtk_widget_show (button);
 
-	page_search = vbox;
+	passkey_button = button;
 }
 
 static void create_setup(GtkWidget *assistant)