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
55
56
57
58
59
60
61
62
|
--- lib/engine/components/libnotify/libnotify-main.cpp
+++ lib/engine/components/libnotify/libnotify-main.cpp
@@ -40,6 +40,10 @@
#include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
#include "services.h"
#include "notification-core.h"
@@ -158,7 +162,12 @@
notif = notify_notification_new (notification->get_title ().c_str (),
notification->get_body ().c_str (),
- urgency, NULL);
+ urgency
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ );
+#else
+ , NULL);
+#endif
g_signal_connect (notif, "closed",
G_CALLBACK (on_notif_closed), notification.get ());
--- src/gui/main.cpp
+++ src/gui/main.cpp
@@ -84,6 +84,9 @@
#ifdef HAVE_NOTIFY
#include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
#endif
#if defined(P_FREEBSD) || defined (P_MACOSX)
@@ -2820,12 +2823,21 @@
body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
+ notify = notify_notification_new (title, body, GM_ICON_LOGO
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ );
+#else
+ , NULL);
+#endif
notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ // notify_notification_attach_to_status_icon was removed
+#else
notify_notification_attach_to_status_icon (notify, statusicon);
+#endif
if (!notify_notification_show (notify, NULL)) {
ekiga_main_window_incoming_call_dialog_show (mw, call);
}
|
GitWeb
