From a6b8a3113bfd5fe9b28d3377865fed1ab1849ce0 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 12 Oct 2010 21:42:59 -0400 Subject: [PATCH] GApplication: use g_signal_accumulator_first_wins ...instead of our homebrew version. --- gio/gapplication.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gio/gapplication.c b/gio/gapplication.c index 3ff3ffd..8210db3 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -389,17 +389,6 @@ g_application_init (GApplication *application) GApplicationPrivate); } -static gboolean -first_wins_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer data) -{ - g_value_copy (handler_return, return_accu); - - return FALSE; -} - static void g_application_class_init (GApplicationClass *class) { @@ -473,7 +462,8 @@ g_application_class_init (GApplicationClass *class) g_application_signals[SIGNAL_COMMAND_LINE] = g_signal_new ("command-line", G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GApplicationClass, command_line), - first_wins_accumulator, NULL, _gio_marshal_INT__OBJECT, + g_signal_accumulator_first_wins, NULL, + _gio_marshal_INT__OBJECT, G_TYPE_INT, 1, G_TYPE_APPLICATION_COMMAND_LINE); g_type_class_add_private (class, sizeof (GApplicationPrivate)); -- 2.7.4