add dbus-glib to configure lib checks

ifdef libnotify call for compatibility with new 0.7 version.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3832 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/configure.ac b/gtk/configure.ac
index 9f543475144ca3d33dfbf6fdc029490222d8f14c..e811fe2b708618343f74ae699e1a17efff3c5902 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -95,9 +95,9 @@ case $host in
     ;;
   *)
     if test "x$gst_disable" = "xyes" ; then
-           GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify gudev-1.0"
+           GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify dbus-glib-1 gudev-1.0"
     else
-           GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify gudev-1.0"
+           GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 gudev-1.0"
     fi
        mingw_flag=no
     ;;

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 9355e802ee76efa9ad128e0865ef5cfdebb4ef40..4ba8cdd8b37a96181f91f48da138047f7e5db624 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -39,6 +39,10 @@
 #endif
 
 #include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 #include <gdk/gdkx.h>
 #else
 #define WINVER 0x0500
@@ -4881,9 +4885,13 @@ ghb_notify_done(signal_user_data_t *ud)
        notification = notify_notification_new(
                "Encode Complete",
                "Put down that cocktail, Your HandBrake queue is done!",
-               "hb-icon",
-               NULL);
+               "hb-icon"
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+                );
+#else
+               ,NULL);
        notify_notification_attach_to_status_icon(notification, si);
+#endif
        g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
        notify_notification_show(notification, NULL);
 #endif