Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/osmo/files: osmo-0.2.10-libnotify-0.7.patch
Date: Sun, 30 Jan 2011 08:37:09
Message-Id: 20110130083659.006862004E@flycatcher.gentoo.org
1 ssuominen 11/01/30 08:36:58
2
3 Added: osmo-0.2.10-libnotify-0.7.patch
4 Log:
5 Import Fedora patch to 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 app-office/osmo/files/osmo-0.2.10-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/osmo/files/osmo-0.2.10-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/osmo/files/osmo-0.2.10-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: osmo-0.2.10-libnotify-0.7.patch
16 ===================================================================
17 http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD
18
19 --- src/check_events.c
20 +++ src/check_events.c
21 @@ -454,9 +454,9 @@
22 a->date = 0;
23
24 if (textdesc != NULL)
25 - a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
26 + a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
27 else
28 - a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
29 + a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
30
31 g_free (textdesc);
32 g_free (text);
33 @@ -483,9 +483,6 @@
34 #endif /* HAVE_LIBNOTIFY */
35
36 if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
37 -#ifdef HAVE_LIBNOTIFY
38 - notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
39 -#endif /* HAVE_LIBNOTIFY */
40 gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
41
42 if (config.blink_on_events) {
43 @@ -532,9 +529,9 @@
44 a->time = -1;
45 a->date = 0;
46 if (textdesc != NULL)
47 - a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
48 + a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
49 else
50 - a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
51 + a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
52
53 notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
54 notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
55 @@ -545,9 +542,6 @@
56 #endif /* HAVE_LIBNOTIFY */
57
58 if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
59 -#ifdef HAVE_LIBNOTIFY
60 - notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
61 -#endif /* HAVE_LIBNOTIFY */
62 gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
63
64 if (config.blink_on_events) {