[gentoo-commits] gentoo-x86 commit in app-office/orage/files: orage-4.8.0-libnotify-0.7.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/01/29 14:02:20

  Added:                orage-4.8.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                  app-office/orage/files/orage-4.8.0-libnotify-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/orage/files/orage-4.8.0-libnotify-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/orage/files/orage-4.8.0-libnotify-0.7.patch?rev=1.1&content-type=text/plain

Index: orage-4.8.0-libnotify-0.7.patch
===================================================================
http://bugzilla.xfce.org/show_bug.cgi?id=7204

--- src/reminder.c
+++ src/reminder.c
@@ -557,12 +557,19 @@
         g_strlcat(heading, l_alarm->action_time, 90);
         g_strlcat(heading, "<\b>", 10);
     }
-    n = notify_notification_new(heading, l_alarm->description, NULL, NULL);
+    n = notify_notification_new(heading, l_alarm->description, NULL
+#ifdef HAVE_LIBNOTIFY_07
+    );
+#else
+    , NULL);
+#endif
     l_alarm->active_alarm->active_notify = n;
+#ifndef HAVE_LIBNOTIFY_07
     if (g_par.trayIcon 
     && gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
         notify_notification_attach_to_status_icon(n
                 , (GtkStatusIcon *)g_par.trayIcon);
+#endif
 
     if (l_alarm->notify_timeout == -1)
         notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);