[gedit: 15/17] Remove logout mode from the close-confirmation-dialog

[Paolo Borelli <pborelli src gnome org>]

commit 137119ebc90574cead989565217a2ae5fc841ee4
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Dec 23 13:18:40 2012 +0100

    Remove logout mode from the close-confirmation-dialog
    
    It is not used anymore

 gedit/gedit-close-confirmation-dialog.c |  143 +++++++++++--------------------
 gedit/gedit-close-confirmation-dialog.h |    6 +-
 gedit/gedit-commands-file.c             |   13 +--
 3 files changed, 56 insertions(+), 106 deletions(-)
---
diff --git a/gedit/gedit-close-confirmation-dialog.c b/gedit/gedit-close-confirmation-dialog.c
index f8e41d8..541e150 100644
--- a/gedit/gedit-close-confirmation-dialog.c
+++ b/gedit/gedit-close-confirmation-dialog.c
@@ -43,8 +43,7 @@
 enum 
 {
 	PROP_0,	
-	PROP_UNSAVED_DOCUMENTS,
-	PROP_LOGOUT_MODE
+	PROP_UNSAVED_DOCUMENTS
 };
 
 /* Mode */
@@ -65,14 +64,9 @@ enum
 
 struct _GeditCloseConfirmationDialogPrivate 
 {
-	gboolean     logout_mode;
-
 	GList       *unsaved_documents;
-	
 	GList       *selected_documents;
-
 	GtkTreeModel *list_store;
-	
 	gboolean     disable_save_to_disk;
 };
 
@@ -129,64 +123,6 @@ response_cb (GeditCloseConfirmationDialog *dlg,
 	}
 }
 
