diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/glib/Makefile.am | 4 | ||||
-rw-r--r-- | test/glib/test-dbus-glib.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am index 58f4d778..b0b8361a 100644 --- a/test/glib/Makefile.am +++ b/test/glib/Makefile.am @@ -44,10 +44,10 @@ test_service_glib_SOURCES= \ BUILT_SOURCES = test-service-glib-glue.h test-service-glib-bindings.h -test-service-glib-glue.h: test-service-glib.xml +test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/glib/dbus-binding-tool $(top_builddir)/glib/dbus-binding-tool --mode=glib-server --output=test-service-glib-glue.h test-service-glib.xml -test-service-glib-bindings.h: test-service-glib.xml +test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/glib/dbus-binding-tool $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=test-service-glib-bindings.h test-service-glib.xml CLEANFILES = test-service-glib-glue.h test-service-glib-bindings.h diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c index 0c2078e5..b0dc9efc 100644 --- a/test/glib/test-dbus-glib.c +++ b/test/glib/test-dbus-glib.c @@ -267,7 +267,7 @@ main (int argc, char **argv) lose ("ThrowError call unexpectedly succeeded!"); g_print ("ThrowError failed (as expected) returned error: %s\n", error->message); - g_error_free (error); + g_clear_error (&error); v_STRING = "foobar"; call = dbus_g_proxy_begin_call (proxy, "Uppercase", @@ -313,12 +313,13 @@ main (int argc, char **argv) lose ("(wrapped) ThrowError call unexpectedly succeeded!"); g_print ("(wrapped) ThrowError failed (as expected) returned error: %s\n", error->message); - g_error_free (error); + g_clear_error (&error); if (!org_freedesktop_DBus_Tests_MyObject_uppercase (proxy, "foobar", &v_STRING_2, &error)) lose_gerror ("Failed to complete (wrapped) Uppercase call", error); if (strcmp ("FOOBAR", v_STRING_2) != 0) lose ("(wrapped) Uppercase call returned unexpected string %s", v_STRING_2); + g_free (v_STRING_2); if (!org_freedesktop_DBus_Tests_MyObject_many_args (proxy, 26, "bazwhee", G_PI, &v_DOUBLE_2, &v_STRING_2, &error)) @@ -330,6 +331,7 @@ main (int argc, char **argv) if (strcmp ("BAZWHEE", v_STRING_2) != 0) lose ("(wrapped) ManyArgs call returned unexpected string %s", v_STRING_2); + g_free (v_STRING_2); g_object_unref (G_OBJECT (proxy)); |