[vlc-commits] Fix notify plugin build with libnotify 0.7.

Samuli Suominen git at videolan.org
Fri Feb 18 23:06:14 CET 2011


vlc/vlc-1.1 | branch: master | Samuli Suominen <ssuominen at gentoo.org> | Fri Feb 18 14:00:32 2011 -0300| [4a3ea83af61be930526be3d808616068d02a93d9] | committer: Jean-Baptiste Kempf

Fix notify plugin build with libnotify 0.7.

Patch by Samuli Suominen.
See: https://bugs.gentoo.org/show_bug.cgi?id=353848

Sent-by: Alexis Ballier <aballier at gentoo.org>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 638f95c3b0cffb237eb2a69fadb71c565c3dd014)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4a3ea83af61be930526be3d808616068d02a93d9
---

 modules/misc/notify/notify.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index f2d049a..9ac593e 100644
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -38,6 +38,10 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libnotify/notify.h>
 
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 /*****************************************************************************
  * Module descriptor
  ****************************************************************************/
@@ -312,7 +316,12 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
     }
 
     notification = notify_notification_new( _("Now Playing"),
-                                            psz_temp, NULL, NULL );
+                                            psz_temp, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+					    );
+#else
+					    , NULL );
+#endif
     notify_notification_set_timeout( notification,
                                 var_InheritInteger(p_this, "notify-timeout") );
     notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );



More information about the vlc-commits mailing list