From 5f55aba5b052fb7284973f50009f8b369334d084 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 1 May 2009 06:44:36 -0400
Subject: Merge in changes from master.

---
 calendar/gui/alarm-notify/alarm-notify-dialog.c | 3 ---
 calendar/gui/alarm-notify/alarm-queue.c         | 4 ----
 2 files changed, 7 deletions(-)

(limited to 'calendar/gui/alarm-notify')

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index ee09c0dde4..7f54b6bf2d 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -26,9 +26,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#if 0
-#  include <libgnomeui/gnome-winhints.h>
-#endif
 #include <glade/glade.h>
 #include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 531cc115cd..0328743a77 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -55,10 +55,6 @@
 #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)
 
 /* The dialog with alarm nofications */
-- 
cgit v1.2.3