[glade] Reduced use of deprecated gtk_dialog_get_action_area() function.

[Juan Pablo Ugarte <jpu src gnome org>]

commit 0010dedc7caa3acc28689107d3df3b0f40a20a6d
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu May 15 18:04:25 2014 -0300

    Reduced use of deprecated gtk_dialog_get_action_area() function.
    
    Added _glade_util_dialog_set_hig()

 gladeui/glade-editor-property.c           |   54 ++++++-----------------------
 gladeui/glade-named-icon-chooser-dialog.c |   12 ++-----
 gladeui/glade-private.h                   |   11 +++---
 gladeui/glade-utils.c                     |   15 ++++++++
 4 files changed, 35 insertions(+), 57 deletions(-)
---
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 4f98c92..c3a053f 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -52,6 +52,7 @@
 #include "glade-marshallers.h"
 #include "glade-displayable-values.h"
 #include "glade-named-icon-chooser-dialog.h"
+#include "glade-private.h"
 
 enum
 {
@@ -1312,7 +1313,6 @@ glade_eprop_flags_show_dialog (GladeEditorProperty *eprop)
   GtkWidget *label;
   GtkWidget *vbox;
   GtkWidget *content_area;
-  GtkWidget *action_area;
 
   dialog = gtk_dialog_new_with_buttons (_("Select Fields"),
                                         GTK_WINDOW (window),
@@ -1323,14 +1323,8 @@ glade_eprop_flags_show_dialog (GladeEditorProperty *eprop)
   gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
 
-  /* HIG spacings */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_box_set_spacing (GTK_BOX (content_area), 2);      /* 2 * 5 + 2 = 12 */
-  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
-
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
@@ -1987,7 +1981,7 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
   GtkWidget *text_view, *comment_view, *context_view;
   GtkTextBuffer *text_buffer, *comment_buffer, *context_buffer = NULL;
   GtkWidget *translatable_button;
-  GtkWidget *content_area, *action_area;
+  GtkWidget *content_area;
   gint res;
 
   g_return_val_if_fail (text && context && comment && translatable, FALSE);
@@ -2006,15 +2000,8 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
                                            GTK_RESPONSE_OK,
                                            GTK_RESPONSE_CANCEL, -1);
 
-  /* HIG spacings */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_box_set_spacing (GTK_BOX (content_area), 2);      /* 2 * 5 + 2 = 12 */
-  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
-
-
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));
+  content_area =  gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_widget_show (vbox);
@@ -2193,7 +2180,6 @@ glade_editor_property_show_resource_dialog (GladeProject *project,
 {
 
   GtkWidget *dialog;
-  GtkWidget *action_area;
   gchar *folder;
 
   g_return_val_if_fail (filename != NULL, FALSE);
@@ -2213,12 +2199,7 @@ glade_editor_property_show_resource_dialog (GladeProject *project,
                                            GTK_RESPONSE_OK,
                                            GTK_RESPONSE_CANCEL, -1);
 
-  /* HIG spacings */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-  gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); /* 2 * 5 + 2 = 12 */
-  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));
 
   folder = glade_project_resource_fullpath (project, ".");
   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder);
@@ -3136,7 +3117,6 @@ glade_editor_property_show_object_dialog (GladeProject *project,
   GtkWidget *vbox, *label, *sw;
   GtkWidget *tree_view;
   GtkWidget *content_area;
-  GtkWidget *action_area;
   GList *selected_list = NULL, *exception_list = NULL;
   gint res;
 
@@ -3161,14 +3141,8 @@ glade_editor_property_show_object_dialog (GladeProject *project,
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
-  /* HIG settings */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_box_set_spacing (GTK_BOX (content_area), 2);      /* 2 * 5 + 2 = 12 */
-  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
-
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));
+  content_area =  gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_widget_show (vbox);
 
@@ -3241,7 +3215,6 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop)
   GtkWidget *vbox, *label, *sw;
   GtkWidget *tree_view;
   GtkWidget *content_area;
-  GtkWidget *action_area;
   GladeProject *project;
   GladeWidget  *widget;
   GParamSpec *pspec;
@@ -3298,14 +3271,8 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop)
   gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
-  /* HIG settings */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_box_set_spacing (GTK_BOX (content_area), 2);      /* 2 * 5 + 2 = 12 */
-  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
-
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));  
+  content_area =  gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_widget_show (vbox);
 
@@ -3607,6 +3574,7 @@ glade_eprop_objects_show_dialog (GladeEditorProperty *eprop)
 
   gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
 
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_widget_show (vbox);
 
diff --git a/gladeui/glade-named-icon-chooser-dialog.c b/gladeui/glade-named-icon-chooser-dialog.c
index 22830fd..5cfc279 100644
--- a/gladeui/glade-named-icon-chooser-dialog.c
+++ b/gladeui/glade-named-icon-chooser-dialog.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include "glade-private.h"
 #include "glade-named-icon-chooser-dialog.h"
 #include "icon-naming-spec.c"
 
@@ -1353,7 +1354,6 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
   GtkWidget *label;
   GtkWidget *hpaned;
   GtkWidget *content_area;
-  GtkWidget *action_area;
   GtkSizeGroup *group;
 
   dialog->priv = glade_named_icon_chooser_dialog_get_instance_private (dialog);
@@ -1370,15 +1370,8 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
 
   gtk_window_set_default_size (GTK_WINDOW (dialog), 610, 480);
 
-#if !GTK_CHECK_VERSION (2, 21, 8)
-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-#endif
+  _glade_util_dialog_set_hig (GTK_DIALOG (dialog));
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
-  gtk_box_set_spacing (GTK_BOX (content_area), 12);
-  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
 
   /* We do a signal connection here rather than overriding the method in
    * class_init because GtkDialog::response is a RUN_LAST signal.  We want *our*
@@ -1398,6 +1391,7 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
     standard_icon_quarks = create_standard_icon_quarks ();
 
   contents = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (contents), 5);
   gtk_widget_show (contents);
 
   label = gtk_label_new_with_mnemonic (_("Icon _Name:"));
diff --git a/gladeui/glade-private.h b/gladeui/glade-private.h
index acf8727..9f82580 100644
--- a/gladeui/glade-private.h
+++ b/gladeui/glade-private.h
@@ -61,11 +61,12 @@ _glade_project_properties_get_license_data (GladeProjectProperties *props,
 
 /* glade-utils.c */
 
-gchar *
-_glade_util_strreplace (gchar *str,
-                        gboolean free_str,
-                        const gchar *key,
-                        const gchar *replacement);
+void   _glade_util_dialog_set_hig (GtkDialog *dialog);
+
+gchar *_glade_util_strreplace (gchar *str,
+                               gboolean free_str,
+                               const gchar *key,
+                               const gchar *replacement);
 
 /* glade-xml-utils.c */
 
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index d69407d..791dbe5 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -175,6 +175,21 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname)
   return pspec;
 }
 
+void
+_glade_util_dialog_set_hig (GtkDialog *dialog)
+{
+  GtkWidget *vbox, *action_area;
+
+  /* HIG spacings */
+  vbox = gtk_dialog_get_content_area (dialog);
+  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+  gtk_box_set_spacing (GTK_BOX (vbox), 2); /* 2 * 5 + 2 = 12 */
+
+  action_area = gtk_dialog_get_action_area (dialog);
+  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
+  gtk_box_set_spacing (GTK_BOX (action_area), 6);
+}
+
 /**
  * glade_util_ui_message:
  * @parent: a #GtkWindow cast as a #GtkWidget