summaryrefslogtreecommitdiff
path: root/bus
diff options
context:
space:
mode:
Diffstat (limited to 'bus')
-rw-r--r--bus/dbusimpl.c3
-rw-r--r--bus/test-matchrule.c2
-rw-r--r--bus/test-registry.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 7b8294b2..4a4781a4 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -733,7 +733,8 @@ bus_dbus_impl_name_has_owner (BusDBusImpl *dbus,
g_dbus_method_invocation_return_error (invocation,
G_DBUS_ERROR,
G_DBUS_ERROR_FAILED,
- "'%s' is not a legal bus name");
+ "'%s' is not a legal bus name",
+ name ? name : "(null)");
return;
}
diff --git a/bus/test-matchrule.c b/bus/test-matchrule.c
index d2e2648c..d85fc90c 100644
--- a/bus/test-matchrule.c
+++ b/bus/test-matchrule.c
@@ -20,7 +20,9 @@ int
main(gint argc, gchar **argv)
{
BusMatchRule *rule, *rule1;
+#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
+#endif
rule = bus_match_rule_new (" type='signal' , interface = 'org.freedesktop.IBus' ");
g_assert (rule->message_type == G_DBUS_MESSAGE_TYPE_SIGNAL);
diff --git a/bus/test-registry.c b/bus/test-registry.c
index 97f05790..22572204 100644
--- a/bus/test-registry.c
+++ b/bus/test-registry.c
@@ -3,7 +3,9 @@
int main()
{
+#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
+#endif
BusRegistry *registry = bus_registry_new ();
g_object_unref (registry);
return 0;