[gthumb/gthumb-2-12] Save the user preference changes when the pref window is about to be destroyed

[Paolo Bacchilega <paobac src gnome org>]

commit 04b8501178bf475bcbe5ff5287a08f8cc1ca7346
Author: Abner Silva <abner collabora co uk>
Date:   Fri Jun 3 13:50:07 2011 +0200

    Save the user preference changes when the pref window is about to be destroyed
    
    This patch makes the 'close' button and the 'x' window manager close button
    behave exactly the same. It will save all user preferences when the window pref
    is about to be destroyed.

 gthumb/dlg-preferences.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gthumb/dlg-preferences.c b/gthumb/dlg-preferences.c
index bc77796..a8e8c5f 100644
--- a/gthumb/dlg-preferences.c
+++ b/gthumb/dlg-preferences.c
@@ -63,16 +63,6 @@ get_idx_from_size (gint size)
 
 
 static void
-destroy_cb (GtkWidget *widget,
-	    DialogData *data)
-{
-	gth_browser_set_dialog (data->browser, "preferences", NULL);
-	g_object_unref (data->builder);
-	g_free (data);
-}
-
-
-static void
 apply_changes (DialogData *data)
 {
 	/* Startup dir. */
@@ -95,10 +85,20 @@ apply_changes (DialogData *data)
 
 
 static void
+destroy_cb (GtkWidget *widget,
+	    DialogData *data)
+{
+	apply_changes (data);
+	gth_browser_set_dialog (data->browser, "preferences", NULL);
+	g_object_unref (data->builder);
+	g_free (data);
+}
+
+
+static void
 close_button_clicked_cb (GtkWidget  *widget,
 			 DialogData *data)
 {
-	apply_changes (data);
 	gtk_widget_destroy (data->dialog);
 }