[gnome-bluetooth] wizard: Rename Close to Quit

[Bastien Nocera <hadess src gnome org>]

commit 119f01472b1932186b44e6fe50186d2174185c7b
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 18 15:42:51 2012 +0000

    wizard: Rename Close to Quit

 wizard/main.c    |   20 ++++++++++----------
 wizard/wizard.ui |   12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/wizard/main.c b/wizard/main.c
index a9ef386..4ccb9d5 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -78,7 +78,7 @@ static char *pincode = NULL;
 static GtkBuilder *builder = NULL;
 
 static GtkAssistant *window_assistant = NULL;
-static GtkWidget *button_close = NULL;
+static GtkWidget *button_quit = NULL;
 static GtkWidget *button_cancel = NULL;
 static GtkWidget *page_search = NULL;
 static GtkWidget *page_connecting = NULL;
@@ -117,7 +117,7 @@ static GtkWidget *radio_custom = NULL;
 static GtkWidget *entry_custom = NULL;
 
 /* Signals */
-void close_callback(GtkWidget *assistant, gpointer data);
+void quit_callback(GtkWidget *assistant, gpointer data);
 void prepare_callback(GtkWidget *assistant, GtkWidget *page, gpointer data);
 void select_device_changed(BluetoothChooser *selector, const char *address, gpointer user_data);
 gboolean entry_custom_event(GtkWidget *entry, GdkEventKey *event);
@@ -404,7 +404,7 @@ create_callback (BluetoothClient *_client,
 }
 
 void
-close_callback (GtkWidget *widget,
+quit_callback (GtkWidget *widget,
 		gpointer data)
 {
 	gtk_widget_destroy(GTK_WIDGET (window_assistant));
@@ -416,7 +416,7 @@ void prepare_callback (GtkWidget *assistant,
 {
 	gboolean complete = TRUE;
 
-	gtk_widget_hide (button_close);
+	gtk_widget_hide (button_quit);
 	gtk_widget_hide (button_cancel);
 
 	if (page == page_search) {
@@ -504,7 +504,7 @@ void prepare_callback (GtkWidget *assistant,
 		gtk_label_set_text (GTK_LABEL (label_finishing), text);
 		g_free (text);
 
-		gtk_widget_show (button_close);
+		gtk_widget_show (button_quit);
 	} else {
 		gtk_spinner_stop (GTK_SPINNER (spinner_finishing));
 	}
@@ -543,14 +543,14 @@ void prepare_callback (GtkWidget *assistant,
 			g_list_free (widgets);
 			gtk_widget_show_all (extra_config_vbox);
 		}
-		gtk_widget_show (button_close);
+		gtk_widget_show (button_quit);
 	}
 
 	/* Setup the buttons some */
 	if (page == page_summary && summary_failure) {
 		complete = FALSE;
 		gtk_assistant_add_action_widget (GTK_ASSISTANT (assistant), W("restart_button"));
-		gtk_widget_show (button_close);
+		gtk_widget_show (button_quit);
 	} else {
 		if (gtk_widget_get_parent (W("restart_button")) != NULL)
 			gtk_assistant_remove_action_widget (GTK_ASSISTANT (assistant), W("restart_button"));
@@ -767,11 +767,11 @@ create_wizard (void)
 	gtk_assistant_set_forward_page_func (assistant, page_func, NULL, NULL);
 
 	/* The 2 custom buttons */
-	button_close = W("close_button");
+	button_quit = W("quit_button");
 	button_cancel = W("cancel_button");
-	gtk_assistant_add_action_widget (assistant, button_close);
+	gtk_assistant_add_action_widget (assistant, button_quit);
 	gtk_assistant_add_action_widget (assistant, button_cancel);
-	gtk_widget_hide (button_close);
+	gtk_widget_hide (button_quit);
 	gtk_widget_hide (button_cancel);
 
 	/* Intro page, nothing to do */
diff --git a/wizard/wizard.ui b/wizard/wizard.ui
index 7aa10a2..6c82fca 100644
--- a/wizard/wizard.ui
+++ b/wizard/wizard.ui
@@ -8,8 +8,8 @@
     <property name="default_width">440</property>
     <property name="default_height">440</property>
     <signal name="prepare" handler="prepare_callback"/>
-    <signal name="cancel" handler="close_callback"/>
-    <signal name="close" handler="close_callback"/>
+    <signal name="cancel" handler="quit_callback"/>
+    <signal name="close" handler="quit_callback"/>
     <child>
       <object class="GtkBox" id="page_intro">
         <property name="orientation">vertical</property>
@@ -552,13 +552,13 @@
     <property name="use_underline">True</property>
     <signal name="clicked" handler="restart_button_clicked"/>
   </object>
-  <object class="GtkButton" id="close_button">
-    <property name="label" translatable="yes">_Close</property>
+  <object class="GtkButton" id="quit_button">
+    <property name="label" translatable="yes">_Quit</property>
     <property name="visible">True</property>
     <property name="can_focus">True</property>
     <property name="receives_default">True</property>
     <property name="use_underline">True</property>
-    <signal name="clicked" handler="close_callback"/>
+    <signal name="clicked" handler="quit_callback"/>
   </object>
   <object class="GtkButton" id="cancel_button">
     <property name="label" translatable="yes">_Cancel</property>
@@ -566,7 +566,7 @@
     <property name="can_focus">True</property>
     <property name="receives_default">True</property>
     <property name="use_underline">True</property>
-    <signal name="clicked" handler="close_callback"/>
+    <signal name="clicked" handler="quit_callback"/>
   </object>
   <object class="GtkButton" id="does_not_match_button">
     <property name="label" translatable="yes" comments="This is a button to answer: Does the PIN matches the one on the device?">Does not match</property>