[gnome-bluetooth] wizard: Remove intro page

[Bastien Nocera <hadess src gnome org>]

commit d0465c0d4a2c61d7899c9943a74d032bbe6a661b
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 18 16:01:24 2012 +0000

    wizard: Remove intro page

 wizard/main.c    |   13 ++++++-------
 wizard/wizard.ui |   54 ------------------------------------------------------
 2 files changed, 6 insertions(+), 61 deletions(-)
---
diff --git a/wizard/main.c b/wizard/main.c
index 935cd8a..da14a3d 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -47,7 +47,6 @@
 #define W(x) GTK_WIDGET(gtk_builder_get_object(builder, x))
 
 enum {
-	PAGE_INTRO,
 	PAGE_SEARCH,
 	PAGE_CONNECTING,
 	PAGE_SETUP,
@@ -747,7 +746,7 @@ page_func (gint current_page,
 	return current_page + 1;
 }
 
-static GtkAssistant *
+static gboolean
 create_wizard (void)
 {
 	GtkAssistant *assistant;
@@ -758,11 +757,12 @@ create_wizard (void)
 		if (gtk_builder_add_from_file (builder, PKGDATADIR "/wizard.ui", &err) == 0) {
 			g_warning ("Could not load UI from %s: %s", PKGDATADIR "/wizard.ui", err->message);
 			g_error_free(err);
-			return NULL;
+			return FALSE;
 		}
 	}
 
-	assistant = GTK_ASSISTANT(gtk_builder_get_object(builder, "assistant"));
+	window_assistant = GTK_ASSISTANT(gtk_builder_get_object(builder, "assistant"));
+	assistant = window_assistant;
 
 	gtk_assistant_set_forward_page_func (assistant, page_func, NULL, NULL);
 
@@ -832,7 +832,7 @@ create_wizard (void)
 
 	gtk_assistant_update_buttons_state(GTK_ASSISTANT(assistant));
 
-	return assistant;
+	return TRUE;
 }
 
 static void
@@ -895,8 +895,7 @@ int main (int argc, char **argv)
 
 	bluetooth_plugin_manager_init ();
 
-	window_assistant = create_wizard();
-	if (window_assistant == NULL)
+	if (create_wizard() == FALSE)
 		return 1;
 	gtk_application_add_window (app,
 				    GTK_WINDOW (window_assistant));
diff --git a/wizard/wizard.ui b/wizard/wizard.ui
index fe77efb..1b1a76d 100644
--- a/wizard/wizard.ui
+++ b/wizard/wizard.ui
@@ -11,60 +11,6 @@
     <signal name="cancel" handler="quit_callback"/>
     <signal name="close" handler="quit_callback"/>
     <child>
-      <object class="GtkBox" id="page_intro">
-        <property name="orientation">vertical</property>
-        <property name="visible">True</property>
-        <property name="border_width">24</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">Welcome to the Bluetooth new device setup</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">The Bluetooth new device setup will walk you through the process of configuring Bluetooth enabled devices for use with this computer.</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">The device will need to be within 10 meters of your computer, and be âvisibleâ (sometimes called âdiscoverableâ). Check the device's manual if in doubt.</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="page_type">intro</property>
-        <property name="title" translatable="yes">Introduction</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkBox" id="page_search">
 	<property name="orientation">vertical</property>
         <property name="visible">True</property>