From 91fddc18380df258a66a93648978fece4ffcaaf1 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 1 Nov 2011 22:28:45 +0000 Subject: [PATCH] fix gettext usage after import from extras SVN revision: 64623 --- src/modules/tasks/e_mod_config.c | 6 +++--- src/modules/tasks/e_mod_main.c | 12 +++--------- src/modules/tasks/e_mod_main.h | 9 --------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/modules/tasks/e_mod_config.c b/src/modules/tasks/e_mod_config.c index a183ea0..f893739 100644 --- a/src/modules/tasks/e_mod_config.c +++ b/src/modules/tasks/e_mod_config.c @@ -28,7 +28,7 @@ _config_tasks_module(Config_Item *ci) v->basic.create_widgets = _basic_create_widgets; con = e_container_current_get(e_manager_current_get()); - cfd = e_config_dialog_new(con, D_("Tasks Configuration"), "Tasks", + cfd = e_config_dialog_new(con, _("Tasks Configuration"), "Tasks", "_e_modules_tasks_config_dialog", NULL, 0, v, ci); if (tasks_config->config_dialog) e_object_del(E_OBJECT(tasks_config->config_dialog)); @@ -70,8 +70,8 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, D_("Display"), 0); - ob = e_widget_check_add(evas, D_("Show windows from all desktops"), + of = e_widget_framelist_add(evas, _("Display"), 0); + ob = e_widget_check_add(evas, _("Show windows from all desktops"), &(cfdata->show_all)); e_widget_framelist_object_append(of, ob); ow = e_widget_label_add(evas, _("Minimum Width")); diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index 2739977..0175b31 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -99,12 +99,6 @@ EAPI E_Module_Api e_modapi = EAPI void * e_modapi_init(E_Module *m) { - char buf[4096]; - - snprintf(buf, sizeof(buf), "%s/locale", e_module_dir_get(m)); - bindtextdomain(PACKAGE, buf); - bind_textdomain_codeset(PACKAGE, "UTF-8"); - conf_item_edd = E_CONFIG_DD_NEW("Tasks_Config_Item", Config_Item); #undef T @@ -307,7 +301,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) static char * _gc_label(E_Gadcon_Client_Class *client_class) { - return D_("Tasks"); + return _("Tasks"); } static Evas_Object * @@ -678,14 +672,14 @@ _tasks_cb_item_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf m = e_menu_new(); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, D_("Settings")); + e_menu_item_label_set(mi, _("Settings")); e_util_menu_item_theme_icon_set(mi, "preferences-system"); e_menu_item_callback_set(mi, _tasks_cb_menu_configure, item->tasks); m = e_gadcon_client_util_menu_items_append(item->tasks->gcc, m, 0); mi = e_menu_item_new(item->border->border_menu); - e_menu_item_label_set(mi, D_("Tasks")); + e_menu_item_label_set(mi, _("Tasks")); e_menu_item_submenu_set(mi, m); e_util_menu_item_theme_icon_set(mi, "preferences-system"); diff --git a/src/modules/tasks/e_mod_main.h b/src/modules/tasks/e_mod_main.h index 2c01bdb..f4ffc79 100644 --- a/src/modules/tasks/e_mod_main.h +++ b/src/modules/tasks/e_mod_main.h @@ -1,15 +1,6 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -#ifdef ENABLE_NLS -# include -# define D_(string) dgettext(PACKAGE, string) -#else -# define bindtextdomain(domain,dir) -# define bind_textdomain_codeset(domain,codeset) -# define D_(string) (string) -#endif - typedef struct _Config Config; typedef struct _Config_Item Config_Item; -- 2.7.4