diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-18 18:20:06 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 18:07:14 +0000 |
| commit | 7b7810b5f295b4d769f96b695b2e1eae82c6b476 (patch) | |
| tree | 0727aa1c83ad219f5219471403eaee3610330e97 | |
| parent | 02af0f5eef7405c14edeb8fdd33379d08b5e542f (diff) | |
check-node-properties: use dbus_g_type_specialized_init()
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/check-node-properties.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ae63a5ca..85c604d9 100644 --- a/configure.ac +++ b/configure.ac @@ -165,7 +165,7 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) dnl Check for D-Bus -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61]) +PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.82]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) diff --git a/tests/check-node-properties.c b/tests/check-node-properties.c index 0fc030cb..a02ee45d 100644 --- a/tests/check-node-properties.c +++ b/tests/check-node-properties.c @@ -83,6 +83,8 @@ test_extract_properties (void) GArray *prop4_value; gboolean prop5_value; + dbus_g_type_specialized_init (); + stanza = create_sample_stanza (); node = wocky_node_get_child (wocky_stanza_get_top_node (stanza), "properties"); @@ -151,6 +153,8 @@ create_sample_properties (void) GValue *prop1, *prop2, *prop3, *prop4, *prop5; GArray *arr; + dbus_g_type_specialized_init (); + properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) test_g_value_slice_free); @@ -249,9 +253,6 @@ main (int argc, g_test_init (&argc, &argv, NULL); g_type_init (); - /* to initiate D-Bus types */ - dbus_g_bus_get (DBUS_BUS_STARTER, NULL); - g_test_add_func ("/node-properties/extract-properties", test_extract_properties); g_test_add_func ("/node-properties/add-children-from-properties", |