diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-03-23 18:24:31 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-03-23 18:25:54 +0800 |
| commit | 495f8f8003ac98ab63fa68aa89fbe8668c357320 (patch) | |
| tree | 6ac8d78a53803cc722a79f30f93986599371345d /plugins | |
| parent | f794e6a0032c9cee5ffb00eeefb8dc92662742de (diff) | |
| download | gsoc2013-evolution-495f8f8003ac98ab63fa68aa89fbe8668c357320.tar.gz gsoc2013-evolution-495f8f8003ac98ab63fa68aa89fbe8668c357320.tar.zst gsoc2013-evolution-495f8f8003ac98ab63fa68aa89fbe8668c357320.zip | |
Alter UI conditional syntax to be more familiar cpp style, which
avoids the need for intltool changes.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bbdb/gaimbuddies.c | 1 | ||||
| -rw-r--r-- | plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml | 10 |
2 files changed, 6 insertions, 5 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/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml index 9cb3909f7a..d904d295d6 100644 --- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml +++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml @@ -7,7 +7,7 @@ <hook class="org.gnome.evolution.ui:1.0"> <ui-manager id="org.gnome.evolution.mail.browser" callback="mail_browser_init"> -<!-- if !EXPRESS --> +#if !EXPRESS <menubar name='main-menu'> <placeholder name='custom-menus'> <menu action="mail-message-menu"> @@ -28,11 +28,11 @@ <menuitem action="mail-convert-to-memo"/> </placeholder> </popup> -<!-- endif --> +#endif </ui-manager> <ui-manager id="org.gnome.evolution.mail" callback="mail_shell_view_init"> -<!-- if !EXPRESS --> +#if !EXPRESS <menubar name='main-menu'> <placeholder name='custom-menus'> <menu action="mail-message-menu"> @@ -46,7 +46,7 @@ </placeholder> </menubar> <popup name="mail-message-popup"> - <placeholder name="mail-message-popup-actions"> + <placeholder name="mail-message-popup-actions"> <menuitem action="mail-convert-to-event"/> <menuitem action="mail-convert-to-meeting"/> <menuitem action="mail-convert-to-task"/> @@ -61,8 +61,8 @@ <menuitem action="mail-convert-to-memo"/> </placeholder> </popup> -<!-- endif --> </ui-manager> +#endif </hook> </e-plugin> |