aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchen@src.gnome.org>2006-01-16 19:47:04 +0800
committerChenthill Palanisamy <pchen@src.gnome.org>2006-01-16 19:47:04 +0800
commitfebeaeb124bc49ee23226b87d3ed4770c69eaa9b (patch)
treea607d8b831ad5b111416ad2e25f4c0864b225381
parent3732aabca58ffd28487a1d7dc8c449e216a20917 (diff)
downloadgsoc2013-evolution-febeaeb124bc49ee23226b87d3ed4770c69eaa9b.tar.gz
gsoc2013-evolution-febeaeb124bc49ee23226b87d3ed4770c69eaa9b.tar.zst
gsoc2013-evolution-febeaeb124bc49ee23226b87d3ed4770c69eaa9b.zip
fixes #325629
svn path=/trunk/; revision=31211
-rw-r--r--ChangeLog4
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c18
-rw-r--r--configure.in2
4 files changed, 18 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b9315b551..c078911874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 24ff9607b3..fac1693b6f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -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
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index c177d8e5b1..0f15ce342d 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -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);
diff --git a/configure.in b/configure.in
index f87f7b5c1c..0767cab7a6 100644
--- a/configure.in
+++ b/configure.in
@@ -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"