From 8854c727c1c05bc22a7757ffa93bc9533286525f Mon Sep 17 00:00:00 2001 From: Flo Gravo Date: Fri, 22 Oct 2010 18:54:27 -0400 Subject: Bug 632903 - Support libnotify-0.7 --- plugins/mail-notification/mail-notification.c | 8 ++++++-- plugins/publish-calendar/publish-calendar.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index f8fd766cb1..961868ad56 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -562,11 +562,15 @@ new_notify_status (EMEventTargetFolder *t) if (!notify_init ("evolution-mail-notification")) fprintf (stderr,"notify init error"); +#ifdef HAVE_LIBNOTIFY_07 notify = notify_notification_new ( - _("New email"), safetext, - "mail-unread", NULL); + _("New email"), safetext, "mail-unread"); +#else + notify = notify_notification_new ( + _("New email"), safetext, "mail-unread", NULL); notify_notification_attach_to_status_icon ( notify, status_icon); +#endif /* HAVE_LIBNOTIFY_07 */ /* Check if actions are supported */ if (can_support_actions ()) { diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index d30a9b15f2..da9306331d 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -140,7 +140,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) gtk_status_icon_set_from_stock (status_icon, stock_name); gtk_status_icon_set_tooltip_text (status_icon, actual_msg->str); - #ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBNOTIFY if (can_notify) { if (notify) { notify_notification_update (notify, _("Calendar Publishing"), actual_msg->str, stock_name); @@ -150,8 +150,12 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) 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); @@ -159,7 +163,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) g_signal_connect (notify, "closed", G_CALLBACK (remove_notification), NULL); } } - #endif +#endif status_icon_timeout_id = g_timeout_add_seconds (15, remove_notification, NULL); -- cgit v1.2.3