callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #325629

Browse Source 
svn path=/trunk/; revision=31211
This commit is contained in:
Chenthill Palanisamy
2006-01-16 11:47:04 +00:00
parent 3732aabca5
commit febeaeb124
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-16 Chenthill Palanisamy <pchenthill@novell.com>
* configure.in: Use libnotify >= 0.30.
2006-01-16 Harish Krishnaswamy <kharish@novell.com>
* configure.in: Add caldav to plugins_base_always

8
calendar/ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-16 Chenthill Palanisamy <pchenthill@novell.com>
Patch submitted by Sebastien Bacher <seb128@debian.org>
Fixes #325629
* gui/alarm-notify/alarm-queue.c: (popup_notification): Use the new
apis in libnotify.
2006-01-16 P S Chakravarthi <pchakravarthi@novell.com>
Fixes #324816 #324889

18
calendar/gui/alarm-notify/alarm-queue.c
View File

@ -1462,7 +1462,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
char *str, *start_str, *end_str, *alarm_str, *time_str;
icaltimezone *current_zone;
ECalComponentOrganizer organiser;
NotifyIcon *icon;
char *filename;
char *body;
@ -1472,8 +1471,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
return;
if (!notify_is_initted ())
notify_init("Evolution Alarm Notify");
filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
icon = notify_icon_new_from_uri (filename);
GdkPixbuf *icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
g_free (filename);
/* get a sensible description for the event */
@ -1513,16 +1511,10 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
body = g_strdup_printf ("%s %s", start_str, time_str);
}
if (!notify_send_notification (
NULL, "device", NOTIFY_URGENCY_NORMAL,
summary,
body, /* body text */
icon, /* icon */
TRUE, 0, /* expiry, server default */
NULL, /* hints */
NULL, /* no user_data */
0)) /* no actions */
g_warning ("Could not send notification to daemon\n");
NotifyNotification *n = notify_notification_new (summary, body, "", NULL);
notify_notification_set_icon_data_from_pixbuf (n, icon);
if (!notify_notification_show(n, NULL))
g_warning ("Could not send notification to daemon\n");
/* create the private structure */
g_free (start_str);

2
configure.in
View File

@ -1239,7 +1239,7 @@ fi
LIBNOTIFY_CFLAGS=
LIBNOTIFY_LIBS=
PKG_CHECK_MODULES(LIBNOTIFY, libnotify, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.30, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
if test "x$HAVE_LIBNOTIFY" = "xyes"; then
AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available])
libnotify="libnotify"