diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2009-01-31 01:07:55 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2009-01-31 01:07:55 +0800 |
| commit | 41800d58965af91e645e7aee95e158771379a93a (patch) | |
| tree | f80caba125a2e371e633979057516037078b160a | |
| parent | 053e6bc84a514de331fb09eaae0308f8617ba560 (diff) | |
| download | gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.tar gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.tar.gz gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.tar.bz2 gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.tar.lz gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.tar.xz gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.tar.zst gsoc2013-empathy-41800d58965af91e645e7aee95e158771379a93a.zip | |
Make possible to use libnotify 0.4.4, to not force the usage of too recent distributions.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2291 4ee84921-47dd-4033-b63a-18d7a039a3e4
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 4 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 23b1cbb37..689cf7f79 100644 --- 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 e080a5317..31a2866a6 100644 --- 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 86a2c84fa..08293de55 100644 --- 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; |