[glade] Move GladeWidgetAdaptor code for GtkDialog into it's own C file

[Tristan Van Berkom <tvb src gnome org>]

commit 7160b30eb58bc1465f3142825aab0b675078cfee
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri May 3 22:47:58 2013 +0900

    Move GladeWidgetAdaptor code for GtkDialog into it's own C file

 plugins/gtk+/Makefile.am        |    2 +
 plugins/gtk+/glade-gtk-dialog.c |  194 +++++++++++++++++++++++++++++++++++++++
 plugins/gtk+/glade-gtk-dialog.h |   34 +++++++
 plugins/gtk+/glade-gtk.c        |  167 +---------------------------------
 po/POTFILES.in                  |    1 +
 5 files changed, 232 insertions(+), 166 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index ce52dcc..61396bd 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -37,6 +37,7 @@ libgladegtk_la_SOURCES =              \
        glade-gtk-action-widgets.c      \
        glade-gtk-box.c                 \
        glade-gtk-container.c           \
+       glade-gtk-dialog.c              \
        glade-gtk-entry.c               \
        glade-gtk-expander.c            \
        glade-gtk-fixed-layout.c        \
@@ -78,6 +79,7 @@ noinst_HEADERS =                      \
        glade-fixed.h                   \
        glade-gtk.h                     \
        glade-gtk-action-widgets.h      \
+       glade-gtk-dialog.h              \
        glade-gtk-frame.h               \
        glade-gtk-notebook.h            \
        glade-icon-factory-editor.h     \
