vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compiler warnings when E is compiled without gettext. 

SVN revision: 49775
This commit is contained in:
Christopher Michael 2010-06-21 02:17:58 +00:00
parent 77cd6f5b18
commit 384a49358f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_intl.c
View File

@ -251,9 +251,11 @@ e_intl_language_set(const char *lang)
} }
else else
{ {
#ifdef HAVE_GETTEXT
bindtextdomain(PACKAGE, locale_path); bindtextdomain(PACKAGE, locale_path);
textdomain(PACKAGE); textdomain(PACKAGE);
bind_textdomain_codeset(PACKAGE, "UTF-8"); bind_textdomain_codeset(PACKAGE, "UTF-8");
#endif
free(locale_path); free(locale_path);
} }
} }
@ -285,7 +287,7 @@ e_intl_language_list(void)
EINA_LIST_FOREACH(dir_list, next, epd) EINA_LIST_FOREACH(dir_list, next, epd)
{ {
Eina_List *dir_languages; Eina_List *dir_languages;
char *language; char *language;
dir_languages = _e_intl_language_dir_scan(epd->dir); dir_languages = _e_intl_language_dir_scan(epd->dir);
@ -310,11 +312,10 @@ _e_intl_language_list_find(Eina_List *language_list, char *language)
Eina_List *l; Eina_List *l;
char *lang; char *lang;
if (!language_list) return 0; if ((!language_list) || (!language)) return 0;
if (!language) return 0;
EINA_LIST_FOREACH(language_list, l, lang) EINA_LIST_FOREACH(language_list, l, lang)
if (!strcmp(lang, language)) return 1; if (!strcmp(lang, language)) return 1;
return 0; return 0;
} }
@ -360,7 +361,6 @@ e_intl_input_method_set(const char *imc_path)
(!ecore_exe_pid_get(_e_intl_input_method_exec))) (!ecore_exe_pid_get(_e_intl_input_method_exec)))
e_util_dialog_show(_("Input Method Error"), e_util_dialog_show(_("Input Method Error"),
_( "Error starting the input method executable<br><br>" _( "Error starting the input method executable<br><br>"
"please make sure that your input<br>" "please make sure that your input<br>"
"method configuration is correct and<br>" "method configuration is correct and<br>"
"that your configuration's<br>" "that your configuration's<br>"
@ -425,7 +425,7 @@ _e_intl_cb_exit(void *data, int type, void *event)
if (!ev->exe) return 1; if (!ev->exe) return 1;
if (!(ecore_exe_tag_get(ev->exe) && if (!(ecore_exe_tag_get(ev->exe) &&
(!strcmp(ecore_exe_tag_get(ev->exe), "E/im_exec")))) return 1; (!strcmp(ecore_exe_tag_get(ev->exe), "E/im_exec")))) return 1;
_e_intl_input_method_exec = NULL; _e_intl_input_method_exec = NULL;
return 1; return 1;
@ -501,7 +501,7 @@ _e_intl_language_path_find(char *language)
e_path_dir_list_free(dir_list); e_path_dir_list_free(dir_list);
EINA_LIST_FREE(search_list, data) EINA_LIST_FREE(search_list, data)
free(data); free(data);
return directory; return directory;
} }
@ -525,7 +525,7 @@ _e_intl_language_dir_scan(const char *dir)
char file_path[PATH_MAX]; char file_path[PATH_MAX];
snprintf(file_path, sizeof(file_path),"%s/%s/LC_MESSAGES/%s.mo", snprintf(file_path, sizeof(file_path),"%s/%s/LC_MESSAGES/%s.mo",
dir, file, PACKAGE); dir, file, PACKAGE);
if (ecore_file_exists(file_path) && !ecore_file_is_dir(file_path)) if (ecore_file_exists(file_path) && !ecore_file_is_dir(file_path))
languages = eina_list_append(languages, file); languages = eina_list_append(languages, file);
else else