luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Use symbolic constants for interfaces from dbus-specification

Browse Source 
Most D-Bus interfaces are domain-specific, but these interfaces from the
D-Bus Specification are intended to be commonly used in any context for
which they are found to be appropriate.

Most of these use `gdbusprivate.h`. One exception is that
`gio/tests/gdbus-example-*` redefine the constants locally: due to these
files' dual role as part of the unit tests and as sample code, it seems
desirable to ensure that they can still be compiled outside GLib.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2024-05-13 13:00:34 +01:00
committed by Philip Withnall
parent b4f8d4a5d5
commit 7c609f8142
18 changed files with 95 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gio/tests/gdbus-export.c
View File

@@ -25,6 +25,7 @@
#include <string.h>
#include "gdbus-tests.h"
#include "gdbusprivate.h"
/* all tests rely on a shared mainloop */
static GMainLoop *loop = NULL;
@@ -377,7 +378,7 @@ get_nodes_at (GDBusConnection *c,
NULL,
g_dbus_connection_get_unique_name (c),
object_path,
"org.freedesktop.DBus.Introspectable",
DBUS_INTERFACE_INTROSPECTABLE,
NULL,
&error);
g_assert_no_error (error);
@@ -436,7 +437,7 @@ has_interface (GDBusConnection *c,
NULL,
g_dbus_connection_get_unique_name (c),
object_path,
"org.freedesktop.DBus.Introspectable",
DBUS_INTERFACE_INTROSPECTABLE,
NULL,
&error);
g_assert_no_error (error);
@@ -485,7 +486,7 @@ count_interfaces (GDBusConnection *c,
NULL,
g_dbus_connection_get_unique_name (c),
object_path,
"org.freedesktop.DBus.Introspectable",
DBUS_INTERFACE_INTROSPECTABLE,
NULL,
&error);
g_assert_no_error (error);
@@ -778,7 +779,7 @@ test_dispatch_thread_func (gpointer user_data)
/* generic interfaces */
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Peer.Ping",
DBUS_INTERFACE_PEER ".Ping",
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
@@ -858,7 +859,7 @@ test_dispatch_thread_func (gpointer user_data)
/* user properties */
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Properties.Get",
DBUS_INTERFACE_PROPERTIES ".Get",
g_variant_new ("(ss)",
"org.example.Foo",
"PropertyUno"),
@@ -877,7 +878,7 @@ test_dispatch_thread_func (gpointer user_data)
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Properties.Get",
DBUS_INTERFACE_PROPERTIES ".Get",
g_variant_new ("(ss)",
"org.example.Foo",
"ThisDoesntExist"),
@@ -892,7 +893,7 @@ test_dispatch_thread_func (gpointer user_data)
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Properties.Get",
DBUS_INTERFACE_PROPERTIES ".Get",
g_variant_new ("(ss)",
"org.example.Foo",
"NotReadable"),
@@ -907,7 +908,7 @@ test_dispatch_thread_func (gpointer user_data)
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Properties.Set",
DBUS_INTERFACE_PROPERTIES ".Set",
g_variant_new ("(ssv)",
"org.example.Foo",
"NotReadable",
@@ -928,7 +929,7 @@ test_dispatch_thread_func (gpointer user_data)
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Properties.Set",
DBUS_INTERFACE_PROPERTIES ".Set",
g_variant_new ("(ssv)",
"org.example.Foo",
"NotWritable",
@@ -944,7 +945,7 @@ test_dispatch_thread_func (gpointer user_data)
error = NULL;
value = g_dbus_proxy_call_sync (foo_proxy,
"org.freedesktop.DBus.Properties.GetAll",
DBUS_INTERFACE_PROPERTIES ".GetAll",
g_variant_new ("(s)",
"org.example.Foo"),
G_DBUS_CALL_FLAGS_NONE,
@@ -1466,7 +1467,7 @@ static const GDBusInterfaceInfo test_interface_info1 =
static const GDBusInterfaceInfo test_interface_info2 =
{
-1,
"org.freedesktop.DBus.Properties",
DBUS_INTERFACE_PROPERTIES,
(GDBusMethodInfo **) NULL,
(GDBusSignalInfo **) NULL,
(GDBusPropertyInfo **) NULL,
@@ -1491,7 +1492,7 @@ check_interfaces (GDBusConnection *c,
NULL,
g_dbus_connection_get_unique_name (c),
object_path,
"org.freedesktop.DBus.Introspectable",
DBUS_INTERFACE_INTROSPECTABLE,
NULL,
&error);
g_assert_no_error (error);
@@ -1555,8 +1556,8 @@ test_registered_interfaces (void)
guint id1, id2;
const gchar *interfaces[] = {
"org.example.Foo",
"org.freedesktop.DBus.Properties",
"org.freedesktop.DBus.Introspectable",
DBUS_INTERFACE_PROPERTIES,
DBUS_INTERFACE_INTROSPECTABLE,
NULL,
};
@@ -1607,10 +1608,10 @@ test_async_method_call (GDBusConnection *connection,
const GDBusPropertyInfo *property;
/* Strictly speaking, this function should also expect to receive
* method calls not on the org.freedesktop.DBus.Properties interface,
* method calls not on the DBUS_INTERFACE_PROPERTIES interface,
* but we don't do any during this testcase, so assert that.
*/
g_assert_cmpstr (interface_name, ==, "org.freedesktop.DBus.Properties");
g_assert_cmpstr (interface_name, ==, DBUS_INTERFACE_PROPERTIES);
g_assert_null (g_dbus_method_invocation_get_method_info (invocation));
property = g_dbus_method_invocation_get_property_info (invocation);
@@ -1714,7 +1715,7 @@ test_async_case (GDBusConnection *connection,
va_start (ap, format_string);
g_dbus_connection_call (connection, g_dbus_connection_get_unique_name (connection), "/foo",
"org.freedesktop.DBus.Properties", method, g_variant_new_va (format_string, NULL, &ap),
DBUS_INTERFACE_PROPERTIES, method, g_variant_new_va (format_string, NULL, &ap),
NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, ensure_result_cb, (gpointer) expected_reply);
va_end (ap);