diff --git a/plugins/gtk+/glade-gtk-dialog.c b/plugins/gtk+/glade-gtk-dialog.c
new file mode 100644
index 0000000..baec69d
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-dialog.c
@@ -0,0 +1,194 @@
+/*
+ * glade-gtk-dialog.c - GladeWidgetAdaptor for GtkDialog
+ *
+ * Copyright (C) 2013 Tristan Van Berkom
+ *
+ * Authors:
+ *      Tristan Van Berkom <tristan van berkom gmail com>
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public 
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <config.h>
+#include <glib/gi18n-lib.h>
+#include <gladeui/glade.h>
+
+#include "glade-gtk-action-widgets.h"
+#include "glade-gtk-dialog.h"
+
+static void
+glade_gtk_stop_emission_POINTER (gpointer instance, gpointer dummy,
+                                 gpointer data)
+{
+  g_signal_stop_emission (instance, GPOINTER_TO_UINT (data), 0);
+}
+
+static void
+glade_gtk_dialog_stop_offending_signals (GtkWidget * widget)
+{
+  static gpointer hierarchy = NULL, screen;
+
+  if (hierarchy == NULL)
+    {
+      hierarchy = GUINT_TO_POINTER (g_signal_lookup ("hierarchy-changed",
+                                                     GTK_TYPE_WIDGET));
+      screen = GUINT_TO_POINTER (g_signal_lookup ("screen-changed",
+                                                  GTK_TYPE_WIDGET));
+    }
+
+  g_signal_connect (widget, "hierarchy-changed",
+                    G_CALLBACK (glade_gtk_stop_emission_POINTER), hierarchy);
+  g_signal_connect (widget, "screen-changed",
+                    G_CALLBACK (glade_gtk_stop_emission_POINTER), screen);
+}
+
+static void
+glade_gtk_file_chooser_forall (GtkWidget * widget, gpointer data)
+{
+  /* GtkFileChooserWidget packs a GtkFileChooserDefault */
+  if (GTK_IS_FILE_CHOOSER_WIDGET (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                          glade_gtk_file_chooser_default_forall, NULL);
+}
+
+void
+glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
+                              GObject *object, GladeCreateReason reason)
+{
+  GladeWidget *widget, *vbox_widget, *actionarea_widget;
+  GtkDialog *dialog;
+
+  g_return_if_fail (GTK_IS_DIALOG (object));
+
+  widget = glade_widget_get_from_gobject (GTK_WIDGET (object));
+  if (!widget)
+    return;
+  
+  dialog = GTK_DIALOG (object);
+  
+  if (reason == GLADE_CREATE_USER)
+    {
+      /* HIG complient border-width defaults on dialogs */
+      glade_widget_property_set (widget, "border-width", 5);
+    }
+
+  vbox_widget = glade_widget_get_from_gobject (gtk_dialog_get_content_area (dialog));
+  actionarea_widget = glade_widget_get_from_gobject (gtk_dialog_get_action_area (dialog));
+
+  /* We need to stop default emissions of "hierarchy-changed" and 
+   * "screen-changed" of GtkFileChooserDefault to avoid an abort()
+   * when doing a reparent.
+   * GtkFileChooserDialog packs a GtkFileChooserWidget in 
+   * his internal vbox.
+   */
+  if (GTK_IS_FILE_CHOOSER_DIALOG (object))
+    gtk_container_forall (GTK_CONTAINER
+                          (gtk_dialog_get_content_area (dialog)),
+                          glade_gtk_file_chooser_forall, NULL);
+
+  /* These properties are controlled by the GtkDialog style properties:
+   * "content-area-border", "button-spacing" and "action-area-border",
+   * so we must disable thier use.
+   */
+  glade_widget_remove_property (vbox_widget, "border-width");
+  glade_widget_remove_property (actionarea_widget, "border-width");
+  glade_widget_remove_property (actionarea_widget, "spacing");
+
+  if (reason == GLADE_CREATE_LOAD || reason == GLADE_CREATE_USER)
+    {
+      GObject *child;
+      gint size;
+
+      if (GTK_IS_COLOR_SELECTION_DIALOG (object))
+        {
+          child = glade_widget_adaptor_get_internal_child (adaptor, object, "color_selection");
+          size = 1;
+        }
+      else if (GTK_IS_FONT_SELECTION_DIALOG (object))
+        {
+          child = glade_widget_adaptor_get_internal_child (adaptor, object, "font_selection");
+          size = 2;
+        }
+      else
+        size = -1;
+
+      /* Set this to a sane value. At load time, if there are any children then
+       * size will adjust appropriately (otherwise the default "3" gets
+       * set and we end up with extra placeholders).
+       */
+      if (size > -1)
+        glade_widget_property_set (glade_widget_get_from_gobject (child),
+                                   "size", size);
+    }
+
+  /* Only set these on the original create. */
+  if (reason == GLADE_CREATE_USER)
+    {
+      /* HIG complient spacing defaults on dialogs */
+      glade_widget_property_set (vbox_widget, "spacing", 2);
+
+      if (GTK_IS_ABOUT_DIALOG (object) ||
+          GTK_IS_FILE_CHOOSER_DIALOG (object))
+        glade_widget_property_set (vbox_widget, "size", 3);
+      else
+        glade_widget_property_set (vbox_widget, "size", 2);
+
+      glade_widget_property_set (actionarea_widget, "size", 2);
+      glade_widget_property_set (actionarea_widget, "layout-style",
+                                 GTK_BUTTONBOX_END);
+    }
+}
+
+void
+glade_gtk_dialog_read_child (GladeWidgetAdaptor * adaptor,
+                             GladeWidget * widget, GladeXmlNode * node)
+{
+  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
+
+  node = glade_xml_node_get_parent (node);
+
+  glade_gtk_action_widgets_read_child (widget, node, "action_area");
+}
+
+void
+glade_gtk_dialog_write_child (GladeWidgetAdaptor * adaptor,
+                              GladeWidget * widget,
+                              GladeXmlContext * context, GladeXmlNode * node)
+{
+  GladeWidget *parent = glade_widget_get_parent (widget);
+
+  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
+
+  if (parent && GTK_IS_DIALOG (glade_widget_get_object (parent)))
+    glade_gtk_action_widgets_write_child (parent, context, node, "action_area");
+}
+
+/* Shared with file chooser widget */
+void
+glade_gtk_file_chooser_default_forall (GtkWidget * widget, gpointer data)
+{
+  /* Since GtkFileChooserDefault is not exposed we check if its a
+   * GtkFileChooser
+   */
+  if (GTK_IS_FILE_CHOOSER (widget))
+    {
+
+      /* Finally we can connect to the signals we want to stop its
+       * default handler. Since both signals has the same signature
+       * we use one callback for both :)
+       */
+      glade_gtk_dialog_stop_offending_signals (widget);
+    }
+}
diff --git a/plugins/gtk+/glade-gtk-dialog.h b/plugins/gtk+/glade-gtk-dialog.h
new file mode 100644
index 0000000..e8c95e1
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-dialog.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Tristan Van Berkom.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public 
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ *   Tristan Van Berkom <tvb gnome org>
+ */
+#ifndef _GLADE_GTK_DIALOG_H_
+#define _GLADE_GTK_DIALOG_H_
+
+#include <gtk/gtk.h>
+#include <gladeui/glade.h>
+
+G_BEGIN_DECLS
+
+void glade_gtk_file_chooser_default_forall (GtkWidget * widget, gpointer data);
+
+
+G_END_DECLS
+
+#endif  /* _GLADE_GTK_DIALOG_H_ */
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 177fe58..ce3fc8f 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -48,6 +48,7 @@
 #include "glade-tool-item-group-editor.h"
 #include "glade-treeview-editor.h"
 #include "glade-window-editor.h"
