r28798 - in /desktop/unstable/ekiga/debian: changelog patches/libnotify0.7.patch patches/series

[kilian at users.alioth.debian.org]

Author: kilian
Date: Sun Jul 10 07:15:59 2011
New Revision: 28798

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28798
Log:
Fix compilation with libnotify0.7 (Closes: #630266)

Added:
    desktop/unstable/ekiga/debian/patches/libnotify0.7.patch
Modified:
    desktop/unstable/ekiga/debian/changelog
    desktop/unstable/ekiga/debian/patches/series

Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=28798&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog [utf-8] (original)
+++ desktop/unstable/ekiga/debian/changelog [utf-8] Sun Jul 10 07:15:59 2011
@@ -1,3 +1,9 @@
+ekiga (3.2.7-4) UNRELEASED; urgency=low
+
+  * Fix compilation with libnotify0.7 (Closes: #630266)
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 10 Jul 2011 09:11:57 +0200
+
 ekiga (3.2.7-3) unstable; urgency=low
 
   [ Eugen Dedu ]

Added: desktop/unstable/ekiga/debian/patches/libnotify0.7.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/libnotify0.7.patch?rev=28798&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/libnotify0.7.patch (added)
+++ desktop/unstable/ekiga/debian/patches/libnotify0.7.patch [utf-8] Sun Jul 10 07:15:59 2011
@@ -1,0 +1,63 @@
+Origin: upstream
+Applied-Upstream: Thu, 04 Nov 2010 20:36:50 +0000
+Author: Flo Gravo <flo.gravo at gmail.com>
+Description: Fix compilation with libnotify0.7
+
+Upstream commit 6a964b0889fbdb164a036649c4aea1cc3c9818e3 Mon Sep 17 00:00:00 2001
+
+Fixes bug #632848.
+---
+--- a/lib/engine/components/libnotify/libnotify-main.cpp
++++ b/lib/engine/components/libnotify/libnotify-main.cpp
+@@ -158,7 +158,16 @@ LibNotify::on_notification_added (gmref_
+ 
+   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 ());
+--- a/src/gui/main.cpp
++++ b/src/gui/main.cpp
+@@ -2820,12 +2820,29 @@ ekiga_main_window_incoming_call_notify (
+ 
+   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);
+   }

Modified: desktop/unstable/ekiga/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/series?rev=28798&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/series [utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/series [utf-8] Sun Jul 10 07:15:59 2011
@@ -1,0 +1,1 @@
+libnotify0.7.patch