[ekiga] Update to the new libnotify 0.7.0 library
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Update to the new libnotify 0.7.0 library
- Date: Thu, 4 Nov 2010 20:39:09 +0000 (UTC)
commit 6a964b0889fbdb164a036649c4aea1cc3c9818e3
Author: Flo Gravo <flo gravo gmail com>
Date: Thu Nov 4 21:36:50 2010 +0100
Update to the new libnotify 0.7.0 library
Fixes bug #632848.
lib/engine/components/libnotify/libnotify-main.cpp | 11 +++++++++-
src/gui/main_window.cpp | 21 ++++++++++++++++++-
2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/lib/engine/components/libnotify/libnotify-main.cpp b/lib/engine/components/libnotify/libnotify-main.cpp
index 54ea259..26049f3 100644
--- a/lib/engine/components/libnotify/libnotify-main.cpp
+++ b/lib/engine/components/libnotify/libnotify-main.cpp
@@ -158,7 +158,16 @@ LibNotify::on_notification_added (boost::shared_ptr<Ekiga::Notification> notific
notif = notify_notification_new (notification->get_title ().c_str (),
notification->get_body ().c_str (),
- urgency, NULL);
+ urgency
+// NOTIFY_CHECK_VERSION appeared in 0.5.2 only
+#ifdef NOTIFY_CHECK_VERSION
+#if !NOTIFY_CHECK_VERSION(0,7,0)
+ , NULL
+#endif
+#else
+ , NULL
+#endif
+ );
g_signal_connect (notif, "closed",
G_CALLBACK (on_notif_closed), notification.get ());
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index d5b1467..ffa864b 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -2862,12 +2862,29 @@ ekiga_main_window_incoming_call_notify (EkigaMainWindow *mw,
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
+// NOTIFY_CHECK_VERSION appeared in 0.5.2 only
+#ifndef NOTIFY_CHECK_VERSION
+ , NULL
+#else
+#if !NOTIFY_CHECK_VERSION(0,7,0)
+ , NULL
+#endif
+#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);
- notify_notification_attach_to_status_icon (notify, statusicon);
+// NOTIFY_CHECK_VERSION appeared in 0.5.2 only
+#ifndef NOTIFY_CHECK_VERSION
+ notify_notification_attach_to_status_icon (notify, statusicon);
+#else
+#if !NOTIFY_CHECK_VERSION(0,7,0)
+ notify_notification_attach_to_status_icon (notify, statusicon);
+#endif
+#endif
if (!notify_notification_show (notify, NULL)) {
ekiga_main_window_incoming_call_dialog_show (mw, call);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]