Notify OSD

Merge lp:~ken-vandine/notify-osd/new_libnotify into lp:notify-osd/natty

  1. new_libnotify
  2. Merge into natty
Proposed by Ken VanDine
Status: Rejected
Rejected by: Andrea Cimitan
Proposed branch: lp:~ken-vandine/notify-osd/new_libnotify
Merge into: lp:notify-osd/natty
Diff against target: 293 lines (+24/-38)
13 files modified
configure.in (+1/-1)
examples/append-hint-example.c (+1/-1)
examples/icon-only.c (+1/-2)
examples/icon-summary-body.c (+1/-2)
examples/icon-summary.c (+1/-2)
examples/icon-updating.c (+0/-1)
examples/icon-value.c (+1/-2)
examples/summary-body.c (+0/-1)
examples/summary-only.c (+0/-1)
examples/sync-icon-only.c (+1/-2)
examples/update-notifications.c (+2/-4)
tests/test-synchronous.c (+2/-3)
tests/test-withlib.c (+13/-16)
To merge this branch: bzr merge lp:~ken-vandine/notify-osd/new_libnotify
Reviewer Review Type Date Requested Status
Canonical Desktop Experience Team Pending
Review via email: mp+51317@code.launchpad.net

Description of the change

Ported to libnotify >= 0.7.0

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

I don't think we want an SRU for that

Unmerged revisions

434. By Ken VanDine

