public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] gentoo-x86 commit in mail-client/claws-mail-notification/files: claws-mail-notification-0.26-libnotify-0.7.patch
@ 2011-01-31 18:00 99% Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 1+ results
From: Samuli Suominen (ssuominen) @ 2011-01-31 18:00 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/01/31 18:00:59

  Added:                claws-mail-notification-0.26-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                  mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch?rev=1.1&content-type=text/plain

Index: claws-mail-notification-0.26-libnotify-0.7.patch
===================================================================
--- src/notification_popup.c
+++ src/notification_popup.c
@@ -339,7 +339,16 @@
     break;
   }
 
+#ifdef NOTIFY_CHECK_VERSION
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
+#else
   ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
+#endif
+#else
+  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
+#endif
+
   g_free(utf8_str);
   if(ppopup->notification == NULL) {
     debug_print("Notification Plugin: Failed to create a new "
--- src/notification_trayicon.c
+++ src/notification_trayicon.c
@@ -61,6 +61,10 @@
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 typedef struct {
   gint count;
   gint num_mail;
@@ -601,8 +605,17 @@
   summary  = notification_trayicon_popup_assemble_summary();
   utf8_str = notification_trayicon_popup_assemble_body(msginfo);
 
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+  popup.notification = notify_notification_new(summary, utf8_str, NULL);
+#else
   popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
+#endif
+
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+  /* notify_notification_attach_to_status_icon function was removed */
+#else
   notify_notification_attach_to_status_icon(popup.notification, trayicon);
+#endif
 
   g_free(summary);
   g_free(utf8_str);






^ permalink raw reply	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2011-01-31 18:00 99% [gentoo-commits] gentoo-x86 commit in mail-client/claws-mail-notification/files: claws-mail-notification-0.26-libnotify-0.7.patch Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox