Port to libnotify 0.7.0

https://bugzilla.gnome.org/show_bug.cgi?id=631944

diff --git a/configure.ac b/configure.ac
index 94ee86fa025cb54409e2bfd786e646ef1f6c192a..0b9777a7e99c62ffd778ad3c1f0fd5b5226cfd75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=2.91.1
 KEYRING_REQUIRED=2.26.0
 LIBCANBERRA_GTK_REQUIRED=0.25
-LIBNOTIFY_REQUIRED=0.5.1
+LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
 TELEPATHY_GLIB_REQUIRED=0.13.1.1
 TELEPATHY_LOGGER=0.1.5

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index fe2783667550c610680990b4877232ebdca63d17..a92e28b2a605555fa77e29d7685845dd33cd917f 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1320,7 +1320,7 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window,
                   to an existing notification with the same title.
                   In this way the previous message will not be lost: the new
                   message will appear below it, in the same notification */
-               notification = notify_notification_new (header, escaped, NULL, NULL);
+               notification = notify_notification_new (header, escaped, NULL);
 
                if (priv->notification == NULL) {
                        priv->notification = notification;

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index a062f51692bfa0a87886150731c4a4418f75f74f..e61e0cfd407f96a3dc47c8e5ec9ba8a24926f6cc 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -206,8 +206,8 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
                           to an existing notification with the same title.
                           In this way the previous message will not be lost: the new
                           message will appear below it, in the same notification */
-                       notification = notify_notification_new_with_status_icon
-                               (priv->event->header, message_esc, NULL, priv->icon);
+                       notification = notify_notification_new
+                               (priv->event->header, message_esc, NULL);
 
                        if (priv->notification == NULL) {
                                priv->notification = notification;