Merge lp:~robert-ancell/indicator-messages/has-messages into lp:indicator-messages

[Robert Ancell]

[Sebastien Bacher (seb128)]

Looks fine to me

review: Approve

=== modified file 'src/im-accounts-service.c'
--- src/im-accounts-service.c	2014-10-07 02:23:31 +0000
+++ src/im-accounts-service.c	2018-09-17 09:48:33 +0000
@@ -189,9 +189,9 @@
 	g_dbus_connection_call(g_dbus_proxy_get_connection(priv->touch_settings),
 		g_dbus_proxy_get_name(priv->touch_settings),
 		g_dbus_proxy_get_object_path(priv->touch_settings),
-		"org.freedesktop.Accounts.User",
-		"SetXHasMessages",
-		g_variant_new("(b)", draws_attention),
+		"org.freedesktop.DBus.Properties",
+		"Set",
+		g_variant_new("(ssv)", "org.freedesktop.DisplayManager.AccountsService", "HasMessages", g_variant_new_boolean (draws_attention)),
 		NULL, /* reply */
 		G_DBUS_CALL_FLAGS_NONE,
 		-1, /* timeout */
 
=== modified file 'tests/accounts-service-mock.h'
--- tests/accounts-service-mock.h	2015-03-06 23:18:22 +0000
+++ tests/accounts-service-mock.h	2018-09-17 09:48:33 +0000
@@ -25,6 +25,7 @@
 		DbusTestDbusMock * mock = nullptr;
 		DbusTestDbusMockObject * soundobj = nullptr;
 		DbusTestDbusMockObject * userobj = nullptr;
+		DbusTestDbusMockObject * dmobj = nullptr;
 		DbusTestDbusMockObject * syssoundobj = nullptr;
 		DbusTestDbusMockObject * privacyobj = nullptr;
 
@@ -56,9 +57,11 @@
 			dbus_test_dbus_mock_object_add_property(mock, userobj,
 				"UserName", G_VARIANT_TYPE_STRING,
 				g_variant_new_string(g_get_user_name()), NULL);
-			dbus_test_dbus_mock_object_add_method(mock, baseobj,
-				"SetXHasMessages", G_VARIANT_TYPE_BOOLEAN, nullptr,
-				"", NULL);
+
+			dmobj = dbus_test_dbus_mock_get_object(mock, "/user", "org.freedesktop.DisplayManager.AccountsService", NULL);
+			dbus_test_dbus_mock_object_add_property(mock, dmobj,
+				"HasMesages", G_VARIANT_TYPE_BOOLEAN,
+				g_variant_new_boolean(FALSE), NULL);
 
 			soundobj = dbus_test_dbus_mock_get_object(mock, "/user", "com.canonical.indicator.sound.AccountsService", NULL);
 			dbus_test_dbus_mock_object_add_property(mock, soundobj,