diff options
author | Simon McVittie <smcv@collabora.com> | 2020-08-03 16:08:55 +0100 |
---|---|---|
committer | Simon McVittie <smcv@collabora.com> | 2020-08-10 09:58:01 +0100 |
commit | 91a01a6522b63707ff8315600045067886a4113a (patch) | |
tree | eb6a48112ad5bdaac9957edc705449d9c83a2a16 | |
parent | 1bfb55b6ed320c3d1853b9255056f202f0da62c8 (diff) | |
download | glib-wip/smcv/invocation-handled.tar.gz |
GDBus: Use G_DBUS_METHOD_INVOCATION_HANDLED in method implementationswip/smcv/invocation-handled
Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r-- | gio/tests/gdbus-example-objectmanager-server.c | 2 | ||||
-rw-r--r-- | gio/tests/gdbus-peer.c | 2 | ||||
-rw-r--r-- | gio/tests/gdbus-test-codegen.c | 37 |
3 files changed, 23 insertions, 18 deletions
diff --git a/gio/tests/gdbus-example-objectmanager-server.c b/gio/tests/gdbus-example-objectmanager-server.c index c460e66e9..dcedba2d1 100644 --- a/gio/tests/gdbus-example-objectmanager-server.c +++ b/gio/tests/gdbus-example-objectmanager-server.c @@ -53,7 +53,7 @@ on_animal_poke (ExampleAnimal *animal, g_assert_not_reached (); out: - return TRUE; /* to indicate that the method was handled */ + return G_DBUS_METHOD_INVOCATION_HANDLED; } diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c index 008e3fc81..ca53528d2 100644 --- a/gio/tests/gdbus-peer.c +++ b/gio/tests/gdbus-peer.c @@ -1719,7 +1719,7 @@ codegen_on_animal_poke (ExampleAnimal *animal, g_assert_not_reached (); out: - return TRUE; /* to indicate that the method was handled */ + return G_DBUS_METHOD_INVOCATION_HANDLED; } /* Runs in thread we created GDBusServer in (since we didn't pass G_DBUS_SERVER_FLAGS_RUN_IN_THREAD) */ diff --git a/gio/tests/gdbus-test-codegen.c b/gio/tests/gdbus-test-codegen.c index bb1d059ca..ce53137ca 100644 --- a/gio/tests/gdbus-test-codegen.c +++ b/gio/tests/gdbus-test-codegen.c @@ -33,6 +33,11 @@ #include "gdbus-test-codegen-generated-interface-info.h" +#if GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_66 +# undef G_DBUS_METHOD_INVOCATION_HANDLED +# define G_DBUS_METHOD_INVOCATION_HANDLED TRUE +#endif + /* ---------------------------------------------------------------------------------------------------- */ static guint @@ -100,7 +105,7 @@ on_handle_hello_world (FooiGenBar *object, response = g_strdup_printf ("Word! You said '%s'. I'm Skeleton, btw!", greeting); foo_igen_bar_complete_hello_world (object, invocation, response); g_free (response); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -145,7 +150,7 @@ on_handle_test_primitive_types (FooiGenBar *object, g_free (s1); g_free (s2); g_free (s3); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -185,7 +190,7 @@ on_handle_test_non_primitive_types (FooiGenBar *object, array_of_bytestrings, str->str); g_string_free (str, TRUE); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -202,7 +207,7 @@ on_handle_request_signal_emission (FooiGenBar *object, foo_igen_bar_emit_test_signal (object, 43, a_strv, a_bytestring_array, a_variant); /* consumes a_variant */ foo_igen_bar_complete_request_signal_emission (object, invocation); } - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -218,7 +223,7 @@ on_handle_request_multi_property_mods (FooiGenBar *object, foo_igen_bar_set_y (object, foo_igen_bar_get_y (object) + 1); foo_igen_bar_set_i (object, foo_igen_bar_get_i (object) + 1); foo_igen_bar_complete_request_multi_property_mods (object, invocation); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -238,7 +243,7 @@ on_handle_property_cancellation (FooiGenBar *object, g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (object)); /* this makes us return the reply D-Bus method */ foo_igen_bar_complete_property_cancellation (object, invocation); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } /* ---------------------------------------------------------------------------------------------------- */ @@ -293,7 +298,7 @@ on_handle_force_method (FooiGenBat *object, g_variant_unref (ret_ay); g_variant_unref (ret_struct); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } @@ -382,7 +387,7 @@ on_handle_check_not_authorized (FooiGenAuthorize *object, gpointer user_data) { foo_igen_authorize_complete_check_not_authorized (object, invocation); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -391,7 +396,7 @@ on_handle_check_authorized (FooiGenAuthorize *object, gpointer user_data) { foo_igen_authorize_complete_check_authorized (object, invocation); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -400,7 +405,7 @@ on_handle_check_not_authorized_from_object (FooiGenAuthorize *object, gpointer user_data) { foo_igen_authorize_complete_check_not_authorized_from_object (object, invocation); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } /* ---------------------------------------------------------------------------------------------------- */ @@ -414,7 +419,7 @@ on_handle_get_self (FooiGenMethodThreads *object, s = g_strdup_printf ("%p", (void *)g_thread_self ()); foo_igen_method_threads_complete_get_self (object, invocation, s); g_free (s); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } /* ---------------------------------------------------------------------------------------------------- */ @@ -2645,7 +2650,7 @@ handle_hello_fd (FooiGenFDPassing *object, const gchar *arg_greeting) { foo_igen_fdpassing_complete_hello_fd (object, invocation, fd_list, arg_greeting); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } #if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_64 @@ -2657,7 +2662,7 @@ handle_no_annotation (FooiGenFDPassing *object, const gchar *arg_greeting_locale) { foo_igen_fdpassing_complete_no_annotation (object, invocation, fd_list, arg_greeting, arg_greeting_locale); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -2667,7 +2672,7 @@ handle_no_annotation_nested (FooiGenFDPassing *object, GVariant *arg_files) { foo_igen_fdpassing_complete_no_annotation_nested (object, invocation, fd_list); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } #else static gboolean @@ -2677,7 +2682,7 @@ handle_no_annotation (FooiGenFDPassing *object, const gchar *arg_greeting_locale) { foo_igen_fdpassing_complete_no_annotation (object, invocation, arg_greeting, arg_greeting_locale); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } static gboolean @@ -2686,7 +2691,7 @@ handle_no_annotation_nested (FooiGenFDPassing *object, GVariant *arg_files) { foo_igen_fdpassing_complete_no_annotation_nested (object, invocation); - return TRUE; + return G_DBUS_METHOD_INVOCATION_HANDLED; } #endif |