LinGui: Modify 0.9.5.1 branch to allow building on fedora 15

Add pkg-config test for dbus-glib and ifdef libnotify differences.

git-svn-id: svn://svn.handbrake.fr/HandBrake/tags/0.9.5.1@4007 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/configure.ac b/gtk/configure.ac
index bda4d371f1210818360993db3e158997e15d65bd..5b5bc9f1fdb39d2a0ebea25c6fdc363bfe86f293 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -94,7 +94,7 @@ case $host in
        mingw_flag=yes
     ;;
   *)
-       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"
        mingw_flag=no
     ;;
 esac

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index f225ff93aa83e62c48cea7d9ea8bfa8556f87c9f..8b94afa9e2e1eeac7a16ab1b5eb8736416ce5c76 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -4889,9 +4889,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