Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/lxmusic/files: lxmusic-0.4.4-libnotify-0.7.patch
Date: Sat, 29 Jan 2011 20:19:49
Message-Id: 20110129201940.AC3D020057@flycatcher.gentoo.org
1 ssuominen 11/01/29 20:19:40
2
3 Added: lxmusic-0.4.4-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 media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: lxmusic-0.4.4-libnotify-0.7.patch
16 ===================================================================
17 --- src/lxmusic-notify.c
18 +++ src/lxmusic-notify.c
19 @@ -56,12 +56,26 @@
20 g_return_if_fail (message != NULL);
21
22 lxmusic_clear_notify (n);
23 -
24 - notify = notify_notification_new (summary, message,
25 - "lxmusic", NULL);
26 +#ifdef NOTIFY_CHECK_VERSION
27 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
28 + notify = notify_notification_new (summary, message, "lxmusic");
29 +#else
30 + notify = notify_notification_new (summary, message, "lxmusic", NULL);
31 +#endif
32 +#else
33 + notify = notify_notification_new (summary, message, "lxmusic", NULL);
34 +#endif
35 n->notification = notify;
36
37 +#ifdef NOTIFY_CHECK_VERSION
38 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
39 +/* lazy */
40 +#else
41 +/* lazy */
42 +#endif
43 +#else
44 notify_notification_attach_to_status_icon (notify, n->status_icon);
45 +#endif
46 notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
47 notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);