From f7e298665b02f72890c6681e6d21ef5601beccbb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sun, 15 Feb 2009 03:27:31 +0000
Subject: Merge revisions 37200:3266 from trunk.

svn path=/branches/kill-bonobo/; revision=37270
---
 calendar/gui/alarm-notify/alarm-notify.c     | 2 +-
 calendar/gui/alarm-notify/alarm-notify.glade | 3 ++-
 calendar/gui/alarm-notify/alarm-queue.c      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index fb29f7f7d8..7afa854426 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -46,7 +46,7 @@ struct _AlarmNotifyPrivate {
         GMutex *mutex;
 };
 
-#define d(x) x
+#define d(x)
 
 
 static void alarm_notify_class_init (AlarmNotifyClass *klass);
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
index 9c2993d474..d65ed5efe6 100644
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ b/calendar/gui/alarm-notify/alarm-notify.glade
@@ -79,7 +79,8 @@
 		      <child>
 			<widget class="GtkLabel" id="label19">
 			  <property name="visible">True</property>
-			  <property name="label">Dismiss _All</property>
+			  <property name="label" 
+translatable="yes">Dismiss _All</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 77a5574157..bb7508fbcd 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -57,7 +57,7 @@
 
 
 
-#define d(x) x
+#define d(x)
 
 /* The dialog with alarm nofications */
 static AlarmNotificationsDialog *alarm_notifications_dialog = NULL;
@@ -477,7 +477,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time(NULL);
+		d(time_t tnow = time(NULL));
 
 		instance = l->data;
 
-- 
cgit v1.2.3