diff options
| -rw-r--r-- | calendar/alarm-notify/alarm-queue.c | 4 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 5 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 5 |
4 files changed, 1 insertions, 19 deletions
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c index a3a5351acd..2ffd427f45 100644 --- a/calendar/alarm-notify/alarm-queue.c +++ b/calendar/alarm-notify/alarm-queue.c @@ -1768,11 +1768,7 @@ popup_notification (time_t trigger, "%s %s", start_str, time_str); } -#ifdef HAVE_LIBNOTIFY_07 n = notify_notification_new (summary, body, "appointment-soon"); -#else - n = notify_notification_new (summary, body, "appointment-soon", NULL); -#endif /* HAVE_LIBNOTIFY_07 */ if (!notify_notification_show (n, NULL)) g_warning ("Could not send notification to daemon\n"); diff --git a/configure.ac b/configure.ac index 1a18edb4a8..fc4299398c 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,6 @@ m4_define([libsoup_minimum_version], [2.38.1]) m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) m4_define([libpst_minimum_version], [0.6.54]) -m4_define([libnotify_minimum_version], [0.5.1]) dnl Optional Packages m4_define([champlain_minimum_version], [0.12]) @@ -60,6 +59,7 @@ m4_define([gladeui_minimum_version], [3.10.0]) m4_define([goa_minimum_version], [3.2]) m4_define([gweather_minimum_version], [2.90.0]) m4_define([libcanberra_gtk_minimum_version], [0.25]) +m4_define([libnotify_minimum_version], [0.7]) m4_define([nm_minimum_version], [0.7]) dnl XXX These versions don't yet exist. The latest releases @@ -1185,10 +1185,6 @@ fi AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) -if $PKG_CONFIG --atleast-version=0.7 libnotify; then - AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify >= 0.7]) -fi - dnl ************** dnl Calendar Flags dnl ************** diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index d859c47072..94cfa6c6c1 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -434,13 +434,8 @@ new_notify_status (EMEventTargetFolder *t) if (!notify_init ("evolution-mail-notification")) fprintf (stderr,"notify init error"); -#ifdef HAVE_LIBNOTIFY_07 notify = notify_notification_new ( summary, escaped_text, icon_name); -#else - notify = notify_notification_new ( - summary, escaped_text, icon_name, NULL); -#endif /* HAVE_LIBNOTIFY_07 */ notify_notification_set_urgency ( notify, NOTIFY_URGENCY_NORMAL); diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index ccba649037..af4eb28cf7 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -150,12 +150,7 @@ update_publish_notification (GtkMessageType msg_type, return; } -#ifdef HAVE_LIBNOTIFY_07 notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name); -#else - notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL); - notify_notification_attach_to_status_icon (notify, status_icon); -#endif /* HAVE_LIBNOTIFY_07 */ notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); g_timeout_add (500, show_notify_cb, NULL); |