1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
Backport upstream patch http://bazaar.launchpad.net/~joh/alarm-clock/trunk/revision/202
to alarm-clock-applet-0.3.1
diff -ru alarm-clock-applet-0.3.1-orig/configure.ac alarm-clock-applet-0.3.1/configure.ac
--- alarm-clock-applet-0.3.1-orig/configure.ac 2010-05-16 14:19:20.000000000 -0400
+++ alarm-clock-applet-0.3.1/configure.ac 2011-03-12 01:12:29.877795697 -0500
@@ -71,6 +71,16 @@
AM_GCONF_SOURCE_2
+#
+# Check for libnotify 0.7
+#
+PKG_CHECK_MODULES(LIBNOTIFY_0_7, libnotify >= 0.7, have_libnotify_0_7=yes, have_libnotify_0_7=no)
+
+if test x$have_libnotify_0_7 = xyes ; then
+ AC_DEFINE(HAVE_LIBNOTIFY_0_7, 1, [Have libnotify 0.7])
+fi
+AM_CONDITIONAL(HAVE_LIBNOTIFY_0_7, test x$have_libnotify_0_7 = xyes)
+
# ********************
# Internationalisation
# ********************
diff -ru alarm-clock-applet-0.3.1-orig/src/ui.c alarm-clock-applet-0.3.1/src/ui.c
--- alarm-clock-applet-0.3.1-orig/src/ui.c 2010-03-06 10:20:23.000000000 -0500
+++ alarm-clock-applet-0.3.1/src/ui.c 2011-03-12 01:16:53.538331261 -0500
@@ -176,9 +176,14 @@
NotifyNotification *n;
GError *error = NULL;
+ // Gotta love API breakage...
+#ifdef HAVE_LIBNOTIFY_0_7
+ n = notify_notification_new (summary, body, icon);
+#else
n = notify_notification_new_with_status_icon (summary, body, icon,
applet->status_icon);
-
+#endif
+
if (!notify_notification_show (n, &error)) {
g_warning ("Failed to send notification: %s", error->message);
g_error_free (error);
|
GitWeb
