empathy r2291 - in trunk: . src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan 30 17:07:55 2009
New Revision: 2291
URL: http://svn.gnome.org/viewvc/empathy?rev=2291&view=rev

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

Modified:
   trunk/configure.ac
   trunk/src/empathy-chat-window.c
   trunk/src/empathy-status-icon.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jan 30 17:07:55 2009
@@ -34,7 +34,7 @@
 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])

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Fri Jan 30 17:07:55 2009
@@ -847,9 +847,11 @@
 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);

Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c	(original)
+++ trunk/src/empathy-status-icon.c	Fri Jan 30 17:07:55 2009
@@ -83,10 +83,11 @@
 				    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;