Merge lp://qastaging/~dbarth/notify-osd/close-notification-api into lp://qastaging/notify-osd/trunk

Proposed by David Barth
Status: Rejected
Rejected by: Neil J. Patel
Proposed branch: lp://qastaging/~dbarth/notify-osd/close-notification-api
Merge into: lp://qastaging/notify-osd/trunk
Diff against target: 34 lines (+14/-10)
1 file modified
src/stack.c (+14/-10)
To merge this branch: bzr merge lp://qastaging/~dbarth/notify-osd/close-notification-api
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Disapprove
Review via email: mp+20008@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

This patch should re-enable the API. It should help clarify Network Manager's notifications at startup or when resuming from sleep.

Revision history for this message
Neil J. Patel (njpatel) :
review: Disapprove

Unmerged revisions

409. By David Barth

re-enable the close-notification API

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/stack.c'
2--- src/stack.c 2009-10-20 08:51:11 +0000
3+++ src/stack.c 2010-02-23 21:58:13 +0000
4@@ -810,16 +810,20 @@
5 if (bubble == NULL)
6 return TRUE;
7
8- dbus_send_close_signal (bubble_get_sender (bubble),
9- bubble_get_id (bubble),
10- 3);
11-
12- // do not trigger any closure of a notification-bubble here, as
13- // this kind of control from outside (DBus) does not comply with
14- // the notify-osd specification
15- //bubble_hide (bubble);
16- //g_object_unref (bubble);
17- //stack_layout (self);
18+ // keep a copy of that information before disposing
19+ // a notification
20+ gchar *sender = g_strdup (bubble_get_sender (bubble));
21+
22+ bubble_hide (bubble);
23+
24+ // confirm the notification has been closed
25+ dbus_send_close_signal (sender, id, 3);
26+
27+ g_object_unref (bubble);
28+
29+ stack_layout (self);
30+
31+ g_free (sender);
32
33 return TRUE;
34 }

Subscribers

People subscribed via source and target branches