| 1 |
ssuominen 11/02/05 17:10:34 |
| 2 |
|
| 3 |
Added: empathy-2.32.2-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 net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: empathy-2.32.2-libnotify-0.7.patch |
| 16 |
=================================================================== |
| 17 |
--- src/empathy-chat-window.c |
| 18 |
+++ src/empathy-chat-window.c |
| 19 |
@@ -35,6 +35,11 @@ |
| 20 |
#include <gdk/gdkx.h> |
| 21 |
#include <glib/gi18n.h> |
| 22 |
#include <libnotify/notification.h> |
| 23 |
+#include <libnotify/notify.h> |
| 24 |
+ |
| 25 |
+#ifndef NOTIFY_CHECK_VERSION |
| 26 |
+#define NOTIFY_CHECK_VERSION(x,y,z) 0 |
| 27 |
+#endif |
| 28 |
|
| 29 |
#include <telepathy-glib/telepathy-glib.h> |
| 30 |
|
| 31 |
@@ -1300,7 +1305,12 @@ |
| 32 |
to an existing notification with the same title. |
| 33 |
In this way the previous message will not be lost: the new |
| 34 |
message will appear below it, in the same notification */ |
| 35 |
- notification = notify_notification_new (header, escaped, NULL, NULL); |
| 36 |
+ notification = notify_notification_new (header, escaped, NULL |
| 37 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 38 |
+ ); |
| 39 |
+#else |
| 40 |
+ , NULL); |
| 41 |
+#endif |
| 42 |
|
| 43 |
if (priv->notification == NULL) { |
| 44 |
priv->notification = notification; |
| 45 |
--- src/empathy-status-icon.c |
| 46 |
+++ src/empathy-status-icon.c |
| 47 |
@@ -32,6 +32,10 @@ |
| 48 |
#include <libnotify/notification.h> |
| 49 |
#include <libnotify/notify.h> |
| 50 |
|
| 51 |
+#ifndef NOTIFY_CHECK_VERSION |
| 52 |
+#define NOTIFY_CHECK_VERSION(x,y,z) 0 |
| 53 |
+#endif |
| 54 |
+ |
| 55 |
#include <telepathy-glib/account-manager.h> |
| 56 |
#include <telepathy-glib/util.h> |
| 57 |
|
| 58 |
@@ -206,8 +210,12 @@ |
| 59 |
to an existing notification with the same title. |
| 60 |
In this way the previous message will not be lost: the new |
| 61 |
message will appear below it, in the same notification */ |
| 62 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 63 |
+ /* notify_notification_new_with_status_icon was removed */ |
| 64 |
+#else |
| 65 |
notification = notify_notification_new_with_status_icon |
| 66 |
(priv->event->header, message_esc, NULL, priv->icon); |
| 67 |
+#endif |
| 68 |
|
| 69 |
if (priv->notification == NULL) { |
| 70 |
priv->notification = notification; |
Archives