[evolution/express2: 24/51] Alter UI conditional syntax to be more familiar cpp style, which avoids the need for intltool change
- From: Michael Meeks <michael src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/express2: 24/51] Alter UI conditional syntax to be more familiar cpp style, which avoids the need for intltool change
- Date: Wed, 7 Apr 2010 13:22:41 +0000 (UTC)
commit a8333818241c60c0c111e7b7ac68ca80ec8fdb5d
Author: Michael Meeks <michael meeks novell com>
Date: Tue Mar 23 10:24:31 2010 +0000
Alter UI conditional syntax to be more familiar cpp style, which
avoids the need for intltool changes.
plugins/bbdb/gaimbuddies.c | 1 +
ui/evolution-calendars.ui | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 184c071..586f508 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -40,6 +40,7 @@
#include <string.h>
#include <libebook/e-book.h>
+#undef EDS_DISABLE_DEPRECATED
#include <libedataserver/md5-utils.h>
#include <libedataserverui/e-source-combo-box.h>
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index d3ef98a..8cc6bf2 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -28,33 +28,33 @@
</placeholder>
</menubar>
<toolbar name='main-toolbar'>
-<!-- if !EXPRESS -->
+#if !EXPRESS
<toolitem action='calendar-print'/>
<toolitem action='delete-selection'/>
<separator/>
-<!-- endif -->
+#endif
<toolitem action='calendar-go-back'/>
<toolitem action='calendar-go-today'/>
<toolitem action='calendar-go-forward'/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
<separator/>
<toolitem action='calendar-jump-to'/>
-<!-- endif -->
+#endif
<separator/>
<toolitem action='calendar-view-day'/>
<toolitem action='calendar-view-workweek'/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
<toolitem action='calendar-view-week'/>
-<!-- endif -->
+#endif
<toolitem action='calendar-view-month'/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
<toolitem action='calendar-view-list'/>
-<!-- endif -->
-<!-- if EXPRESS -->
+#endif
+#if EXPRESS
<separator expand="true"/>
<toolitem action='quit-calendar'/>
-<!-- endif -->
+#endif
</toolbar>
<popup name='calendar-popup'>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]