diff options
| author | jstebbins <[email protected]> | 2011-03-08 16:20:57 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-03-08 16:20:57 +0000 |
| commit | fafc7fe48ffac1f7aeb878a00de44a0f49b28852 (patch) | |
| tree | d8c138e9e9d7fb8e73a2fa7d97a4f07ab4c8c675 /gtk | |
| parent | 673a841b1ef2dcd31647fce00829dc4a3f2b0715 (diff) | |
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
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/configure.ac | 4 | ||||
| -rw-r--r-- | gtk/src/callbacks.c | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index 9f5434751..e811fe2b7 100644 --- 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 9355e802e..4ba8cdd8b 100644 --- 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 |