Merge 'master' into telepathy-glib-0.24 (the branch has only fixes)

5 files changed, 9 insertions, 9 deletions

diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 71f974c82..8cd47ca03 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -342,7 +342,7 @@ run-test.sh: run-test.sh.in
 		$< > $@
 	@chmod +x $@
 
-service_files = services/dbus-1/spurious.service
+service_files = dbus-1/services/spurious.service
 
 if ENABLE_INSTALLED_TESTS
 dbusservicedir = @tpglibtestsdir@/dbus-1/services
diff --git a/tests/dbus/account.c b/tests/dbus/account.c
index 1df043ab5..c10497869 100644
--- a/tests/dbus/account.c
+++ b/tests/dbus/account.c
@@ -980,7 +980,7 @@ main (int argc,
 
   g_test_add ("/account/reconnect", Test, NULL, setup_service, test_reconnect,
       teardown_service);
-  g_test_add ("/account/reconnect", Test, "vardict", setup_service,
+  g_test_add ("/account/reconnect/vardict", Test, "vardict", setup_service,
       test_reconnect, teardown_service);
 
   g_test_add ("/account/prepare/success", Test, NULL, setup_service,
@@ -991,15 +991,15 @@ main (int argc,
 
   g_test_add ("/account/storage", Test, "first", setup_service, test_storage,
       teardown_service);
-  g_test_add ("/account/storage", Test, "later", setup_service, test_storage,
-      teardown_service);
+  g_test_add ("/account/storage/later", Test, "later", setup_service,
+      test_storage, teardown_service);
 
   g_test_add ("/account/avatar", Test, NULL, setup_service, test_avatar,
       teardown_service);
 
   g_test_add ("/account/addressing", Test, "first", setup_service,
       test_addressing, teardown_service);
-  g_test_add ("/account/addressing", Test, "later", setup_service,
+  g_test_add ("/account/addressing/later", Test, "later", setup_service,
       test_addressing, teardown_service);
 
   return tp_tests_run_with_bus ();
diff --git a/tests/dbus/cm.c b/tests/dbus/cm.c
index ad4285475..e0f18eaa5 100644
--- a/tests/dbus/cm.c
+++ b/tests/dbus/cm.c
@@ -1187,7 +1187,7 @@ main (int argc,
 
   g_test_add ("/cm/list", Test, GINT_TO_POINTER (0),
       setup, test_list, teardown);
-  g_test_add ("/cm/list", Test, GINT_TO_POINTER (USE_OLD_LIST),
+  g_test_add ("/cm/list/old", Test, GINT_TO_POINTER (USE_OLD_LIST),
       setup, test_list, teardown);
 
   return tp_tests_run_with_bus ();
diff --git a/tests/dbus/contact-list-client.c b/tests/dbus/contact-list-client.c
index a3f878a16..99c7a875c 100644
--- a/tests/dbus/contact-list-client.c
+++ b/tests/dbus/contact-list-client.c
@@ -505,7 +505,7 @@ test_is_blocked (Test *test,
 
 static void
 test_contact_list_properties (Test *test,
-    gconstpointer data G_GNUC_UNUSED)
+    gconstpointer data)
 {
   gboolean props_only = GPOINTER_TO_UINT (data);
   GQuark conn_features[] = { 0, 0 };
@@ -577,7 +577,7 @@ main (int argc,
 
   g_test_add ("/contact-list-client/contact-list/properties", Test,
       GUINT_TO_POINTER (FALSE), setup, test_contact_list_properties, teardown);
-  g_test_add ("/contact-list-client/contact-list/properties", Test,
+  g_test_add ("/contact-list-client/contact-list/properties/props-only", Test,
       GUINT_TO_POINTER (TRUE), setup, test_contact_list_properties, teardown);
 
   return tp_tests_run_with_bus ();
diff --git a/tests/dbus/contact-lists.c b/tests/dbus/contact-lists.c
index 43ab26280..5e88a1829 100644
--- a/tests/dbus/contact-lists.c
+++ b/tests/dbus/contact-lists.c
@@ -2788,7 +2788,7 @@ main (int argc,
 
   g_test_add ("/contact-lists/cancelled-publish-request",
       Test, NULL, setup, test_cancelled_publish_request, teardown);
-  g_test_add ("/contact-lists/cancelled-publish-request",
+  g_test_add ("/contact-lists/cancelled-publish-request/remove-after",
       Test, "remove-after", setup, test_cancelled_publish_request, teardown);
 
   g_test_add ("/contact-lists/add-to-stored",