[gtk+/wip/matthiasc/tab-strip: 1/10] Move gtk_object_handled_accumulator



commit 21804b09b46fe321c9a746e8e9e9e0fc96e387a0
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 21 10:11:56 2016 -0400

    Move gtk_object_handled_accumulator
    
    This used to live in gtknotebook.c. Since we may use it in
    other places in the future, move it to gtkprivate.c where we
    already have other shared accumulators.

 gtk/gtknotebook.c |   16 ----------------
 gtk/gtkprivate.c  |   16 ++++++++++++++++
 gtk/gtkprivate.h  |    5 +++++
 3 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 259b79a..b4e32de 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -644,22 +644,6 @@ add_reorder_bindings (GtkBindingSet    *binding_set,
                                 G_TYPE_BOOLEAN, move_to_last);
 }
 
-static gboolean
-gtk_object_handled_accumulator (GSignalInvocationHint *ihint,
-                                GValue                *return_accu,
-                                const GValue          *handler_return,
-                                gpointer               dummy)
-{
-  gboolean continue_emission;
-  GObject *object;
-
-  object = g_value_get_object (handler_return);
-  g_value_set_object (return_accu, object);
-  continue_emission = !object;
-
-  return continue_emission;
-}
-
 static void
 gtk_notebook_compute_expand (GtkWidget *widget,
                              gboolean  *hexpand_p,
diff --git a/gtk/gtkprivate.c b/gtk/gtkprivate.c
index 8f0da6d..e1c888a 100644
--- a/gtk/gtkprivate.c
+++ b/gtk/gtkprivate.c
@@ -158,6 +158,22 @@ _gtk_single_string_accumulator (GSignalInvocationHint *ihint,
   return continue_emission;
 }
 
+gboolean
+gtk_object_handled_accumulator (GSignalInvocationHint *ihint,
+                                GValue                *return_accu,
+                                const GValue          *handler_return,
+                                gpointer               dummy)
+{
+  gboolean continue_emission;
+  GObject *object;
+
+  object = g_value_get_object (handler_return);
+  g_value_set_object (return_accu, object);
+  continue_emission = !object;
+
+  return continue_emission;
+}
+
 GdkModifierType
 _gtk_replace_virtual_modifiers (GdkKeymap       *keymap,
                                 GdkModifierType  modifiers)
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 7602394..3fa6ba4 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -73,6 +73,11 @@ gboolean _gtk_single_string_accumulator   (GSignalInvocationHint *ihint,
                                            const GValue          *handler_return,
                                            gpointer               dummy);
 
+gboolean gtk_object_handled_accumulator   (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
+
 GdkModifierType _gtk_replace_virtual_modifiers (GdkKeymap       *keymap,
                                                 GdkModifierType  modifiers);
 GdkModifierType _gtk_get_primary_accel_mod     (void);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]