Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/balsa/files: balsa-2.4.8-libnotify-0.7.patch
Date: Sat, 05 Feb 2011 10:07:34
Message-Id: 20110205100720.A7B8620057@flycatcher.gentoo.org
1 ssuominen 11/02/05 10:07:20
2
3 Added: balsa-2.4.8-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/balsa/files/balsa-2.4.8-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: balsa-2.4.8-libnotify-0.7.patch
16 ===================================================================
17 --- libbalsa/information.c
18 +++ libbalsa/information.c
19 @@ -27,6 +27,9 @@
20
21 #ifdef HAVE_NOTIFY
22 #include <libnotify/notify.h>
23 +#ifndef NOTIFY_CHECK_VERSION
24 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
25 +#endif
26 #include <gtk/gtk.h>
27 #endif
28 #include <string.h>
29 @@ -122,7 +125,11 @@
30 g_free(msg);
31
32 note =
33 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
34 + notify_notification_new("Balsa", escaped->str, icon_str);
35 +#else
36 notify_notification_new("Balsa", escaped->str, icon_str, NULL);
37 +#endif
38 g_string_free(escaped, TRUE);
39
40 notify_notification_set_timeout(note, 7000); /* 7 seconds */
41 --- src/main-window.c
42 +++ src/main-window.c
43 @@ -85,6 +85,12 @@
44
45 #define MAILBOX_DATA "mailbox_data"
46
47 +#ifdef HAVE_NOTIFY
48 +#ifndef NOTIFY_CHECK_VERSION
49 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
50 +#endif
51 +#endif
52 +
53 enum {
54 OPEN_MAILBOX_NODE,
55 CLOSE_MAILBOX_NODE,
56 @@ -3406,7 +3412,11 @@
57 } else {
58 num_total = num_new;
59 balsa_app.main_window->new_mail_note =
60 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
61 + notify_notification_new("Balsa", NULL, NULL);
62 +#else
63 notify_notification_new("Balsa", NULL, NULL, NULL);
64 +#endif
65 g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
66 new_mail_note),
67 (gpointer) & balsa_app.main_window->