rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Port evolution-2.7.1-notification-cleanups.patch to new libnotify API.

Browse Source 
- Require libnotify >= 0.4.
This commit is contained in:
Matthew Barnes 2006-05-23 21:03:42 +00:00
parent 2ec93646eb
commit dc78f8e17d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evolution-2.7.1-notification-cleanups.patch
View File

@ -1,5 +1,5 @@
--- evolution-2.7.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400 --- evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400
+++ evolution-2.7.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-12 14:52:43.000000000 -0400 +++ evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-23 16:04:23.000000000 -0400
@@ -1566,10 +1566,11 @@ @@ -1566,10 +1566,11 @@
const char *summary, *location; const char *summary, *location;
GtkTooltips *tooltips; GtkTooltips *tooltips;
@ -23,7 +23,7 @@
if (organiser.cn) { if (organiser.cn) {
if (location) if (location)
body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
@@ -1617,16 +1615,19 @@ @@ -1617,16 +1615,21 @@
body = g_strdup_printf ("%s %s", start_str, time_str); body = g_strdup_printf ("%s %s", start_str, time_str);
} }
@ -32,12 +32,14 @@
+ n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); + n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
+ +
+ /* Notifications don't timeout: require explicit user action: */ + /* Notifications don't timeout: require explicit user action: */
+ notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER); + notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER);
+ +
+ if (!notify_notification_show_and_forget (n, NULL)) + if (!notify_notification_show (n, NULL))
g_warning ("Could not send notification to daemon\n"); g_warning ("Could not send notification to daemon\n");
- /* create the private structure */ - /* create the private structure */
+ g_object_unref (n);
+
+ g_free (body); + g_free (body);
g_free (start_str); g_free (start_str);
g_free (end_str); g_free (end_str);

6
evolution.spec
View File

@ -129,7 +129,7 @@ Requires: libgnomeprint22 >= %{libgnomeprint22_version}
Requires: gnome-vfs2 >= %{gnomevfs2_version} Requires: gnome-vfs2 >= %{gnomevfs2_version}
%if %{libnotify_support} %if %{libnotify_support}
Requires: libnotify Requires: libnotify >= 0.4
%endif %endif
Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: libgal2 <= %{last_libgal2_version}
@ -653,6 +653,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so %{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog %changelog
* Tue May 23 2006 Matthew Barnes <mbarnes@redhat.com> 2.7.2.1-3
- Port evolution-2.7.1-notification-cleanups.patch to new libnotify API.
- Require libnotify >= 0.4.
* Fri May 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-2 * Fri May 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-2
- Require specific versions of GNU Autotools packages for building. - Require specific versions of GNU Autotools packages for building.
- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain). - Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain).