| 1 |
ssuominen 11/02/05 14:24:38 |
| 2 |
|
| 3 |
Added: evolution-2.32.1-libnotify-0.7.patch |
| 4 |
Log: |
| 5 |
Fix building with x11-libs/libnotify >= 0.7. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: evolution-2.32.1-libnotify-0.7.patch |
| 16 |
=================================================================== |
| 17 |
--- calendar/gui/alarm-notify/alarm-queue.c |
| 18 |
+++ calendar/gui/alarm-notify/alarm-queue.c |
| 19 |
@@ -40,6 +40,9 @@ |
| 20 |
|
| 21 |
#ifdef HAVE_LIBNOTIFY |
| 22 |
#include <libnotify/notify.h> |
| 23 |
+#ifndef NOTIFY_CHECK_VERSION |
| 24 |
+#define NOTIFY_CHECK_VERSION(x,y,z) 0 |
| 25 |
+#endif |
| 26 |
#endif |
| 27 |
|
| 28 |
#include "alarm.h" |
| 29 |
@@ -1606,7 +1609,12 @@ |
| 30 |
body = g_strdup_printf ("%s %s", start_str, time_str); |
| 31 |
} |
| 32 |
|
| 33 |
- n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); |
| 34 |
+ n = notify_notification_new (summary, body, "stock_appointment-reminder" |
| 35 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 36 |
+ ); |
| 37 |
+#else |
| 38 |
+ , NULL); |
| 39 |
+#endif |
| 40 |
if (!notify_notification_show(n, NULL)) |
| 41 |
g_warning ("Could not send notification to daemon\n"); |
| 42 |
|
| 43 |
--- plugins/mail-notification/mail-notification.c |
| 44 |
+++ plugins/mail-notification/mail-notification.c |
| 45 |
@@ -47,6 +47,9 @@ |
| 46 |
|
| 47 |
#ifdef HAVE_LIBNOTIFY |
| 48 |
#include <libnotify/notify.h> |
| 49 |
+#ifndef NOTIFY_CHECK_VERSION |
| 50 |
+#define NOTIFY_CHECK_VERSION(x,y,z) 0 |
| 51 |
+#endif |
| 52 |
#endif |
| 53 |
|
| 54 |
#define GCONF_KEY_ROOT "/apps/evolution/eplugin/mail-notification/" |
| 55 |
@@ -564,9 +567,14 @@ |
| 56 |
|
| 57 |
notify = notify_notification_new ( |
| 58 |
_("New email"), safetext, |
| 59 |
- "mail-unread", NULL); |
| 60 |
+ "mail-unread" |
| 61 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 62 |
+ ); |
| 63 |
+#else |
| 64 |
+ , NULL); |
| 65 |
notify_notification_attach_to_status_icon ( |
| 66 |
notify, status_icon); |
| 67 |
+#endif |
| 68 |
|
| 69 |
/* Check if actions are supported */ |
| 70 |
if (can_support_actions ()) { |
| 71 |
--- plugins/publish-calendar/publish-calendar.c |
| 72 |
+++ plugins/publish-calendar/publish-calendar.c |
| 73 |
@@ -46,6 +46,9 @@ |
| 74 |
|
| 75 |
#ifdef HAVE_LIBNOTIFY |
| 76 |
#include <libnotify/notify.h> |
| 77 |
+#ifndef NOTIFY_CHECK_VERSION |
| 78 |
+#define NOTIFY_CHECK_VERSION(x,y,z) 0 |
| 79 |
+#endif |
| 80 |
#endif |
| 81 |
|
| 82 |
static GtkListStore *store = NULL; |
| 83 |
@@ -150,8 +153,13 @@ |
| 84 |
return; |
| 85 |
} |
| 86 |
|
| 87 |
- notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL); |
| 88 |
+ notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name |
| 89 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 90 |
+ ); |
| 91 |
+#else |
| 92 |
+ , NULL); |
| 93 |
notify_notification_attach_to_status_icon (notify, status_icon); |
| 94 |
+#endif |
| 95 |
notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); |
| 96 |
notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); |
| 97 |
g_timeout_add (500, show_notify_cb, NULL); |
Archives