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
43
44
45
46
47
48
49
50
51
52
53
54
|
--- src/empathy-chat-window.c
+++ src/empathy-chat-window.c
@@ -35,6 +35,11 @@
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
#include <libnotify/notification.h>
+#include <libnotify/notify.h>
+
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
#include <telepathy-glib/telepathy-glib.h>
@@ -1300,7 +1305,12 @@
to an existing notification with the same title.
In this way the previous message will not be lost: the new
message will appear below it, in the same notification */
- notification = notify_notification_new (header, escaped, NULL, NULL);
+ notification = notify_notification_new (header, escaped, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ );
+#else
+ , NULL);
+#endif
if (priv->notification == NULL) {
priv->notification = notification;
--- src/empathy-status-icon.c
+++ src/empathy-status-icon.c
@@ -32,6 +32,10 @@
#include <libnotify/notification.h>
#include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/util.h>
@@ -206,8 +210,12 @@
to an existing notification with the same title.
In this way the previous message will not be lost: the new
message will appear below it, in the same notification */
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ /* notify_notification_new_with_status_icon was removed */
+#else
notification = notify_notification_new_with_status_icon
(priv->event->header, message_esc, NULL, priv->icon);
+#endif
if (priv->notification == NULL) {
priv->notification = notification;
|