Ported to libnotify >= 0.7.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.in'
2--- configure.in 2011-02-25 11:02:45 +0000
3+++ configure.in 2011-02-25 16:02:14 +0000
4@@ -42,7 +42,7 @@
5 #
6 # libnotify, used unit-tests
7 #
8-PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.4.5])
9+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.7.0])
10
11 #
12 # dbus
13
14=== modified file 'examples/append-hint-example.c'
15--- examples/append-hint-example.c 2009-08-26 11:17:55 +0000
16+++ examples/append-hint-example.c 2011-02-25 16:02:14 +0000
17@@ -41,7 +41,7 @@
18 GError* error = NULL;
19
20 /* initial notification */
21- notification = notify_notification_new (title, body, icon, NULL);
22+ notification = notify_notification_new (title, body, icon);
23 notify_notification_set_hint_string (notification,
24 "x-canonical-append",
25 "");
26
27=== modified file 'examples/icon-only.c'
28--- examples/icon-only.c 2009-08-26 11:17:55 +0000
29+++ examples/icon-only.c 2011-02-25 16:02:14 +0000
30@@ -54,8 +54,7 @@
31 notification = notify_notification_new (
32 "Eject", /* for a11y-reasons put something meaningfull here */
33 NULL,
34- "notification-device-eject",
35- NULL);
36+ "notification-device-eject");
37 notify_notification_set_hint_string (notification,
38 "x-canonical-private-icon-only",
39 "");
40
41=== modified file 'examples/icon-summary-body.c'
42--- examples/icon-summary-body.c 2009-08-26 11:17:55 +0000
43+++ examples/icon-summary-body.c 2011-02-25 16:02:14 +0000
44@@ -54,8 +54,7 @@
45 "Hey pal, what's up with the party "
46 "next weekend? Will you join me "
47 "and Anna?",
48- "notification-message-im",
49- NULL);
50+ "notification-message-im");
51 error = NULL;
52 success = notify_notification_show (notification, &error);
53 if (!success)
54
55=== modified file 'examples/icon-summary.c'
56--- examples/icon-summary.c 2009-08-26 11:17:55 +0000
57+++ examples/icon-summary.c 2011-02-25 16:02:14 +0000
58@@ -52,8 +52,7 @@
59 notification = notify_notification_new (
60 "WiFi connection lost",
61 NULL,
62- "notification-network-wireless-disconnected",
63- NULL);
64+ "notification-network-wireless-disconnected");
65 error = NULL;
66 success = notify_notification_show (notification, &error);
67 if (!success)
68
69=== modified file 'examples/icon-updating.c'
70--- examples/icon-updating.c 2010-04-07 17:48:18 +0000
71+++ examples/icon-updating.c 2011-02-25 16:02:14 +0000
72@@ -53,7 +53,6 @@
73 notification = notify_notification_new (
74 "Test 1/3",
75 "Set icon via hint \"image_path\" to logo-icon.",
76- NULL,
77 NULL);
78 notify_notification_set_hint_string (
79 notification,
80
81=== modified file 'examples/icon-value.c'
82--- examples/icon-value.c 2009-08-26 11:17:55 +0000
83+++ examples/icon-value.c 2011-02-25 16:02:14 +0000
84@@ -42,8 +42,7 @@
85 notification = notify_notification_new (
86 "Brightness", /* for a11y-reasons put something meaningfull here */
87 NULL,
88- icon,
89- NULL);
90+ icon);
91 notify_notification_set_hint_int32 (notification,
92 "value",
93 value);
94
95=== modified file 'examples/summary-body.c'
96--- examples/summary-body.c 2009-08-26 11:17:55 +0000
97+++ examples/summary-body.c 2011-02-25 16:02:14 +0000
98@@ -52,7 +52,6 @@
99 notification = notify_notification_new (
100 "Totem",
101 "This is a superfluous notification",
102- NULL,
103 NULL);
104 error = NULL;
105 success = notify_notification_show (notification, &error);
106
107=== modified file 'examples/summary-only.c'
108--- examples/summary-only.c 2009-08-26 11:17:55 +0000
109+++ examples/summary-only.c 2011-02-25 16:02:14 +0000
110@@ -52,7 +52,6 @@
111 notification = notify_notification_new (
112 "Summary-only",
113 NULL,
114- NULL,
115 NULL);
116 error = NULL;
117 success = notify_notification_show (notification, &error);
118
119=== modified file 'examples/sync-icon-only.c'
120--- examples/sync-icon-only.c 2009-08-26 11:17:55 +0000
121+++ examples/sync-icon-only.c 2011-02-25 16:02:14 +0000
122@@ -55,8 +55,7 @@
123 notification = notify_notification_new (
124 "Eject", /* for a11y-reasons put something meaningfull here */
125 NULL,
126- "notification-device-eject",
127- NULL);
128+ "notification-device-eject");
129 notify_notification_set_hint_string (notification,
130 "x-canonical-private-icon-only",
131 "");
132
133=== modified file 'examples/update-notifications.c'
134--- examples/update-notifications.c 2009-08-26 11:17:55 +0000
135+++ examples/update-notifications.c 2011-02-25 16:02:14 +0000
136@@ -53,8 +53,7 @@
137 "Inital notification",
138 "This is the original content of "
139 "this notification-bubble.",
140- "notification-message-im",
141- NULL);
142+ "notification-message-im");
143 error = NULL;
144 success = notify_notification_show (notification, &error);
145 if (!success)
146@@ -97,8 +96,7 @@
147 "Initial layout",
148 "This bubble uses the icon-title-body "
149 "layout.",
150- "notification-message-im",
151- NULL);
152+ "notification-message-im");
153 error = NULL;
154 success = notify_notification_show (notification, &error);
155 if (!success)
156
157=== modified file 'tests/test-synchronous.c'
158--- tests/test-synchronous.c 2009-03-12 16:44:00 +0000
159+++ tests/test-synchronous.c 2011-02-25 16:02:14 +0000
160@@ -38,7 +38,7 @@
161 NotifyNotification *n;
162 n = notify_notification_new ("Test notification",
163 g_strdup (message),
164- "", NULL);
165+ "");
166 notify_notification_show (n, NULL);
167 g_object_unref(G_OBJECT(n));
168 }
169@@ -53,8 +53,7 @@
170 if (n == NULL)
171 n = notify_notification_new (" ",
172 "",
173- g_strdup (icon),
174- NULL);
175+ g_strdup (icon));
176 else
177 notify_notification_update (n,
178 " ",
179
180=== modified file 'tests/test-withlib.c'
181--- tests/test-withlib.c 2009-09-09 07:46:16 +0000
182+++ tests/test-withlib.c 2011-02-25 16:02:14 +0000
183@@ -94,7 +94,7 @@
184
185 n = notify_notification_new ("Test",
186 "You should see a normal notification",
187- "", NULL);
188+ "");
189 notify_notification_show (n, NULL);
190 sleep (3);
191
192@@ -109,7 +109,7 @@
193
194 n = notify_notification_new ("Test",
195 "New notification",
196- "", NULL);
197+ "");
198 res = notify_notification_show (n, NULL);
199 g_assert (res);
200 sleep (1);
201@@ -135,7 +135,7 @@
202
203 n = notify_notification_new ("Image Test",
204 "You should see an image",
205- "", NULL);
206+ "");
207 g_print ("iconpath: %s\n", SRCDIR"/icons/avatar.png");
208 pixbuf = gdk_pixbuf_new_from_file_at_scale (SRCDIR"/icons/avatar.png",
209 64, 64, TRUE, NULL);
210@@ -157,22 +157,22 @@
211
212 n1 = notify_notification_new ("Dummy Notification",
213 "This is a test notification",
214- "", NULL);
215+ "");
216 notify_notification_show (n1, NULL);
217 n2 = notify_notification_new ("Normal Notification",
218 "You should see this *after* the urgent notification.",
219- "", NULL);
220+ "");
221 notify_notification_set_urgency (n2, NOTIFY_URGENCY_LOW);
222 notify_notification_show (n2, NULL);
223 n3 = notify_notification_new ("Synchronous Notification",
224 "You should immediately see this notification.",
225- "", NULL);
226+ "");
227 notify_notification_set_hint_string (n3, "synchronous", "test");
228 notify_notification_set_urgency (n3, NOTIFY_URGENCY_NORMAL);
229 notify_notification_show (n3, NULL);
230 n4 = notify_notification_new ("Urgent Notification",
231 "You should see a dialog box, and after, a normal notification.",
232- "", NULL);
233+ "");
234 notify_notification_set_urgency (n4, NOTIFY_URGENCY_CRITICAL);
235 notify_notification_show (n4, NULL);
236
237@@ -207,7 +207,7 @@
238
239 n1 = notify_notification_new ("Notification with an action",
240 "You should see that in a dialog box. Click the 'Action' button for the test to succeed.",
241- "", NULL);
242+ "");
243 notify_notification_add_action (n1,
244 "action",
245 "Action",
246@@ -231,7 +231,7 @@
247
248 n = notify_notification_new ("Test Title",
249 "This notification will be closed prematurely...",
250- "", NULL);
251+ "");
252 notify_notification_show (n, NULL);
253
254 loop = g_main_loop_new(NULL, FALSE);
255@@ -256,8 +256,7 @@
256 /* init notification, supply first line of body-text */
257 n = notify_notification_new ("Test (append-hint)",
258 "The quick brown fox jumps over the lazy dog.",
259- SRCDIR"/icons/avatar.png",
260- NULL);
261+ SRCDIR"/icons/avatar.png");
262 res = notify_notification_show (n, NULL);
263 g_assert (res);
264 sleep (1);
265@@ -296,8 +295,7 @@
266 /* init notification, supply first line of body-text */
267 n = notify_notification_new (" ", /* needs this to be non-NULL */
268 NULL,
269- "notification-audio-play",
270- NULL);
271+ "notification-audio-play");
272 notify_notification_set_hint_string (n, "icon-only", "allowed");
273 res = notify_notification_show (n, NULL);
274 g_assert (res);
275@@ -314,8 +312,7 @@
276
277 n = notify_notification_new ("Swallow markup test",
278 "This text is hopefully neither <b>bold</b>, <i>italic</i> nor <u>underlined</u>.\n\nA little math-notation:\n\n\ta &gt; b &lt; c = 0",
279- SRCDIR"/icons/avatar.png",
280- NULL);
281+ SRCDIR"/icons/avatar.png");
282 res = notify_notification_show (n, NULL);
283 g_assert (res);
284 sleep (2);
285@@ -341,7 +338,7 @@
286
287 // create dummy notification
288 snprintf (buf, 19, "Test #%.2d", i);
289- n = notify_notification_new (buf, buf, "", NULL);
290+ n = notify_notification_new (buf, buf, "");
291
292 // inject it into the queue
293 res = notify_notification_show (n, &error);

Subscribers

People subscribed via source and target branches