evolution r37292 - in trunk: calendar/gui/alarm-notify plugins/mail-notification

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Feb 19 03:40:14 2009
New Revision: 37292
URL: http://svn.gnome.org/viewvc/evolution?rev=37292&view=rev

Log:
Rats.  gtk_status_icon_set_tooltip_text() is only in 2.16.
Define some temporary macros to work around it.


Modified:
   trunk/calendar/gui/alarm-notify/alarm-queue.c
   trunk/plugins/mail-notification/mail-notification.c

Modified: trunk/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ trunk/calendar/gui/alarm-notify/alarm-queue.c	Thu Feb 19 03:40:14 2009
@@ -55,7 +55,9 @@
 #include "e-util/e-popup.h"
 #include "e-util/e-error.h"
 
-
+#if !GTK_CHECK_VERSION(2,16,0)
+#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip
+#endif
 
 #define d(x)
 

Modified: trunk/plugins/mail-notification/mail-notification.c
==============================================================================
--- trunk/plugins/mail-notification/mail-notification.c	(original)
+++ trunk/plugins/mail-notification/mail-notification.c	Thu Feb 19 03:40:14 2009
@@ -54,6 +54,10 @@
 #define GCONF_KEY_ENABLED_STATUS 	GCONF_KEY_ROOT "status-enabled"
 #define GCONF_KEY_ENABLED_SOUND	 	GCONF_KEY_ROOT "sound-enabled"
 
+#if !GTK_CHECK_VERSION(2,16,0)
+#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip
+#endif
+
 static gboolean enabled = FALSE;
 static GtkWidget *get_cfg_widget (void);
 static GStaticMutex mlock = G_STATIC_MUTEX_INIT;