-static void
-set_logout_mode (GeditCloseConfirmationDialog *dlg,
-		 gboolean                      logout_mode)
-{
-	dlg->priv->logout_mode = logout_mode;
-	
-	if (logout_mode)
-	{
-		gtk_dialog_add_button (GTK_DIALOG (dlg),
-				       _("Log Out _without Saving"),
-				       GTK_RESPONSE_NO);
-
-		gedit_dialog_add_button (GTK_DIALOG (dlg),
-					 _("_Cancel Logout"),
-					 GTK_STOCK_CANCEL,
-					 GTK_RESPONSE_CANCEL);
-	}
-	else
-	{
-		gtk_dialog_add_button (GTK_DIALOG (dlg),
-				       _("Close _without Saving"),
-				       GTK_RESPONSE_NO);
-
-		gtk_dialog_add_button (GTK_DIALOG (dlg),
-				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	}
-	
-	if (dlg->priv->disable_save_to_disk)
-	{
-		gtk_dialog_set_default_response	(GTK_DIALOG (dlg),
-						 GTK_RESPONSE_NO);
-	}
-	else
-	{
-		const gchar *stock_id = GTK_STOCK_SAVE;
-		
-		if (GET_MODE (dlg->priv) == SINGLE_DOC_MODE)
-		{
-			GeditDocument *doc;
-			
-			doc = GEDIT_DOCUMENT (dlg->priv->unsaved_documents->data);
-			
-			if (gedit_document_get_readonly (doc) || 
-			    gedit_document_is_untitled (doc))
-			{
-				stock_id = GTK_STOCK_SAVE_AS;
-			}
-		}
-
-		gtk_dialog_add_button (GTK_DIALOG (dlg),
-				       stock_id, 
-				       GTK_RESPONSE_YES);
-
-		gtk_dialog_set_default_response	(GTK_DIALOG (dlg), 
-						 GTK_RESPONSE_YES);
-	}
-}
-
 static void 
 gedit_close_confirmation_dialog_init (GeditCloseConfirmationDialog *dlg)
 {
@@ -252,10 +188,6 @@ gedit_close_confirmation_dialog_set_property (GObject      *object,
 		case PROP_UNSAVED_DOCUMENTS:
 			set_unsaved_document (dlg, g_value_get_pointer (value));
 			break;
-			
-		case PROP_LOGOUT_MODE:
-			set_logout_mode (dlg, g_value_get_boolean (value));
-			break;
 
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -279,10 +211,6 @@ gedit_close_confirmation_dialog_get_property (GObject    *object,
 			g_value_set_pointer (value, priv->unsaved_documents);
 			break;
 
-		case PROP_LOGOUT_MODE:
-			g_value_set_boolean (value, priv->logout_mode);
-			break;
-
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;
@@ -307,15 +235,6 @@ gedit_close_confirmation_dialog_class_init (GeditCloseConfirmationDialogClass *k
 							       "List of Unsaved Documents",
 							       (G_PARAM_READWRITE | 
 							        G_PARAM_CONSTRUCT_ONLY)));
-
-	g_object_class_install_property (gobject_class,
-					 PROP_LOGOUT_MODE,
-					 g_param_spec_boolean ("logout_mode",
-						 	       "Logout Mode",
-							       "Whether the dialog is in logout mode",
-							       FALSE,
-							       (G_PARAM_READWRITE | 
-							        G_PARAM_CONSTRUCT_ONLY)));
 }
 
 static GList *
@@ -358,15 +277,14 @@ gedit_close_confirmation_dialog_get_selected_documents (GeditCloseConfirmationDi
 
 GtkWidget *
 gedit_close_confirmation_dialog_new (GtkWindow *parent, 
-				     GList     *unsaved_documents,
-				     gboolean   logout_mode)
+				     GList     *unsaved_documents)
 {
 	GtkWidget *dlg;
+
 	g_return_val_if_fail (unsaved_documents != NULL, NULL);
 
 	dlg = GTK_WIDGET (g_object_new (GEDIT_TYPE_CLOSE_CONFIRMATION_DIALOG,
 				        "unsaved_documents", unsaved_documents,
-				        "logout_mode", logout_mode,
 				        NULL));
 	g_return_val_if_fail (dlg != NULL, NULL);
 
@@ -383,8 +301,7 @@ gedit_close_confirmation_dialog_new (GtkWindow *parent,
 
 GtkWidget *
 gedit_close_confirmation_dialog_new_single (GtkWindow     *parent, 
-					    GeditDocument *doc,
-					    gboolean       logout_mode)
+					    GeditDocument *doc)
 {
 	GtkWidget *dlg;
 	GList *unsaved_documents;
@@ -393,14 +310,54 @@ gedit_close_confirmation_dialog_new_single (GtkWindow     *parent,
 	unsaved_documents = g_list_prepend (NULL, doc);
 
 	dlg = gedit_close_confirmation_dialog_new (parent, 
-						   unsaved_documents,
-						   logout_mode);
+						   unsaved_documents);
 	
 	g_list_free (unsaved_documents);
 
 	return dlg;
 }
 
+static void
+add_buttons (GeditCloseConfirmationDialog *dlg)
+{
+	gtk_dialog_add_button (GTK_DIALOG (dlg),
+			       _("Close _without Saving"),
+			       GTK_RESPONSE_NO);
+
+	gtk_dialog_add_button (GTK_DIALOG (dlg),
+			       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+	if (dlg->priv->disable_save_to_disk)
+	{
+		gtk_dialog_set_default_response	(GTK_DIALOG (dlg),
+						 GTK_RESPONSE_NO);
+	}
+	else
+	{
+		const gchar *stock_id = GTK_STOCK_SAVE;
+
+		if (GET_MODE (dlg->priv) == SINGLE_DOC_MODE)
+		{
+			GeditDocument *doc;
+
+			doc = GEDIT_DOCUMENT (dlg->priv->unsaved_documents->data);
+
+			if (gedit_document_get_readonly (doc) ||
+			    gedit_document_is_untitled (doc))
+			{
+				stock_id = GTK_STOCK_SAVE_AS;
+			}
+		}
+
+		gtk_dialog_add_button (GTK_DIALOG (dlg),
+				       stock_id,
+				       GTK_RESPONSE_YES);
+
+		gtk_dialog_set_default_response	(GTK_DIALOG (dlg),
+						 GTK_RESPONSE_YES);
+	}
+}
+
 static gchar *
 get_text_secondary_label (GeditDocument *doc)
 {
@@ -500,6 +457,8 @@ build_single_doc_dialog (GeditCloseConfirmationDialog *dlg)
 	g_return_if_fail (dlg->priv->unsaved_documents->data != NULL);
 	doc = GEDIT_DOCUMENT (dlg->priv->unsaved_documents->data);
 
+	add_buttons (dlg);
+
 	/* Image */
 	image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
 					  GTK_ICON_SIZE_DIALOG);
@@ -552,13 +511,9 @@ build_single_doc_dialog (GeditCloseConfirmationDialog *dlg)
 	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
 	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-	
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-
 	gtk_box_pack_start (GTK_BOX (vbox), primary_label, FALSE, FALSE, 0);
-		      
 	gtk_box_pack_start (GTK_BOX (vbox), secondary_label, FALSE, FALSE, 0);
-
 	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
 			    hbox, 
 	                    FALSE, 
@@ -680,6 +635,8 @@ build_multiple_docs_dialog (GeditCloseConfirmationDialog *dlg)
 
 	priv = dlg->priv;
 
+	add_buttons (dlg);
+
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
 	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
diff --git a/gedit/gedit-close-confirmation-dialog.h b/gedit/gedit-close-confirmation-dialog.h
index c52b92f..bae8182 100644
--- a/gedit/gedit-close-confirmation-dialog.h
+++ b/gedit/gedit-close-confirmation-dialog.h
@@ -61,11 +61,9 @@ struct _GeditCloseConfirmationDialogClass
 GType 		 gedit_close_confirmation_dialog_get_type		(void) G_GNUC_CONST;
 
 GtkWidget	*gedit_close_confirmation_dialog_new			(GtkWindow     *parent,
-									 GList         *unsaved_documents,
-									 gboolean       logout_mode);
+									 GList         *unsaved_documents);
 GtkWidget 	*gedit_close_confirmation_dialog_new_single 		(GtkWindow     *parent, 
-									 GeditDocument *doc,
- 									 gboolean       logout_mode);
+									 GeditDocument *doc);
 
 const GList	*gedit_close_confirmation_dialog_get_unsaved_documents  (GeditCloseConfirmationDialog *dlg);
 
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index a316bd0..189cbbd 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -1768,12 +1768,9 @@ tab_can_close (GeditTab  *tab,
 
 	if (!_gedit_tab_get_can_close (tab))
 	{
-		GtkWidget     *dlg;
-
-		dlg = gedit_close_confirmation_dialog_new_single (window,
-								  doc,
-								  FALSE);
+		GtkWidget *dlg;
 
+		dlg = gedit_close_confirmation_dialog_new_single (window, doc);
 		g_signal_connect (dlg,
 				  "response",
 				  G_CALLBACK (close_confirmation_dialog_response_handler),
@@ -1890,14 +1887,12 @@ file_close_all (GeditWindow *window,
 
 		dlg = gedit_close_confirmation_dialog_new_single (
 						GTK_WINDOW (window),
-						doc,
-						FALSE);
+						doc);
 	}
 	else
 	{
 		dlg = gedit_close_confirmation_dialog_new (GTK_WINDOW (window),
-							   unsaved_docs,
-							   FALSE);
+							   unsaved_docs);
 	}
 
 	g_list_free (unsaved_docs);