r29334 - /desktop/unstable/seahorse-plugins/debian/patches/20_fix-build-with-libnotify-0.7.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Aug  2 05:54:53 2011
New Revision: 29334

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29334
Log:
Forgot to add 20_fix-build-with-libnotify-0.7.patch

Added:
    desktop/unstable/seahorse-plugins/debian/patches/20_fix-build-with-libnotify-0.7.patch

Added: desktop/unstable/seahorse-plugins/debian/patches/20_fix-build-with-libnotify-0.7.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse-plugins/debian/patches/20_fix-build-with-libnotify-0.7.patch?rev=29334&op=file
==============================================================================
--- desktop/unstable/seahorse-plugins/debian/patches/20_fix-build-with-libnotify-0.7.patch (added)
+++ desktop/unstable/seahorse-plugins/debian/patches/20_fix-build-with-libnotify-0.7.patch [utf-8] Tue Aug  2 05:54:53 2011
@@ -1,0 +1,53 @@
+From fb74a75aa237c97c90dc1df2cfe36656a320e93e Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek.chauhan at gmail.com>
+Date: Fri, 14 Jan 2011 06:32:17 +0530
+Subject: [PATCH] libseahorse: fix build with libnotify-0.7
+
+* notify_notification_new cannot attach itself to widgets with 0.7
+---
+ libseahorse/seahorse-notification.c |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/libseahorse/seahorse-notification.c b/libseahorse/seahorse-notification.c
+index 5660bf7..cc92cd2 100644
+--- a/libseahorse/seahorse-notification.c
++++ b/libseahorse/seahorse-notification.c
+@@ -34,6 +34,11 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #endif
+ 
+ /* -----------------------------------------------------------------------------
+@@ -199,7 +204,7 @@ libnotify_closed (NotifyNotification *notif, SeahorseNotification *snotif)
+ }
+ 
+ static void
+-setup_libnotify_notification (SeahorseNotification *snotif, gboolean urgent, 
++setup_libnotify_notification (SeahorseNotification *snotif, gboolean urgent,
+                               GtkWidget *attachto)
+ {
+     NotifyNotification *notif;
+@@ -212,8 +217,13 @@ setup_libnotify_notification (SeahorseNotification *snotif, gboolean urgent,
+     
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+-    
++
++/* libnotify 0.7.0 and later has no support for attaching to widgets */
++#if NOTIFY_CHECK_VERSION(0,7,0)
++    notif = notify_notification_new (heading, message, snotif->icon);
++#else
+     notif = notify_notification_new (heading, message, snotif->icon, attachto);
++#endif
+     
+     g_free (heading);
+     g_free (message);
+-- 
+1.7.2.5
+