diff options
| author | William Jon McCann <jmccann@redhat.com> | 2010-10-12 14:15:51 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-02 01:31:49 +0800 |
| commit | bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3 (patch) | |
| tree | 07af15f7cf4ffb0ac9df2be87a41cd2b54507904 | |
| parent | b9d9c5d90b62b0005b609ca3db30162498422c55 (diff) | |
| download | gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.tar gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.tar.gz gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.tar.bz2 gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.tar.lz gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.tar.xz gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.tar.zst gsoc2013-empathy-bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3.zip | |
Port to libnotify 0.7.0
https://bugzilla.gnome.org/show_bug.cgi?id=631944
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index f84195a6f..aef0ed57f 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ GNUTLS_REQUIRED=2.8.5 GTK_REQUIRED=2.22.0 KEYRING_REQUIRED=2.26.0 LIBCANBERRA_GTK_REQUIRED=0.4 -LIBNOTIFY_REQUIRED=0.4.4 +LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSIGHT_REQUIRED=0.0.14 TELEPATHY_GLIB_REQUIRED=0.13.11 TELEPATHY_LOGGER=0.1.5 @@ -180,8 +180,7 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED) # libnotify 0.7 introduced API changes PKG_CHECK_MODULES(LIBNOTIFY, - libnotify >= $LIBNOTIFY_REQUIRED - libnotify < 0.7) + libnotify >= $LIBNOTIFY_REQUIRED) PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED) # gnome-keyring breaks API in 2.91.x PKG_CHECK_MODULES(GCR, diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index d953355a5..0455642f8 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1300,7 +1300,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 8ab641a6b..b05a0c862 100644 --- 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; |