From 796b364accc8b078713814b8ad136162a8e3746e Mon Sep 17 00:00:00 2001 From: Igor Murzov Date: Sat, 22 Dec 2012 23:44:20 +0000 Subject: [PATCH] Partially revert r81480, which broke everyting-places module. It turned out that evry_api.h depends on properly defined _ symbol. Who knew? SVN revision: 81651 --- po/Makevars | 2 +- src/e_mod_main.c | 4 ++-- src/e_mod_main.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/Makevars b/po/Makevars index 446ec3c..c6a5b44 100644 --- a/po/Makevars +++ b/po/Makevars @@ -8,7 +8,7 @@ subdir = po top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=D_ --keyword=N_ \ +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \ --keyword=EVRY_PLUGIN_BASE:1 --keyword=EVRY_ACTION_NEW:1 \ --from-code=UTF-8 --foreign-user diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 7c1833f..e3ece81 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -135,10 +135,10 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item) EVRY_PLUGIN_INSTANCE(p, plugin); - _item_add(p, D_("Home"), e_user_homedir_get(), _mime_dir, NULL); + _item_add(p, _("Home"), e_user_homedir_get(), _mime_dir, NULL); e_user_dir_concat_static(path, "backgrounds"); - _item_add(p, D_("Wallpaper"), path, _mime_dir, NULL); + _item_add(p, _("Wallpaper"), path, _mime_dir, NULL); _gtk_bookmarks_add(p); diff --git a/src/e_mod_main.h b/src/e_mod_main.h index cc3eb71..9ba49fb 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -3,11 +3,11 @@ #ifdef ENABLE_NLS # include -# define D_(string) dgettext(PACKAGE, string) +# define _(string) dgettext(PACKAGE, string) #else # define bindtextdomain(domain,dir) # define bind_textdomain_codeset(domain,codeset) -# define D_(string) (string) +# define _(string) (string) #endif #define N_(str) (str)