aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-03-23 18:24:31 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-04-07 19:18:30 +0800
commita8333818241c60c0c111e7b7ac68ca80ec8fdb5d (patch)
tree8c32fba5bfd563bcef2711dfe4093f5758adf732
parentfe177f5a12127203f0b77c32ec0ae17d7394f6b2 (diff)
downloadgsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.tar
gsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.tar.gz
gsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.tar.bz2
gsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.tar.lz
gsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.tar.xz
gsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.tar.zst
gsoc2013-evolution-a8333818241c60c0c111e7b7ac68ca80ec8fdb5d.zip
Alter UI conditional syntax to be more familiar cpp style, which
avoids the need for intltool changes.
-rw-r--r--plugins/bbdb/gaimbuddies.c1
-rw-r--r--ui/evolution-calendars.ui20
2 files changed, 11 insertions, 10 deletions
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 184c071e39..586f5083b7 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 d3ef98a75b..8cc6bf2f91 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'>