[gentoo-commits] gentoo-x86 commit in media-video/gnome-mplayer/files: gnome-mplayer-1.0.0-libnotify-0.7.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/01/29 13:47:02

  Added:                gnome-mplayer-1.0.0-libnotify-0.7.patch
  Log:
  Fix building with x11-libs/libnotify >= 0.7.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/gnome-mplayer/files/gnome-mplayer-1.0.0-libnotify-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/gnome-mplayer/files/gnome-mplayer-1.0.0-libnotify-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/gnome-mplayer/files/gnome-mplayer-1.0.0-libnotify-0.7.patch?rev=1.1&content-type=text/plain

Index: gnome-mplayer-1.0.0-libnotify-0.7.patch
===================================================================
diff -ur gnome-mplayer-1.0.0.orig/src/gui.c gnome-mplayer-1.0.0/src/gui.c
--- gnome-mplayer-1.0.0.orig/src/gui.c	2010-11-05 18:16:22.000000000 +0200
+++ gnome-mplayer-1.0.0/src/gui.c	2011-01-29 15:45:00.000000000 +0200
@@ -470,13 +470,21 @@
 #ifdef NOTIFY_ENABLED
         if (show_notification && control_id == 0 && !gtk_window_is_active((GtkWindow *) window)) {
             notify_init("gnome-mplayer");
+#ifdef NOTIFY0_7_ENABLED
+            notification =
+                notify_notification_new(idle->display_name, idle->media_notification,
+                                        "gnome-mplayer");
+#else
             notification =
                 notify_notification_new(idle->display_name, idle->media_notification,
                                         "gnome-mplayer", NULL);
+#endif
 #ifdef GTK2_12_ENABLED
+#ifndef NOTIFY0_7_ENABLED
             if (show_status_icon)
                 notify_notification_attach_to_status_icon(notification, status_icon);
 #endif
+#endif
             notify_notification_show(notification, NULL);
             notify_uninit();
         }