aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/alarm-notify
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-01 18:44:36 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-01 18:44:36 +0800
commit5f55aba5b052fb7284973f50009f8b369334d084 (patch)
treee7a5149f56fd8550915c3141a408fb79a14d0239 /calendar/gui/alarm-notify
parent6824309c1179f1346b4877f67e386f237d954196 (diff)
downloadgsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.gz
gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.zst
gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.zip
Merge in changes from master.
Diffstat (limited to 'calendar/gui/alarm-notify')
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c3
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c4
2 files changed, 0 insertions, 7 deletions
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 */