Make possible to use libnotify 0.4.4, to not force the usage of too recent distributions.

svn path=/trunk/; revision=2291

diff --git a/configure.ac b/configure.ac
index 23b1cbb3791f9a7d84d4b8116a091aa51f9ee13b..689cf7f79e3a4d5d18a1f25a26c7567ebdb7eeb5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ TELEPATHY_GLIB_REQUIRED=0.7.19
 MISSION_CONTROL_REQUIRED=4.61
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
-LIBNOTIFY_REQUIRED=0.4.5
+LIBNOTIFY_REQUIRED=0.4.4
 
 # Uncomment that to build with deprecated symbols disabled
 #AC_DEFINE(G_DISABLE_DEPRECATED, [], [Disable deprecated GLib symbols])

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index e080a53174d8b11715d0fea189095c58c8a0f726..31a2866a620de96196708dd7b5916f77d4beb55c 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -847,9 +847,11 @@ static void
 chat_window_notification_closed_cb (NotifyNotification *notify,
                                    EmpathyChat *chat)
 {
-       int reason;
+       int reason = 1;
 
+#ifdef notify_notification_get_closed_reason
        reason = notify_notification_get_closed_reason (notify);
+#endif
 
        if (reason == 2) {
                g_idle_add ((GSourceFunc) notification_closed_idle_cb, chat);

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 86a2c84fa8bf1dfe83f4706df7c1aa9b235af186..08293de555ba02ca35a2b39a2156d1b514ca2445 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -83,10 +83,11 @@ status_icon_notification_closed_cb (NotifyNotification *notification,
                                    EmpathyStatusIcon  *icon)
 {
        EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-       int reason;
+       int reason = 1;
 
+#ifdef notify_notification_get_closed_reason
        reason = notify_notification_get_closed_reason (notification);
-
+#endif
        if (priv->notification) {
                g_object_unref (priv->notification);
                priv->notification = NULL;