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

E17: remove trailing white spaces (yes, I'm Mr Pedant-Man) 

SVN revision: 64547
This commit is contained in:
Vincent Torri 2011-10-31 07:20:53 +00:00
parent 479fdad8ab
commit 2ebfbe9b9f
2 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
src/modules/conf_intl/e_int_config_intl.c
View File

@ -69,7 +69,7 @@ struct _E_Config_Dialog_Data
/* Current data */ /* Current data */
char *cur_language; char *cur_language;
const char *cur_blang; const char *cur_blang;
const char *cur_lang; const char *cur_lang;
@ -92,9 +92,9 @@ struct _E_Config_Dialog_Data
Evas_Object *reg_list; Evas_Object *reg_list;
Evas_Object *cs_list; Evas_Object *cs_list;
Evas_Object *mod_list; Evas_Object *mod_list;
Evas_Object *locale_entry; Evas_Object *locale_entry;
} }
gui; gui;
}; };
@ -526,15 +526,15 @@ const E_Intl_Pair region_predefined_pairs[ ] = {
{ NULL, NULL, NULL} { NULL, NULL, NULL}
}; };
/* This comes from /* This comes from
$ man charsets $ man charsets
* and * and
$ locale -a | grep -v @ | grep "\." | cut -d . -f 2 | sort -u $ locale -a | grep -v @ | grep "\." | cut -d . -f 2 | sort -u
* *
* On some machines is complains if codesets don't look like this * On some machines is complains if codesets don't look like this
* On linux its not really a problem but BSD has issues. So we neet to * On linux its not really a problem but BSD has issues. So we neet to
* make sure that locale -a output gets converted to upper-case form in * make sure that locale -a output gets converted to upper-case form in
* all situations just to be safe. * all situations just to be safe.
*/ */
const E_Intl_Pair charset_predefined_pairs[ ] = { const E_Intl_Pair charset_predefined_pairs[ ] = {
/* These are in locale -a but not in charsets */ /* These are in locale -a but not in charsets */
@ -581,14 +581,14 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
if (e_config_dialog_find("E", "language/language_settings")) return NULL; if (e_config_dialog_find("E", "language/language_settings")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1); v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data; v->create_cfdata = _create_data;
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
v->advanced.create_widgets = _advanced_create_widgets; v->advanced.create_widgets = _advanced_create_widgets;
v->advanced.apply_cfdata = _advanced_apply_data; v->advanced.apply_cfdata = _advanced_apply_data;
v->basic.create_widgets = _basic_create_widgets; v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data; v->basic.apply_cfdata = _basic_apply_data;
cfd = e_config_dialog_new(con, cfd = e_config_dialog_new(con,
_("Language Settings"), _("Language Settings"),
"E", "language/language_settings", "E", "language/language_settings",
@ -596,8 +596,8 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
return cfd; return cfd;
} }
/* Build hash tables used for locale navigation. The locale information is /* Build hash tables used for locale navigation. The locale information is
* gathered using the locale -a command. * gathered using the locale -a command.
* *
* Below the following terms are used: * Below the following terms are used:
* ll - Locale Language Code (Example en) * ll - Locale Language Code (Example en)
@ -610,16 +610,16 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{ {
Eina_List *e_lang_list; Eina_List *e_lang_list;
FILE *output; FILE *output;
e_lang_list = e_intl_language_list(); e_lang_list = e_intl_language_list();
/* Get list of all locales and start making map */ /* Get list of all locales and start making map */
#ifdef __OpenBSD__ #ifdef __OpenBSD__
output = popen("ls /usr/share/locale", "r"); output = popen("ls /usr/share/locale", "r");
#else #else
output = popen("locale -a", "r"); output = popen("locale -a", "r");
#endif #endif
if ( output ) if ( output )
{ {
char line[32]; char line[32];
while (fscanf(output, "%[^\n]\n", line) == 1) while (fscanf(output, "%[^\n]\n", line) == 1)
@ -636,12 +636,12 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (basic_language) if (basic_language)
{ {
int i; int i;
i = 0; i = 0;
while (basic_language_predefined_pairs[i].locale_key) while (basic_language_predefined_pairs[i].locale_key)
{ {
/* if basic language is supported by E and System*/ /* if basic language is supported by E and System*/
if (!strncmp(basic_language_predefined_pairs[i].locale_key, if (!strncmp(basic_language_predefined_pairs[i].locale_key,
basic_language, strlen(basic_language))) basic_language, strlen(basic_language)))
{ {
if (!eina_list_data_find(cfdata->blang_list, &basic_language_predefined_pairs[i])) if (!eina_list_data_find(cfdata->blang_list, &basic_language_predefined_pairs[i]))
@ -675,18 +675,18 @@ _fill_data(E_Config_Dialog_Data *cfdata)
/* Check if the language list exists */ /* Check if the language list exists */
/* Linear Search */ /* Linear Search */
for (next = e_lang_list; next; next = next->next) for (next = e_lang_list; next; next = next->next)
{ {
char *e_lang; char *e_lang;
e_lang = next->data; e_lang = next->data;
if (!strncmp(e_lang, locale_parts->lang, 2) || !strcmp("en", locale_parts->lang)) if (!strncmp(e_lang, locale_parts->lang, 2) || !strcmp("en", locale_parts->lang))
{ {
lang_node->lang_available = 1; lang_node->lang_available = 1;
break; break;
} }
} }
/* Search for translation */ /* Search for translation */
/* Linear Search */ /* Linear Search */
i = 0; i = 0;
@ -744,13 +744,13 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{ {
const char * cs = NULL; const char * cs = NULL;
const char * cs_trans; const char * cs_trans;
cs_trans = _intl_charset_upper_get(locale_parts->codeset); cs_trans = _intl_charset_upper_get(locale_parts->codeset);
if (!cs_trans) if (!cs_trans)
cs = eina_stringshare_add(locale_parts->codeset); cs = eina_stringshare_add(locale_parts->codeset);
else else
cs = eina_stringshare_add(cs_trans); cs = eina_stringshare_add(cs_trans);
/* Exclusive */ /* Exclusive */
/* Linear Search */ /* Linear Search */
if (!eina_list_data_find(region_node->available_codesets, cs)) if (!eina_list_data_find(region_node->available_codesets, cs))
@ -765,7 +765,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
mod = eina_stringshare_add(locale_parts->modifier); mod = eina_stringshare_add(locale_parts->modifier);
/* Find only works here because we are using stringshare*/ /* Find only works here because we are using stringshare*/
/* Exclusive */ /* Exclusive */
/* Linear Search */ /* Linear Search */
if (!eina_list_data_find(region_node->available_modifiers, mod)) if (!eina_list_data_find(region_node->available_modifiers, mod))
@ -878,9 +878,9 @@ static void
_lc_check(void) _lc_check(void)
{ {
char buf[8192]; char buf[8192];
buf[0] = 0; buf[0] = 0;
if (getenv("LC_CTYPE")) strcat(buf, "<br>LC_CTYPE"); if (getenv("LC_CTYPE")) strcat(buf, "<br>LC_CTYPE");
if (getenv("LC_NUMERIC")) strcat(buf, "<br>LC_NUMERIC"); if (getenv("LC_NUMERIC")) strcat(buf, "<br>LC_NUMERIC");
if (getenv("LC_TIME")) strcat(buf, "<br>LC_TIME"); if (getenv("LC_TIME")) strcat(buf, "<br>LC_TIME");
@ -888,9 +888,9 @@ _lc_check(void)
if (getenv("LC_MONETARY")) strcat(buf, "<br>LC_MONETARY"); if (getenv("LC_MONETARY")) strcat(buf, "<br>LC_MONETARY");
if (getenv("LC_MESSAGES")) strcat(buf, "<br>LC_MESSAGES"); if (getenv("LC_MESSAGES")) strcat(buf, "<br>LC_MESSAGES");
if (getenv("LC_ALL")) strcat(buf, "<br>LC_ALL"); if (getenv("LC_ALL")) strcat(buf, "<br>LC_ALL");
if (buf[0] != 0) if (buf[0] != 0)
e_util_dialog_show(_("Possible Locale problems"), e_util_dialog_show(_("Possible Locale problems"),
_("You have some extra locale environment<br>" _("You have some extra locale environment<br>"
"variables set that may interfere with<br>" "variables set that may interfere with<br>"
"correct display of your chosen language.<br>" "correct display of your chosen language.<br>"
@ -943,7 +943,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
Eina_List *next; Eina_List *next;
int i = 0; int i = 0;
char buf[PATH_MAX]; char buf[PATH_MAX];
cfdata->evas = evas; cfdata->evas = evas;
o = e_widget_table_add(evas, 0); o = e_widget_table_add(evas, 0);
of = e_widget_framelist_add(evas, _("Language Selector"), 0); of = e_widget_framelist_add(evas, _("Language Selector"), 0);
@ -981,8 +981,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
if ((!cur_sig_loc) || (!cfdata->cur_language)) if ((!cur_sig_loc) || (!cfdata->cur_language))
e_widget_ilist_selected_set(cfdata->gui.blang_list, i); e_widget_ilist_selected_set(cfdata->gui.blang_list, i);
i++; i++;
for (next = cfdata->blang_list; next; next = next->next) for (next = cfdata->blang_list; next; next = next->next)
{ {
E_Intl_Pair *pair; E_Intl_Pair *pair;
const char *key; const char *key;
@ -999,13 +999,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
else else
ic = NULL; ic = NULL;
e_widget_ilist_append(cfdata->gui.blang_list, ic, trans, NULL, NULL, key); e_widget_ilist_append(cfdata->gui.blang_list, ic, trans, NULL, NULL, key);
if ((cur_sig_loc) && if ((cur_sig_loc) &&
(!strncmp(key, cur_sig_loc, strlen(cur_sig_loc)))) (!strncmp(key, cur_sig_loc, strlen(cur_sig_loc))))
e_widget_ilist_selected_set(cfdata->gui.blang_list, i); e_widget_ilist_selected_set(cfdata->gui.blang_list, i);
i++; i++;
} }
E_FREE(cur_sig_loc); E_FREE(cur_sig_loc);
e_widget_ilist_go(ob); e_widget_ilist_go(ob);
e_widget_ilist_thaw(ob); e_widget_ilist_thaw(ob);
edje_thaw(); edje_thaw();
@ -1018,20 +1018,20 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.locale_entry = ob; cfdata->gui.locale_entry = ob;
e_widget_disabled_set(cfdata->gui.locale_entry, 1); e_widget_disabled_set(cfdata->gui.locale_entry, 1);
e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25); e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
e_widget_frametable_object_append(of, cfdata->gui.locale_entry, e_widget_frametable_object_append(of, cfdata->gui.locale_entry,
1, 0, 1, 1, 1, 1, 1, 0); 1, 0, 1, 1, 1, 1, 1, 0);
e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
e_dialog_resizable_set(cfd->dia, 1); e_dialog_resizable_set(cfd->dia, 1);
return o; return o;
} }
static Evas_Object * static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
const char *lang, *reg, *cs, *mod; const char *lang, *reg, *cs, *mod;
cfdata->evas = evas; cfdata->evas = evas;
_intl_current_locale_setup(cfdata); _intl_current_locale_setup(cfdata);
@ -1077,7 +1077,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_ilist_go(ob); e_widget_ilist_go(ob);
e_widget_size_min_set(ob, 100, 100); e_widget_size_min_set(ob, 100, 100);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
/* Modified List */ /* Modified List */
ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_mod)); ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_mod));
cfdata->gui.mod_list = ob; cfdata->gui.mod_list = ob;
@ -1087,7 +1087,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
/* Locale selector */ /* Locale selector */
of = e_widget_frametable_add(evas, _("Locale Selected"), 0); of = e_widget_frametable_add(evas, _("Locale Selected"), 0);
ob = e_widget_label_add(evas, _("Locale")); ob = e_widget_label_add(evas, _("Locale"));
@ -1096,29 +1096,29 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
cfdata->gui.locale_entry = ob; cfdata->gui.locale_entry = ob;
e_widget_disabled_set(cfdata->gui.locale_entry, 1); e_widget_disabled_set(cfdata->gui.locale_entry, 1);
e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25); e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
e_widget_frametable_object_append(of, cfdata->gui.locale_entry, e_widget_frametable_object_append(of, cfdata->gui.locale_entry,
0, 1, 1, 1, 1, 1, 1, 0); 0, 1, 1, 1, 1, 1, 1, 0);
e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
/* all these cur_* values are not guaranteed to be const so we need to /* all these cur_* values are not guaranteed to be const so we need to
* copy them. * copy them.
*/ */
lang = eina_stringshare_ref(cfdata->cur_lang); lang = eina_stringshare_ref(cfdata->cur_lang);
reg = eina_stringshare_ref(cfdata->cur_reg); reg = eina_stringshare_ref(cfdata->cur_reg);
cs = eina_stringshare_ref(cfdata->cur_cs); cs = eina_stringshare_ref(cfdata->cur_cs);
mod = eina_stringshare_ref(cfdata->cur_mod); mod = eina_stringshare_ref(cfdata->cur_mod);
_cfdata_language_go(lang, reg, cs, mod, cfdata); _cfdata_language_go(lang, reg, cs, mod, cfdata);
eina_stringshare_del(lang); eina_stringshare_del(lang);
eina_stringshare_del(reg); eina_stringshare_del(reg);
eina_stringshare_del(cs); eina_stringshare_del(cs);
eina_stringshare_del(mod); eina_stringshare_del(mod);
e_widget_on_change_hook_set(cfdata->gui.lang_list, _ilist_language_cb_change, cfdata); e_widget_on_change_hook_set(cfdata->gui.lang_list, _ilist_language_cb_change, cfdata);
e_widget_on_change_hook_set(cfdata->gui.reg_list, _ilist_region_cb_change, cfdata); e_widget_on_change_hook_set(cfdata->gui.reg_list, _ilist_region_cb_change, cfdata);
e_widget_on_change_hook_set(cfdata->gui.cs_list, _ilist_codeset_cb_change, cfdata); e_widget_on_change_hook_set(cfdata->gui.cs_list, _ilist_codeset_cb_change, cfdata);
e_widget_on_change_hook_set(cfdata->gui.mod_list, _ilist_modifier_cb_change, cfdata); e_widget_on_change_hook_set(cfdata->gui.mod_list, _ilist_modifier_cb_change, cfdata);
e_dialog_resizable_set(cfd->dia, 1); e_dialog_resizable_set(cfd->dia, 1);
return o; return o;
@ -1152,11 +1152,11 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Config_Dialog_Data * cfdata; E_Config_Dialog_Data * cfdata;
char locale[32]; char locale[32];
cfdata = data; cfdata = data;
_cfdata_language_go(cfdata->cur_lang, cfdata->cur_reg, NULL, NULL, cfdata); _cfdata_language_go(cfdata->cur_lang, cfdata->cur_reg, NULL, NULL, cfdata);
if ((cfdata->cur_lang) && (cfdata->cur_lang[0])) if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
{ {
sprintf(locale, "%s_%s", cfdata->cur_lang, cfdata->cur_reg); sprintf(locale, "%s_%s", cfdata->cur_lang, cfdata->cur_reg);
@ -1170,14 +1170,14 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
cfdata->cur_mod = NULL; cfdata->cur_mod = NULL;
} }
static void static void
_ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__) _ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Config_Dialog_Data * cfdata; E_Config_Dialog_Data * cfdata;
char locale[32]; char locale[32];
cfdata = data; cfdata = data;
if ((cfdata->cur_lang) && (cfdata->cur_lang[0])) if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
{ {
if (cfdata->cur_mod) if (cfdata->cur_mod)
@ -1190,14 +1190,14 @@ _ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__)
e_widget_entry_text_set(cfdata->gui.locale_entry, ""); e_widget_entry_text_set(cfdata->gui.locale_entry, "");
} }
static void static void
_ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__) _ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Config_Dialog_Data * cfdata; E_Config_Dialog_Data * cfdata;
char locale[32]; char locale[32];
cfdata = data; cfdata = data;
if ((cfdata->cur_lang) && (cfdata->cur_lang[0])) if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
{ {
if (cfdata->cur_cs) if (cfdata->cur_cs)
@ -1210,13 +1210,13 @@ _ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__)
e_widget_entry_text_set(cfdata->gui.locale_entry, ""); e_widget_entry_text_set(cfdata->gui.locale_entry, "");
} }
static void static void
_cfdata_language_go(const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata) _cfdata_language_go(const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata)
{ {
E_Intl_Language_Node *lang_node; E_Intl_Language_Node *lang_node;
int lang_update; int lang_update;
int region_update; int region_update;
/* Check what changed */ /* Check what changed */
lang_update = 0; lang_update = 0;
region_update = 0; region_update = 0;
@ -1291,14 +1291,14 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
e_widget_ilist_selected_set(cfdata->gui.cs_list, count - 1); e_widget_ilist_selected_set(cfdata->gui.cs_list, count - 1);
} }
} }
for (next = reg_node->available_modifiers; next; next = next->next) for (next = reg_node->available_modifiers; next; next = next->next)
{ {
const char * mod; const char * mod;
mod = next->data; mod = next->data;
e_widget_ilist_append(cfdata->gui.mod_list, NULL, mod, NULL, NULL, mod); e_widget_ilist_append(cfdata->gui.mod_list, NULL, mod, NULL, NULL, mod);
if (modifier && !strcmp(mod, modifier)) if (modifier && !strcmp(mod, modifier))
{ {
int count; int count;
@ -1348,7 +1348,7 @@ _region_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, vo
return 1; return 1;
} }
void void
_intl_current_locale_setup(E_Config_Dialog_Data *cfdata) _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
{ {
eina_stringshare_del(cfdata->cur_lang); eina_stringshare_del(cfdata->cur_lang);
@ -1360,20 +1360,20 @@ _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
cfdata->cur_reg = NULL; cfdata->cur_reg = NULL;
cfdata->cur_cs = NULL; cfdata->cur_cs = NULL;
cfdata->cur_mod = NULL; cfdata->cur_mod = NULL;
if (cfdata->cur_language) if (cfdata->cur_language)
{ {
E_Locale_Parts *locale_parts; E_Locale_Parts *locale_parts;
locale_parts = e_intl_locale_parts_get(cfdata->cur_language); locale_parts = e_intl_locale_parts_get(cfdata->cur_language);
if (locale_parts) if (locale_parts)
{ {
cfdata->cur_lang = eina_stringshare_add(locale_parts->lang); cfdata->cur_lang = eina_stringshare_add(locale_parts->lang);
cfdata->cur_reg = eina_stringshare_add(locale_parts->region); cfdata->cur_reg = eina_stringshare_add(locale_parts->region);
if (locale_parts->codeset) if (locale_parts->codeset)
{ {
const char *cs_trans; const char *cs_trans;
cs_trans = _intl_charset_upper_get(locale_parts->codeset); cs_trans = _intl_charset_upper_get(locale_parts->codeset);
if (!cs_trans) if (!cs_trans)
cfdata->cur_cs = eina_stringshare_add(locale_parts->codeset); cfdata->cur_cs = eina_stringshare_add(locale_parts->codeset);
@ -1387,16 +1387,16 @@ _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
cfdata->lang_dirty = 1; cfdata->lang_dirty = 1;
} }
static int static int
_lang_list_sort(const void *data1, const void *data2) _lang_list_sort(const void *data1, const void *data2)
{ {
const E_Intl_Language_Node *ln1, *ln2; const E_Intl_Language_Node *ln1, *ln2;
const char *trans1; const char *trans1;
const char *trans2; const char *trans2;
if (!data1) return 1; if (!data1) return 1;
if (!data2) return -1; if (!data2) return -1;
ln1 = data1; ln1 = data1;
ln2 = data2; ln2 = data2;
@ -1405,18 +1405,18 @@ _lang_list_sort(const void *data1, const void *data2)
if (!ln2->lang_name) return -1; if (!ln2->lang_name) return -1;
trans2 = ln2->lang_name; trans2 = ln2->lang_name;
return (strcmp(trans1, trans2)); return (strcmp(trans1, trans2));
} }
static void static void
_lang_list_load(void *data) _lang_list_load(void *data)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
Eina_List *l; Eina_List *l;
Evas_Object *ic; Evas_Object *ic;
char buf[PATH_MAX]; char buf[PATH_MAX];
if (!data) return; if (!data) return;
cfdata = data; cfdata = data;
@ -1425,22 +1425,22 @@ _lang_list_load(void *data)
evas_event_freeze(evas_object_evas_get(cfdata->gui.lang_list)); evas_event_freeze(evas_object_evas_get(cfdata->gui.lang_list));
edje_freeze(); edje_freeze();
e_widget_ilist_freeze(cfdata->gui.lang_list); e_widget_ilist_freeze(cfdata->gui.lang_list);
e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png"); e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
ic = e_util_icon_add(buf, cfdata->evas); ic = e_util_icon_add(buf, cfdata->evas);
e_widget_ilist_append(cfdata->gui.lang_list, ic, _("System Default"), NULL, NULL, ""); e_widget_ilist_append(cfdata->gui.lang_list, ic, _("System Default"), NULL, NULL, "");
for (l = cfdata->lang_list; l; l = l->next) for (l = cfdata->lang_list; l; l = l->next)
{ {
E_Intl_Language_Node *ln; E_Intl_Language_Node *ln;
const char *trans; const char *trans;
ln = l->data; ln = l->data;
if (!ln) continue; if (!ln) continue;
if (ln->lang_name) if (ln->lang_name)
trans = ln->lang_name; trans = ln->lang_name;
else else
trans = ln->lang_code; trans = ln->lang_code;
if (ln->lang_available) if (ln->lang_available)
{ {
ic = e_icon_add(cfdata->evas); ic = e_icon_add(cfdata->evas);
@ -1451,10 +1451,10 @@ _lang_list_load(void *data)
e_widget_ilist_append(cfdata->gui.lang_list, ic, trans, NULL, NULL, ln->lang_code); e_widget_ilist_append(cfdata->gui.lang_list, ic, trans, NULL, NULL, ln->lang_code);
if (cfdata->cur_lang && !strcmp(cfdata->cur_lang, ln->lang_code)) if (cfdata->cur_lang && !strcmp(cfdata->cur_lang, ln->lang_code))
{ {
int count; int count;
count = e_widget_ilist_count(cfdata->gui.lang_list); count = e_widget_ilist_count(cfdata->gui.lang_list);
e_widget_ilist_selected_set(cfdata->gui.lang_list, count - 1); e_widget_ilist_selected_set(cfdata->gui.lang_list, count - 1);
} }
@ -1464,16 +1464,16 @@ _lang_list_load(void *data)
evas_event_thaw(evas_object_evas_get(cfdata->gui.lang_list)); evas_event_thaw(evas_object_evas_get(cfdata->gui.lang_list));
} }
static int static int
_region_list_sort(const void *data1, const void *data2) _region_list_sort(const void *data1, const void *data2)
{ {
const E_Intl_Region_Node *rn1, *rn2; const E_Intl_Region_Node *rn1, *rn2;
const char *trans1; const char *trans1;
const char *trans2; const char *trans2;
if (!data1) return 1; if (!data1) return 1;
if (!data2) return -1; if (!data2) return -1;
rn1 = data1; rn1 = data1;
rn2 = data2; rn2 = data2;
@ -1482,16 +1482,16 @@ _region_list_sort(const void *data1, const void *data2)
if (!rn2->region_name) return -1; if (!rn2->region_name) return -1;
trans2 = rn2->region_name; trans2 = rn2->region_name;
return (strcmp(trans1, trans2)); return (strcmp(trans1, trans2));
} }
static void static void
_region_list_load(void *data) _region_list_load(void *data)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
Eina_List *l; Eina_List *l;
if (!data) return; if (!data) return;
cfdata = data; cfdata = data;
@ -1500,25 +1500,25 @@ _region_list_load(void *data)
evas_event_freeze(evas_object_evas_get(cfdata->gui.reg_list)); evas_event_freeze(evas_object_evas_get(cfdata->gui.reg_list));
edje_freeze(); edje_freeze();
e_widget_ilist_freeze(cfdata->gui.reg_list); e_widget_ilist_freeze(cfdata->gui.reg_list);
for (l = cfdata->region_list; l; l = l->next) for (l = cfdata->region_list; l; l = l->next)
{ {
E_Intl_Region_Node *rn; E_Intl_Region_Node *rn;
const char *trans; const char *trans;
rn = l->data; rn = l->data;
if (!rn) continue; if (!rn) continue;
if (rn->region_name) if (rn->region_name)
trans = rn->region_name; trans = rn->region_name;
else else
trans = rn->region_code; trans = rn->region_code;
e_widget_ilist_append(cfdata->gui.reg_list, NULL, trans, NULL, NULL, rn->region_code); e_widget_ilist_append(cfdata->gui.reg_list, NULL, trans, NULL, NULL, rn->region_code);
if (cfdata->cur_reg && !strcmp(cfdata->cur_reg, rn->region_code)) if (cfdata->cur_reg && !strcmp(cfdata->cur_reg, rn->region_code))
{ {
int count; int count;
count = e_widget_ilist_count(cfdata->gui.reg_list); count = e_widget_ilist_count(cfdata->gui.reg_list);
e_widget_ilist_selected_set(cfdata->gui.reg_list, count - 1); e_widget_ilist_selected_set(cfdata->gui.reg_list, count - 1);
} }
@ -1528,16 +1528,16 @@ _region_list_load(void *data)
evas_event_thaw(evas_object_evas_get(cfdata->gui.reg_list)); evas_event_thaw(evas_object_evas_get(cfdata->gui.reg_list));
} }
static int static int
_basic_lang_list_sort(const void *data1, const void *data2) _basic_lang_list_sort(const void *data1, const void *data2)
{ {
const E_Intl_Pair *ln1, *ln2; const E_Intl_Pair *ln1, *ln2;
const char *trans1; const char *trans1;
const char *trans2; const char *trans2;
if (!data1) return 1; if (!data1) return 1;
if (!data2) return -1; if (!data2) return -1;
ln1 = data1; ln1 = data1;
ln2 = data2; ln2 = data2;
@ -1546,7 +1546,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
if (!ln2->locale_translation) return -1; if (!ln2->locale_translation) return -1;
trans2 = ln2->locale_translation; trans2 = ln2->locale_translation;
return (strcmp(trans1, trans2)); return (strcmp(trans1, trans2));
} }
@ -1554,15 +1554,15 @@ const char *
_intl_charset_upper_get(const char *charset) _intl_charset_upper_get(const char *charset)
{ {
int i; int i;
i = 0; i = 0;
while (charset_predefined_pairs[i].locale_key) while (charset_predefined_pairs[i].locale_key)
{ {
if (!strcmp(charset_predefined_pairs[i].locale_key, charset)) if (!strcmp(charset_predefined_pairs[i].locale_key, charset))
{ {
return charset_predefined_pairs[i].locale_translation; return charset_predefined_pairs[i].locale_translation;
} }
i++; i++;
} }
return NULL; return NULL;
} }

26
src/modules/wizard/page_010.c
View File

@ -13,7 +13,7 @@ struct _E_Intl_Pair
const char *locale_translation; const char *locale_translation;
}; };
const E_Intl_Pair basic_language_predefined_pairs[ ] = const E_Intl_Pair basic_language_predefined_pairs[ ] =
{ {
{"bg_BG.UTF-8", "lang-bg_BG.png", "Български"}, {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"},
{"ca_ES.UTF-8", "lang-ca_ES.png", "Català"}, {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"},
@ -46,16 +46,16 @@ const E_Intl_Pair basic_language_predefined_pairs[ ] =
static const char *lang = NULL; static const char *lang = NULL;
static Eina_List *blang_list = NULL; static Eina_List *blang_list = NULL;
static int static int
_basic_lang_list_sort(const void *data1, const void *data2) _basic_lang_list_sort(const void *data1, const void *data2)
{ {
E_Intl_Pair *ln1, *ln2; E_Intl_Pair *ln1, *ln2;
const char *trans1; const char *trans1;
const char *trans2; const char *trans2;
if (!data1) return 1; if (!data1) return 1;
if (!data2) return -1; if (!data2) return -1;
ln1 = (E_Intl_Pair *)data1; ln1 = (E_Intl_Pair *)data1;
ln2 = (E_Intl_Pair *)data2; ln2 = (E_Intl_Pair *)data2;
@ -64,7 +64,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
if (!ln2->locale_translation) return -1; if (!ln2->locale_translation) return -1;
trans2 = ln2->locale_translation; trans2 = ln2->locale_translation;
return (strcmp(trans1, trans2)); return (strcmp(trans1, trans2));
} }
@ -78,7 +78,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
#else #else
output = popen("locale -a", "r"); output = popen("locale -a", "r");
#endif #endif
if (output) if (output)
{ {
char line[32]; char line[32];
@ -91,7 +91,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
{ {
char *basic_language; char *basic_language;
basic_language = basic_language =
e_intl_locale_parts_combine e_intl_locale_parts_combine
(locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION); (locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION);
if (basic_language) if (basic_language)
@ -106,10 +106,10 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
basic_language, strlen(basic_language))) basic_language, strlen(basic_language)))
{ {
if (!eina_list_data_find if (!eina_list_data_find
(blang_list, (blang_list,
&basic_language_predefined_pairs[i])) &basic_language_predefined_pairs[i]))
blang_list = eina_list_append blang_list = eina_list_append
(blang_list, (blang_list,
&basic_language_predefined_pairs[i]); &basic_language_predefined_pairs[i]);
break; break;
} }
@ -120,7 +120,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
e_intl_locale_parts_free(locale_parts); e_intl_locale_parts_free(locale_parts);
} }
} }
/* Sort basic languages */ /* Sort basic languages */
blang_list = eina_list_sort(blang_list, eina_list_count(blang_list), _basic_lang_list_sort); blang_list = eina_list_sort(blang_list, eina_list_count(blang_list), _basic_lang_list_sort);
pclose(output); pclose(output);
} }
@ -152,7 +152,7 @@ wizard_page_show(E_Wizard_Page *pg)
e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png"); e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
ic = e_util_icon_add(buf, pg->evas); ic = e_util_icon_add(buf, pg->evas);
e_widget_ilist_append(ob, ic, _("System Default"), e_widget_ilist_append(ob, ic, _("System Default"),
NULL, NULL, NULL); NULL, NULL, NULL);
for (i = 1, l = blang_list; l; l = l->next, i++) for (i = 1, l = blang_list; l; l = l->next, i++)
{ {
@ -166,7 +166,7 @@ wizard_page_show(E_Wizard_Page *pg)
} }
else else
ic = NULL; ic = NULL;
e_widget_ilist_append(ob, ic, _(pair->locale_translation), e_widget_ilist_append(ob, ic, _(pair->locale_translation),
NULL, NULL, pair->locale_key); NULL, NULL, pair->locale_key);
if (e_intl_language_get()) if (e_intl_language_get())
{ {