+#include "glade-gtk-dialog.h"
 
 #include <gladeui/glade-editor-property.h>
 #include <gladeui/glade-base-editor.h>
@@ -70,14 +71,6 @@ empty (GObject * container, GladeCreateReason reason)
 {
 }
 
-/* This function is used to stop default handlers  */
-static void
-glade_gtk_stop_emission_POINTER (gpointer instance, gpointer dummy,
-                                 gpointer data)
-{
-  g_signal_stop_emission (instance, GPOINTER_TO_UINT (data), 0);
-}
-
 
 /* Initialize needed pspec types from here */
 void
@@ -87,164 +80,6 @@ glade_gtk_init (const gchar * name)
 
 
 
-/* ----------------------------- GtkDialog(s) ------------------------------ */
-static void
-glade_gtk_dialog_stop_offending_signals (GtkWidget * widget)
-{
-  static gpointer hierarchy = NULL, screen;
-
-  if (hierarchy == NULL)
-    {
-      hierarchy = GUINT_TO_POINTER (g_signal_lookup ("hierarchy-changed",
-                                                     GTK_TYPE_WIDGET));
-      screen = GUINT_TO_POINTER (g_signal_lookup ("screen-changed",
-                                                  GTK_TYPE_WIDGET));
-    }
-
-  g_signal_connect (widget, "hierarchy-changed",
-                    G_CALLBACK (glade_gtk_stop_emission_POINTER), hierarchy);
-  g_signal_connect (widget, "screen-changed",
-                    G_CALLBACK (glade_gtk_stop_emission_POINTER), screen);
-}
-
-static void
-glade_gtk_file_chooser_default_forall (GtkWidget * widget, gpointer data)
-{
-  /* Since GtkFileChooserDefault is not exposed we check if its a
-   * GtkFileChooser
-   */
-  if (GTK_IS_FILE_CHOOSER (widget))
-    {
-
-      /* Finally we can connect to the signals we want to stop its
-       * default handler. Since both signals has the same signature
-       * we use one callback for both :)
-       */
-      glade_gtk_dialog_stop_offending_signals (widget);
-    }
-}
-
-static void
-glade_gtk_file_chooser_forall (GtkWidget * widget, gpointer data)
-{
-  /* GtkFileChooserWidget packs a GtkFileChooserDefault */
-  if (GTK_IS_FILE_CHOOSER_WIDGET (widget))
-    gtk_container_forall (GTK_CONTAINER (widget),
-                          glade_gtk_file_chooser_default_forall, NULL);
-}
-
-void
-glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
-                              GObject *object, GladeCreateReason reason)
-{
-  GladeWidget *widget, *vbox_widget, *actionarea_widget;
-  GtkDialog *dialog;
-
-  g_return_if_fail (GTK_IS_DIALOG (object));
-
-  widget = glade_widget_get_from_gobject (GTK_WIDGET (object));
-  if (!widget)
-    return;
-  
-  dialog = GTK_DIALOG (object);
-  
-  if (reason == GLADE_CREATE_USER)
-    {
-      /* HIG complient border-width defaults on dialogs */
-      glade_widget_property_set (widget, "border-width", 5);
-    }
-
-  vbox_widget = glade_widget_get_from_gobject (gtk_dialog_get_content_area (dialog));
-  actionarea_widget = glade_widget_get_from_gobject (gtk_dialog_get_action_area (dialog));
-
-  /* We need to stop default emissions of "hierarchy-changed" and 
-   * "screen-changed" of GtkFileChooserDefault to avoid an abort()
-   * when doing a reparent.
-   * GtkFileChooserDialog packs a GtkFileChooserWidget in 
-   * his internal vbox.
-   */
-  if (GTK_IS_FILE_CHOOSER_DIALOG (object))
-    gtk_container_forall (GTK_CONTAINER
-                          (gtk_dialog_get_content_area (dialog)),
-                          glade_gtk_file_chooser_forall, NULL);
-
-  /* These properties are controlled by the GtkDialog style properties:
-   * "content-area-border", "button-spacing" and "action-area-border",
-   * so we must disable thier use.
-   */
-  glade_widget_remove_property (vbox_widget, "border-width");
-  glade_widget_remove_property (actionarea_widget, "border-width");
-  glade_widget_remove_property (actionarea_widget, "spacing");
-
-  if (reason == GLADE_CREATE_LOAD || reason == GLADE_CREATE_USER)
-    {
-      GObject *child;
-      gint size;
-
-      if (GTK_IS_COLOR_SELECTION_DIALOG (object))
-        {
-          child = glade_widget_adaptor_get_internal_child (adaptor, object, "color_selection");
-          size = 1;
-        }
-      else if (GTK_IS_FONT_SELECTION_DIALOG (object))
-        {
-          child = glade_widget_adaptor_get_internal_child (adaptor, object, "font_selection");
-          size = 2;
-        }
-      else
-        size = -1;
-
-      /* Set this to a sane value. At load time, if there are any children then
-       * size will adjust appropriately (otherwise the default "3" gets
-       * set and we end up with extra placeholders).
-       */
-      if (size > -1)
-        glade_widget_property_set (glade_widget_get_from_gobject (child),
-                                   "size", size);
-    }
-
-  /* Only set these on the original create. */
-  if (reason == GLADE_CREATE_USER)
-    {
-      /* HIG complient spacing defaults on dialogs */
-      glade_widget_property_set (vbox_widget, "spacing", 2);
-
-      if (GTK_IS_ABOUT_DIALOG (object) ||
-          GTK_IS_FILE_CHOOSER_DIALOG (object))
-        glade_widget_property_set (vbox_widget, "size", 3);
-      else
-        glade_widget_property_set (vbox_widget, "size", 2);
-
-      glade_widget_property_set (actionarea_widget, "size", 2);
-      glade_widget_property_set (actionarea_widget, "layout-style",
-                                 GTK_BUTTONBOX_END);
-    }
-}
-
-void
-glade_gtk_dialog_read_child (GladeWidgetAdaptor * adaptor,
-                             GladeWidget * widget, GladeXmlNode * node)
-{
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
-
-  node = glade_xml_node_get_parent (node);
-
-  glade_gtk_action_widgets_read_child (widget, node, "action_area");
-}
-
-void
-glade_gtk_dialog_write_child (GladeWidgetAdaptor * adaptor,
-                              GladeWidget * widget,
-                              GladeXmlContext * context, GladeXmlNode * node)
-{
-  GladeWidget *parent = glade_widget_get_parent (widget);
-
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
-
-  if (parent && GTK_IS_DIALOG (glade_widget_get_object (parent)))
-    glade_gtk_action_widgets_write_child (parent, context, node, "action_area");
-}
-
 /*--------------------------- GtkMessageDialog ---------------------------------*/
 static gboolean
 glade_gtk_message_dialog_reset_image (GtkMessageDialog * dialog)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec8f512..76c31d0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -65,6 +65,7 @@ plugins/gtk+/glade-gtk.c
 plugins/gtk+/glade-gtk-about-dialog.c
 plugins/gtk+/glade-gtk-box.c
 plugins/gtk+/glade-gtk-container.c
+plugins/gtk+/glade-gtk-dialog.c
 plugins/gtk+/glade-gtk-entry.c
 plugins/gtk+/glade-gtk-expander.c
 plugins/gtk+/glade-gtk-fixed-layout.c