Messaging Menu

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

  1. has-messages
  2. Merge into trunk.16.10
Proposed by Robert Ancell
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 457
Merged at revision: 457
Proposed branch: lp:~robert-ancell/indicator-messages/has-messages
Merge into: lp:indicator-messages
Diff against target: 43 lines (+9/-6)
2 files modified
src/im-accounts-service.c (+3/-3)
tests/accounts-service-mock.h (+6/-3)
To merge this branch: bzr merge lp:~robert-ancell/indicator-messages/has-messages
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+355127@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Looks fine to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/im-accounts-service.c'
2--- src/im-accounts-service.c 2014-10-07 02:23:31 +0000
3+++ src/im-accounts-service.c 2018-09-17 09:48:33 +0000
4@@ -189,9 +189,9 @@
5 g_dbus_connection_call(g_dbus_proxy_get_connection(priv->touch_settings),
6 g_dbus_proxy_get_name(priv->touch_settings),
7 g_dbus_proxy_get_object_path(priv->touch_settings),
8- "org.freedesktop.Accounts.User",
9- "SetXHasMessages",
10- g_variant_new("(b)", draws_attention),
11+ "org.freedesktop.DBus.Properties",
12+ "Set",
13+ g_variant_new("(ssv)", "org.freedesktop.DisplayManager.AccountsService", "HasMessages", g_variant_new_boolean (draws_attention)),
14 NULL, /* reply */
15 G_DBUS_CALL_FLAGS_NONE,
16 -1, /* timeout */
17
18=== modified file 'tests/accounts-service-mock.h'
19--- tests/accounts-service-mock.h 2015-03-06 23:18:22 +0000
20+++ tests/accounts-service-mock.h 2018-09-17 09:48:33 +0000
21@@ -25,6 +25,7 @@
22 DbusTestDbusMock * mock = nullptr;
23 DbusTestDbusMockObject * soundobj = nullptr;
24 DbusTestDbusMockObject * userobj = nullptr;
25+ DbusTestDbusMockObject * dmobj = nullptr;
26 DbusTestDbusMockObject * syssoundobj = nullptr;
27 DbusTestDbusMockObject * privacyobj = nullptr;
28
29@@ -56,9 +57,11 @@
30 dbus_test_dbus_mock_object_add_property(mock, userobj,
31 "UserName", G_VARIANT_TYPE_STRING,
32 g_variant_new_string(g_get_user_name()), NULL);
33- dbus_test_dbus_mock_object_add_method(mock, baseobj,
34- "SetXHasMessages", G_VARIANT_TYPE_BOOLEAN, nullptr,
35- "", NULL);
36+
37+ dmobj = dbus_test_dbus_mock_get_object(mock, "/user", "org.freedesktop.DisplayManager.AccountsService", NULL);
38+ dbus_test_dbus_mock_object_add_property(mock, dmobj,
39+ "HasMesages", G_VARIANT_TYPE_BOOLEAN,
40+ g_variant_new_boolean(FALSE), NULL);
41
42 soundobj = dbus_test_dbus_mock_get_object(mock, "/user", "com.canonical.indicator.sound.AccountsService", NULL);
43 dbus_test_dbus_mock_object_add_property(mock, soundobj,

Subscribers

People subscribed via source and target branches