[glade] GladeGtkNotebook: simplified glade_gtk_box_notebook_child_insert_remove_action() function params

[Juan Pablo Ugarte <jpu src gnome org>]

commit db6ab943484b6279ded235eb218227fbdb6c5c2e
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Fri May 20 16:59:39 2016 -0300

    GladeGtkNotebook: simplified glade_gtk_box_notebook_child_insert_remove_action() function params

 plugins/gtk+/glade-gtk-notebook.c |   50 +++++++++++++++---------------------
 plugins/gtk+/glade-gtk-notebook.h |   13 +++------
 2 files changed, 26 insertions(+), 37 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk-notebook.c b/plugins/gtk+/glade-gtk-notebook.c
index 8393bb2..b5a59bf 100644
--- a/plugins/gtk+/glade-gtk-notebook.c
+++ b/plugins/gtk+/glade-gtk-notebook.c
@@ -927,31 +927,25 @@ glade_gtk_notebook_get_child_property (GladeWidgetAdaptor * adaptor,
 }
 
 void
-glade_gtk_notebook_child_action_activate (GladeWidgetAdaptor * adaptor,
-                                          GObject * container,
-                                          GObject * object,
-                                          const gchar * action_path)
+glade_gtk_notebook_child_action_activate (GladeWidgetAdaptor *adaptor,
+                                          GObject            *container,
+                                          GObject            *object,
+                                          const gchar        *action_path)
 {
   if (strcmp (action_path, "insert_page_after") == 0)
     {
       glade_gtk_box_notebook_child_insert_remove_action (adaptor, container,
-                                                         object, "pages",
-                                                         TRUE, TRUE,
-                                                         FALSE, TRUE);
+                                                         object, FALSE, TRUE);
     }
   else if (strcmp (action_path, "insert_page_before") == 0)
     {
       glade_gtk_box_notebook_child_insert_remove_action (adaptor, container,
-                                                         object, "pages",
-                                                         TRUE, TRUE,
-                                                         FALSE, FALSE);
+                                                         object, FALSE, FALSE);
     }
   else if (strcmp (action_path, "remove_page") == 0)
     {
       glade_gtk_box_notebook_child_insert_remove_action (adaptor, container,
-                                                         object, "pages",
-                                                         TRUE, FALSE,
-                                                         TRUE, TRUE);
+                                                         object, TRUE, TRUE);
     }
   else
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
@@ -962,21 +956,19 @@ glade_gtk_notebook_child_action_activate (GladeWidgetAdaptor * adaptor,
 
 /* Shared with glade-gtk-box.c */
 void
-glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor * adaptor,
-                                                   GObject * container,
-                                                   GObject * object,
-                                                   const gchar * size_prop,
-                                                   gboolean is_notebook,
-                                                   gboolean is_insert,
-                                                   gboolean remove,
-                                                   gboolean after)
+glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor *adaptor,
+                                                   GObject            *container,
+                                                   GObject            *object,
+                                                   gboolean            remove,
+                                                   gboolean            after)
 {
+  gboolean is_notebook = GTK_IS_NOTEBOOK (container);
+  const gchar *size_prop = (is_notebook) ? "pages" : "size";
   GladeWidget *parent;
   GList *children, *l;
   gint child_pos, size, offset;
 
-  if (GTK_IS_NOTEBOOK (container) &&
-      g_object_get_data (object, "special-child-type"))
+  if (is_notebook && g_object_get_data (object, "special-child-type"))
     /* Its a Tab! */
     child_pos = notebook_search_tab (GTK_NOTEBOOK (container),
                                      GTK_WIDGET (object));
@@ -987,17 +979,17 @@ glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor * adaptor,
   parent = glade_widget_get_from_gobject (container);
   if (is_notebook)
     {
-      if (is_insert)
-        glade_command_push_group (_("Insert page on %s"), glade_widget_get_name (parent));
-      else
+      if (remove)
         glade_command_push_group (_("Remove page from %s"), glade_widget_get_name (parent));
+      else
+        glade_command_push_group (_("Insert page on %s"), glade_widget_get_name (parent));
     }
   else
     {
-      if (is_insert)
-        glade_command_push_group (_("Insert placeholder to %s"), glade_widget_get_name (parent));
-      else
+      if (remove)
         glade_command_push_group (_("Remove placeholder from %s"), glade_widget_get_name (parent));
+      else
+        glade_command_push_group (_("Insert placeholder to %s"), glade_widget_get_name (parent));
     }
 
   /* Make sure widgets does not get destroyed */
diff --git a/plugins/gtk+/glade-gtk-notebook.h b/plugins/gtk+/glade-gtk-notebook.h
index 90b0aa1..2814b73 100644
--- a/plugins/gtk+/glade-gtk-notebook.h
+++ b/plugins/gtk+/glade-gtk-notebook.h
@@ -26,14 +26,11 @@
 
 G_BEGIN_DECLS
 
-void glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor * adaptor,
-                                                       GObject * container,
-                                                       GObject * object,
-                                                       const gchar * size_prop,
-                                                       gboolean is_notebook,
-                                                       gboolean is_insert,
-                                                       gboolean remove,
-                                                       gboolean after);
+void glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor *adaptor,
+                                                       GObject            *container,
+                                                       GObject            *object,
+                                                       gboolean            remove,
+                                                       gboolean            after);
 
 
 G_END_DECLS