diff --git a/src/modules/conf_intl/e_int_config_imc.c b/src/modules/conf_intl/e_int_config_imc.c
index 8265970c6..f5dfcfc23 100644
--- a/src/modules/conf_intl/e_int_config_imc.c
+++ b/src/modules/conf_intl/e_int_config_imc.c
@@ -4,82 +4,82 @@
typedef struct _E_Imc_Update_Data E_Imc_Update_Data;
-static void *_create_data (E_Config_Dialog *cfd);
-static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
/* Basic Callbacks */
-static int _basic_list_sort_cb (const void *d1, const void *d2);
-static void _e_imc_list_change_cb (void *data, Evas_Object *obj);
-static void _e_imc_setup_cb (void *data, void *data2);
+static int _basic_list_sort_cb(const void *d1, const void *d2);
+static void _e_imc_list_change_cb(void *data, Evas_Object *obj);
+static void _e_imc_setup_cb(void *data, void *data2);
/* Advanced Callbacks */
-static void _cb_dir (void *data, Evas_Object *obj);
-static void _cb_button_up (void *data1, void *data2);
-static void _cb_new (void *data, void *data2);
+static void _cb_dir(void *data, Evas_Object *obj);
+static void _cb_button_up(void *data1, void *data2);
+static void _cb_new(void *data, void *data2);
-static void _cb_files_changed (void *data, Evas_Object *obj, void *event_info);
+static void _cb_files_changed(void *data, Evas_Object *obj, void *event_info);
static void _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info);
-static void _cb_files_files_changed (void *data, Evas_Object *obj, void *event_info);
-static void _cb_files_files_deleted (void *data, Evas_Object *obj, void *event_info);
-static void _e_imc_adv_setup_cb (void *data, void *data2);
+static void _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info);
+static void _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info);
+static void _e_imc_adv_setup_cb(void *data, void *data2);
-static void _e_imc_change_enqueue (E_Config_Dialog_Data *cfdata);
-static void _e_imc_entry_change_cb (void *data, Evas_Object *obj);
-static void _e_imc_form_fill (E_Config_Dialog_Data *cfdata);
-static const char* _e_imc_file_name_new_get (void);
-static Eina_Bool _change_hash_free_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
-static Eina_Bool _change_hash_apply_cb (const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__);
+static void _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata);
+static void _e_imc_entry_change_cb(void *data, Evas_Object *obj);
+static void _e_imc_form_fill(E_Config_Dialog_Data *cfdata);
+static const char *_e_imc_file_name_new_get(void);
+static Eina_Bool _change_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
+static Eina_Bool _change_hash_apply_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__);
struct _E_Config_Dialog_Data
{
E_Config_Dialog *cfd;
/* Maluable Widgets */
- Evas_Object *o_personal;
- Evas_Object *o_system;
- Evas_Object *o_up_button;
- Evas_Object *o_fm; /* File manager */
- Evas_Object *o_frame; /* scrollpane for file manager*/
+ Evas_Object *o_personal;
+ Evas_Object *o_system;
+ Evas_Object *o_up_button;
+ Evas_Object *o_fm; /* File manager */
+ Evas_Object *o_frame; /* scrollpane for file manager*/
- const char *imc_current;
- Eina_Hash *imc_basic_map;
+ const char *imc_current;
+ Eina_Hash *imc_basic_map;
- int imc_disable; /* 0=enable, 1=disable */
- int fmdir; /* 0=Local, 1=System*/
+ int imc_disable; /* 0=enable, 1=disable */
+ int fmdir; /* 0=Local, 1=System*/
struct
- {
- int dirty;
- char *e_im_name;
- char *e_im_exec;
- char *e_im_setup_exec;
+ {
+ int dirty;
+ char *e_im_name;
+ char *e_im_exec;
+ char *e_im_setup_exec;
- char *gtk_im_module;
- char *qt_im_module;
- char *xmodifiers;
- } imc;
+ char *gtk_im_module;
+ char *qt_im_module;
+ char *xmodifiers;
+ } imc;
Eina_Hash *imc_change_map;
struct
- {
- Evas_Object *imc_basic_list;
- Evas_Object *imc_basic_disable;
- Evas_Object *imc_basic_setup;
+ {
+ Evas_Object *imc_basic_list;
+ Evas_Object *imc_basic_disable;
+ Evas_Object *imc_basic_setup;
- Evas_Object *imc_advanced_disable;
- Evas_Object *imc_advanced_setup;
+ Evas_Object *imc_advanced_disable;
+ Evas_Object *imc_advanced_setup;
- Evas_Object *e_im_name;
- Evas_Object *e_im_exec;
- Evas_Object *e_im_setup_exec;
- Evas_Object *gtk_im_module;
- Evas_Object *qt_im_module;
- Evas_Object *xmodifiers;
- } gui;
+ Evas_Object *e_im_name;
+ Evas_Object *e_im_exec;
+ Evas_Object *e_im_setup_exec;
+ Evas_Object *gtk_im_module;
+ Evas_Object *qt_im_module;
+ Evas_Object *xmodifiers;
+ } gui;
E_Win *win_import;
};
@@ -98,12 +98,12 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
v->advanced.create_widgets = _advanced_create_widgets;
v->advanced.apply_cfdata = _advanced_apply_data;
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,
- _("Input Method Settings"),
- "E", "language/input_method_settings",
- "preferences-imc", 0, v, NULL);
+ _("Input Method Settings"),
+ "E", "language/input_method_settings",
+ "preferences-imc", 0, v, NULL);
return cfd;
}
@@ -115,12 +115,12 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (cfdata->imc_current)
{
- const char *path;
+ const char *path;
- path = e_intl_imc_system_path_get();
- if (!strncmp(cfdata->imc_current, path, strlen(path)))
- cfdata->fmdir = 1;
- cfdata->imc_disable = 0;
+ path = e_intl_imc_system_path_get();
+ if (!strncmp(cfdata->imc_current, path, strlen(path)))
+ cfdata->fmdir = 1;
+ cfdata->imc_disable = 0;
}
else
cfdata->imc_disable = 1;
@@ -156,14 +156,14 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
if (cfdata->imc_basic_map)
{
- eina_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
- eina_hash_free(cfdata->imc_basic_map);
+ eina_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
+ eina_hash_free(cfdata->imc_basic_map);
}
if (cfdata->imc_change_map)
{
- eina_hash_foreach(cfdata->imc_change_map, _change_hash_free_cb, NULL);
- eina_hash_free(cfdata->imc_change_map);
+ eina_hash_foreach(cfdata->imc_change_map, _change_hash_free_cb, NULL);
+ eina_hash_free(cfdata->imc_change_map);
}
cfdata->imc_change_map = NULL;
@@ -182,16 +182,16 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
if (cfdata->imc_current)
{
- if (e_config->input_method)
- {
- eina_stringshare_del(e_config->input_method);
- e_config->input_method = NULL;
- }
+ if (e_config->input_method)
+ {
+ eina_stringshare_del(e_config->input_method);
+ e_config->input_method = NULL;
+ }
- if (!cfdata->imc_disable)
- e_config->input_method = eina_stringshare_ref(cfdata->imc_current);
+ if (!cfdata->imc_disable)
+ e_config->input_method = eina_stringshare_ref(cfdata->imc_current);
- e_intl_input_method_set(e_config->input_method);
+ e_intl_input_method_set(e_config->input_method);
}
e_config_save_queue();
@@ -204,7 +204,7 @@ _basic_list_sort_cb(const void *d1, const void *d2)
if (!d1) return 1;
if (!d2) return -1;
- return (strcmp((const char*)d1, (const char*)d2));
+ return strcmp((const char *)d1, (const char *)d2);
}
void
@@ -212,10 +212,10 @@ _e_imc_setup_button_toggle(Evas_Object *button, E_Input_Method_Config *imc)
{
if (imc)
{
- int flag;
+ int flag;
- flag = (!imc->e_im_setup_exec) || (!imc->e_im_setup_exec[0]);
- e_widget_disabled_set(button, flag);
+ flag = (!imc->e_im_setup_exec) || (!imc->e_im_setup_exec[0]);
+ e_widget_disabled_set(button, flag);
}
else
e_widget_disabled_set(button, 1);
@@ -232,8 +232,8 @@ _e_imc_list_change_cb(void *data, Evas_Object *obj __UNUSED__)
if (cfdata->imc_current)
{
- imc = eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
- _e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, imc);
+ imc = eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
+ _e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, imc);
}
}
@@ -245,29 +245,29 @@ _e_imc_setup_cb(void *data, void *data2 __UNUSED__)
cfdata = data;
if (cfdata->imc_current && cfdata->imc_basic_map)
{
- E_Input_Method_Config *imc;
+ E_Input_Method_Config *imc;
- imc = eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
+ imc = eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
- if ((imc) && (imc->e_im_setup_exec))
- {
- Ecore_Exe *exe;
- const char *cmd;
+ if ((imc) && (imc->e_im_setup_exec))
+ {
+ Ecore_Exe *exe;
+ const char *cmd;
- cmd = imc->e_im_setup_exec;
+ cmd = imc->e_im_setup_exec;
- e_util_library_path_strip();
- exe = ecore_exe_run(cmd, NULL);
- e_util_library_path_restore();
+ e_util_library_path_strip();
+ exe = ecore_exe_run(cmd, NULL);
+ e_util_library_path_restore();
- if (!exe)
- {
- e_util_dialog_show(_("Run Error"),
- _( "Enlightenment was unable to fork a child process:
"
- "
%s
"),
- cmd);
- }
- }
+ if (!exe)
+ {
+ e_util_dialog_show(_("Run Error"),
+ _("Enlightenment was unable to fork a child process:
"
+ "
%s
"),
+ cmd);
+ }
+ }
}
}
@@ -283,14 +283,14 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
of = e_widget_frametable_add(evas, _("Input Method Selector"), 0);
/* Disable imc checkbox */
- ob = e_widget_check_add(evas, _("Use No Input Method"),
- &(cfdata->imc_disable));
+ ob = e_widget_check_add(evas, _("Use No Input Method"),
+ &(cfdata->imc_disable));
cfdata->gui.imc_basic_disable = ob;
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
/* Configure imc button */
- ob = e_widget_button_add(evas, _("Setup Selected Input Method"),
- "configure", _e_imc_setup_cb, cfdata, NULL);
+ ob = e_widget_button_add(evas, _("Setup Selected Input Method"),
+ "configure", _e_imc_setup_cb, cfdata, NULL);
cfdata->gui.imc_basic_setup = ob;
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0);
@@ -307,65 +307,65 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
imc_basic_list = e_intl_input_method_list();
/* Sort basic input method list */
imc_basic_list = eina_list_sort(imc_basic_list,
- eina_list_count(imc_basic_list),
- _basic_list_sort_cb);
+ eina_list_count(imc_basic_list),
+ _basic_list_sort_cb);
if (cfdata->imc_basic_map)
{
- eina_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
- eina_hash_free(cfdata->imc_basic_map);
- cfdata->imc_basic_map = NULL;
+ eina_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
+ eina_hash_free(cfdata->imc_basic_map);
+ cfdata->imc_basic_map = NULL;
}
i = 0;
while (imc_basic_list)
{
- E_Input_Method_Config *imc;
- Eet_File *imc_ef;
- char *imc_path;
+ E_Input_Method_Config *imc;
+ Eet_File *imc_ef;
+ char *imc_path;
- imc_path = imc_basic_list->data;
- imc_ef = eet_open(imc_path, EET_FILE_MODE_READ);
- if (imc_ef)
- {
- imc = e_intl_input_method_config_read(imc_ef);
- eet_close(imc_ef);
+ imc_path = imc_basic_list->data;
+ imc_ef = eet_open(imc_path, EET_FILE_MODE_READ);
+ if (imc_ef)
+ {
+ imc = e_intl_input_method_config_read(imc_ef);
+ eet_close(imc_ef);
- if ((imc) && (imc->e_im_name))
- {
- Evas_Object *icon = NULL;
+ if ((imc) && (imc->e_im_name))
+ {
+ Evas_Object *icon = NULL;
- if (imc->e_im_setup_exec)
- {
- Efreet_Desktop *desktop;
+ if (imc->e_im_setup_exec)
+ {
+ Efreet_Desktop *desktop;
- desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec);
- if (desktop)
- {
- icon = e_util_desktop_icon_add(desktop, 48, evas);
- efreet_desktop_free(desktop);
- }
- }
+ desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec);
+ if (desktop)
+ {
+ icon = e_util_desktop_icon_add(desktop, 48, evas);
+ efreet_desktop_free(desktop);
+ }
+ }
- e_widget_ilist_append(cfdata->gui.imc_basic_list, icon, imc->e_im_name, NULL, NULL, imc_path);
- if ((cfdata->imc_current) &&
- (!strncmp(imc_path, cfdata->imc_current,
- eina_stringshare_strlen(cfdata->imc_current))))
- e_widget_ilist_selected_set(cfdata->gui.imc_basic_list, i);
- i++;
+ e_widget_ilist_append(cfdata->gui.imc_basic_list, icon, imc->e_im_name, NULL, NULL, imc_path);
+ if ((cfdata->imc_current) &&
+ (!strncmp(imc_path, cfdata->imc_current,
+ eina_stringshare_strlen(cfdata->imc_current))))
+ e_widget_ilist_selected_set(cfdata->gui.imc_basic_list, i);
+ i++;
- if (!cfdata->imc_basic_map)
- cfdata->imc_basic_map = eina_hash_string_superfast_new(NULL);
- eina_hash_add(cfdata->imc_basic_map, imc_path, imc);
- }
- }
- free(imc_path);
- imc_basic_list = eina_list_remove_list(imc_basic_list, imc_basic_list);
+ if (!cfdata->imc_basic_map)
+ cfdata->imc_basic_map = eina_hash_string_superfast_new(NULL);
+ eina_hash_add(cfdata->imc_basic_map, imc_path, imc);
+ }
+ }
+ free(imc_path);
+ imc_basic_list = eina_list_remove_list(imc_basic_list, imc_basic_list);
}
- _e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup,
- eina_hash_find(cfdata->imc_basic_map,
- cfdata->imc_current));
+ _e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup,
+ eina_hash_find(cfdata->imc_basic_map,
+ cfdata->imc_current));
e_widget_ilist_go(ob);
e_widget_ilist_thaw(ob);
@@ -378,6 +378,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_dialog_resizable_set(cfd->dia, 1);
return o;
}
+
/*** End Basic Dialog Logic ***/
/*** Start Advanced Dialog Logic ***/
@@ -391,12 +392,12 @@ _change_hash_apply_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *d
if (ecore_file_exists(key))
{
- ef = eet_open(key, EET_FILE_MODE_WRITE);
- if (ef)
- {
- e_intl_input_method_config_write(ef, imc);
- eet_close(ef);
- }
+ ef = eet_open(key, EET_FILE_MODE_WRITE);
+ if (ef)
+ {
+ e_intl_input_method_config_write(ef, imc);
+ eet_close(ef);
+ }
}
e_intl_input_method_config_free(imc);
@@ -416,8 +417,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->imc_change_map)
{
- eina_hash_foreach(cfdata->imc_change_map, _change_hash_apply_cb, NULL);
- eina_hash_free(cfdata->imc_change_map);
+ eina_hash_foreach(cfdata->imc_change_map, _change_hash_apply_cb, NULL);
+ eina_hash_free(cfdata->imc_change_map);
}
cfdata->imc_change_map = NULL;
return 1;
@@ -480,13 +481,13 @@ _cb_new(void *data, void *data2 __UNUSED__)
if (file)
{
- ef = eet_open(file, EET_FILE_MODE_WRITE);
- if (ef)
- {
- e_intl_input_method_config_write(ef, imc_new);
- eet_close(ef);
- e_int_config_imc_update(cfdata->cfd, file);
- }
+ ef = eet_open(file, EET_FILE_MODE_WRITE);
+ if (ef)
+ {
+ e_intl_input_method_config_write(ef, imc_new);
+ eet_close(ef);
+ e_int_config_imc_update(cfdata->cfd, file);
+ }
}
free(imc_new);
}
@@ -499,21 +500,21 @@ _e_imc_adv_setup_cb(void *data, void *data2 __UNUSED__)
cfdata = data;
if (cfdata->imc.e_im_setup_exec)
{
- Ecore_Exe *exe;
- char *cmd;
+ Ecore_Exe *exe;
+ char *cmd;
- cmd = cfdata->imc.e_im_setup_exec;
+ cmd = cfdata->imc.e_im_setup_exec;
- e_util_library_path_strip();
- exe = ecore_exe_run(cmd, NULL);
- e_util_library_path_restore();
+ e_util_library_path_strip();
+ exe = ecore_exe_run(cmd, NULL);
+ e_util_library_path_restore();
- if (!exe)
- {
- e_util_dialog_show(_("Run Error"),
- _( "Enlightenment was unable to fork a child process:
"
- "
%s
"), cmd);
- }
+ if (!exe)
+ {
+ e_util_dialog_show(_("Run Error"),
+ _("Enlightenment was unable to fork a child process:
"
+ "
%s
"), cmd);
+ }
}
}
@@ -529,13 +530,13 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
if (!cfdata->o_fm) return;
if (!e_fm2_has_parent_get(cfdata->o_fm))
{
- if (cfdata->o_up_button)
- e_widget_disabled_set(cfdata->o_up_button, 1);
+ if (cfdata->o_up_button)
+ e_widget_disabled_set(cfdata->o_up_button, 1);
}
else
{
- if (cfdata->o_up_button)
- e_widget_disabled_set(cfdata->o_up_button, 0);
+ if (cfdata->o_up_button)
+ e_widget_disabled_set(cfdata->o_up_button, 0);
}
if (cfdata->o_frame)
e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
@@ -556,9 +557,9 @@ _cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_
if (cfdata->imc_current)
{
- _e_imc_change_enqueue(cfdata);
- eina_stringshare_del(cfdata->imc_current);
- cfdata->imc_current = NULL;
+ _e_imc_change_enqueue(cfdata);
+ eina_stringshare_del(cfdata->imc_current);
+ cfdata->imc_current = NULL;
}
ici = selected->data;
@@ -588,7 +589,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
p = e_fm2_real_path_get(cfdata->o_fm);
if (p)
{
- if (strncmp(p, cfdata->imc_current, strlen(p))) return;
+ if (strncmp(p, cfdata->imc_current, strlen(p))) return;
}
buf = e_intl_imc_personal_path_get();
@@ -596,9 +597,9 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf
p = cfdata->imc_current + strlen(buf) + 1;
else
{
- buf = e_intl_imc_system_path_get();
- if (!strncmp(cfdata->imc_current, buf, strlen(buf)))
- p = cfdata->imc_current + strlen(buf) + 1;
+ buf = e_intl_imc_system_path_get();
+ if (!strncmp(cfdata->imc_current, buf, strlen(buf)))
+ p = cfdata->imc_current + strlen(buf) + 1;
}
if (!p) return;
e_fm2_select_set(cfdata->o_fm, p, 1);
@@ -625,8 +626,8 @@ _cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_inf
n = eina_list_next(all);
if (!n)
{
- n = eina_list_prev(all);
- if (!n) return;
+ n = eina_list_prev(all);
+ if (!n) return;
}
ic = n->data;
@@ -639,6 +640,7 @@ _cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_inf
evas_object_smart_callback_call(cfdata->o_fm, "selection_change", cfdata);
}
+
/** End IMC FM2 Callbacks **/
/** Start IMC Utility Functions **/
@@ -652,8 +654,8 @@ _e_imc_form_fill(E_Config_Dialog_Data *cfdata)
if (!cfdata->imc_current)
{
- e_widget_disabled_set(cfdata->gui.imc_advanced_setup, 1);
- return;
+ e_widget_disabled_set(cfdata->gui.imc_advanced_setup, 1);
+ return;
}
imc_free = 0;
@@ -661,33 +663,33 @@ _e_imc_form_fill(E_Config_Dialog_Data *cfdata)
if (!imc)
{
- imc_free = 1;
- imc_file = eet_open(cfdata->imc_current, EET_FILE_MODE_READ);
- if (imc_file)
- {
- imc = e_intl_input_method_config_read(imc_file);
- eet_close(imc_file);
- }
+ imc_free = 1;
+ imc_file = eet_open(cfdata->imc_current, EET_FILE_MODE_READ);
+ if (imc_file)
+ {
+ imc = e_intl_input_method_config_read(imc_file);
+ eet_close(imc_file);
+ }
}
_e_imc_setup_button_toggle(cfdata->gui.imc_advanced_setup, imc);
if (imc)
{
- e_widget_entry_text_set(cfdata->gui.e_im_name, imc->e_im_name);
- e_widget_entry_text_set(cfdata->gui.e_im_exec, imc->e_im_exec);
- e_widget_entry_text_set(cfdata->gui.e_im_setup_exec, imc->e_im_setup_exec);
- e_widget_entry_text_set(cfdata->gui.gtk_im_module, imc->gtk_im_module);
- e_widget_entry_text_set(cfdata->gui.qt_im_module, imc->qt_im_module);
- e_widget_entry_text_set(cfdata->gui.xmodifiers, imc->xmodifiers);
+ e_widget_entry_text_set(cfdata->gui.e_im_name, imc->e_im_name);
+ e_widget_entry_text_set(cfdata->gui.e_im_exec, imc->e_im_exec);
+ e_widget_entry_text_set(cfdata->gui.e_im_setup_exec, imc->e_im_setup_exec);
+ e_widget_entry_text_set(cfdata->gui.gtk_im_module, imc->gtk_im_module);
+ e_widget_entry_text_set(cfdata->gui.qt_im_module, imc->qt_im_module);
+ e_widget_entry_text_set(cfdata->gui.xmodifiers, imc->xmodifiers);
- e_widget_entry_readonly_set(cfdata->gui.e_im_name, cfdata->fmdir);
- e_widget_entry_readonly_set(cfdata->gui.e_im_exec, cfdata->fmdir);
- e_widget_entry_readonly_set(cfdata->gui.e_im_setup_exec, cfdata->fmdir);
- e_widget_entry_readonly_set(cfdata->gui.gtk_im_module, cfdata->fmdir);
- e_widget_entry_readonly_set(cfdata->gui.qt_im_module, cfdata->fmdir);
- e_widget_entry_readonly_set(cfdata->gui.xmodifiers, cfdata->fmdir);
- if (imc_free) e_intl_input_method_config_free(imc);
+ e_widget_entry_readonly_set(cfdata->gui.e_im_name, cfdata->fmdir);
+ e_widget_entry_readonly_set(cfdata->gui.e_im_exec, cfdata->fmdir);
+ e_widget_entry_readonly_set(cfdata->gui.e_im_setup_exec, cfdata->fmdir);
+ e_widget_entry_readonly_set(cfdata->gui.gtk_im_module, cfdata->fmdir);
+ e_widget_entry_readonly_set(cfdata->gui.qt_im_module, cfdata->fmdir);
+ e_widget_entry_readonly_set(cfdata->gui.xmodifiers, cfdata->fmdir);
+ if (imc_free) e_intl_input_method_config_free(imc);
}
e_widget_check_checked_set(cfdata->gui.imc_advanced_disable, 0);
cfdata->imc.dirty = 0;
@@ -699,36 +701,36 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
{
if (cfdata->imc.dirty)
{
- E_Input_Method_Config *imc_update;
- E_Input_Method_Config *imc_update_old;
+ E_Input_Method_Config *imc_update;
+ E_Input_Method_Config *imc_update_old;
- imc_update = E_NEW(E_Input_Method_Config, 1);
+ imc_update = E_NEW(E_Input_Method_Config, 1);
- imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
+ imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
- /* TODO: need to only add if the string is not empty */
- imc_update->e_im_name = eina_stringshare_add(cfdata->imc.e_im_name);
- imc_update->e_im_exec = eina_stringshare_add(cfdata->imc.e_im_exec);
- imc_update->e_im_setup_exec = eina_stringshare_add(cfdata->imc.e_im_setup_exec);
- imc_update->gtk_im_module = eina_stringshare_add(cfdata->imc.gtk_im_module);
+ /* TODO: need to only add if the string is not empty */
+ imc_update->e_im_name = eina_stringshare_add(cfdata->imc.e_im_name);
+ imc_update->e_im_exec = eina_stringshare_add(cfdata->imc.e_im_exec);
+ imc_update->e_im_setup_exec = eina_stringshare_add(cfdata->imc.e_im_setup_exec);
+ imc_update->gtk_im_module = eina_stringshare_add(cfdata->imc.gtk_im_module);
imc_update->qt_im_module = eina_stringshare_add(cfdata->imc.qt_im_module);
imc_update->xmodifiers = eina_stringshare_add(cfdata->imc.xmodifiers);
- /* look for changes to this file and remove them */
- imc_update_old = eina_hash_find(cfdata->imc_change_map, cfdata->imc_current);
- if (imc_update_old)
- {
- eina_hash_del(cfdata->imc_change_map, cfdata->imc_current, NULL);
- e_intl_input_method_config_free(imc_update_old);
- }
- if (!cfdata->imc_change_map)
- cfdata->imc_change_map = eina_hash_string_superfast_new(NULL);
- eina_hash_add(cfdata->imc_change_map, cfdata->imc_current, imc_update);
+ /* look for changes to this file and remove them */
+ imc_update_old = eina_hash_find(cfdata->imc_change_map, cfdata->imc_current);
+ if (imc_update_old)
+ {
+ eina_hash_del(cfdata->imc_change_map, cfdata->imc_current, NULL);
+ e_intl_input_method_config_free(imc_update_old);
+ }
+ if (!cfdata->imc_change_map)
+ cfdata->imc_change_map = eina_hash_string_superfast_new(NULL);
+ eina_hash_add(cfdata->imc_change_map, cfdata->imc_current, imc_update);
}
}
/* Get a new filename, and create the new file */
-static const char*
+static const char *
_e_imc_file_name_new_get(void)
{
char path[PATH_MAX];
@@ -736,14 +738,15 @@ _e_imc_file_name_new_get(void)
for (i = 0; i < 32; i++)
{
- snprintf(path, sizeof(path), "%s/new_input_method-%02d.imc",
- e_intl_imc_personal_path_get(), i);
- if (!ecore_file_exists(path))
- return eina_stringshare_add(path);
+ snprintf(path, sizeof(path), "%s/new_input_method-%02d.imc",
+ e_intl_imc_personal_path_get(), i);
+ if (!ecore_file_exists(path))
+ return eina_stringshare_add(path);
}
return NULL;
}
+
/** End IMC Utility Functions **/
/** Import Dialog **/
@@ -813,7 +816,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_table_object_append(ot, rt, 0, 0, 1, 1, 0, 0, 0, 0);
- ow = e_widget_button_add(evas, _("Go up a Directory"), "go-up",
+ ow = e_widget_button_add(evas, _("Go up a Directory"), "go-up",
_cb_button_up, cfdata, NULL);
cfdata->o_up_button = ow;
e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 0, 0, 0, 0);
@@ -846,21 +849,21 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(ow, "dir_changed",
- _cb_files_changed, cfdata);
+ _cb_files_changed, cfdata);
evas_object_smart_callback_add(ow, "selection_change",
- _cb_files_selection_change, cfdata);
+ _cb_files_selection_change, cfdata);
evas_object_smart_callback_add(ow, "changed",
- _cb_files_files_changed, cfdata);
+ _cb_files_files_changed, cfdata);
evas_object_smart_callback_add(ow, "files_deleted",
- _cb_files_files_deleted, cfdata);
+ _cb_files_files_deleted, cfdata);
cfdata->o_frame = NULL;
e_fm2_path_set(ow, path, "/");
of = e_widget_scrollframe_pan_add(evas, ow,
- e_fm2_pan_set,
- e_fm2_pan_get,
- e_fm2_pan_max_get,
- e_fm2_pan_child_size_get);
+ e_fm2_pan_set,
+ e_fm2_pan_get,
+ e_fm2_pan_max_get,
+ e_fm2_pan_child_size_get);
cfdata->o_frame = of;
e_widget_size_min_set(of, 160, 160);
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
@@ -868,16 +871,16 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
ot = e_widget_table_add(evas, 0);
- ow = e_widget_check_add(evas, _("Use No Input Method"),
+ ow = e_widget_check_add(evas, _("Use No Input Method"),
&(cfdata->imc_disable));
cfdata->gui.imc_advanced_disable = ow;
e_widget_table_object_append(ot, ow, 0, 0, 1, 1, 1, 0, 0, 0);
- ow = e_widget_button_add(evas, _("New"), "document-new",
+ ow = e_widget_button_add(evas, _("New"), "document-new",
_cb_new, cfdata, NULL);
e_widget_table_object_append(ot, ow, 1, 0, 1, 1, 1, 0, 0, 0);
- ow = e_widget_button_add(evas, _("Import..."), "preferences-imc",
+ ow = e_widget_button_add(evas, _("Import..."), "preferences-imc",
_cb_import, cfdata, NULL);
e_widget_table_object_append(ot, ow, 2, 0, 1, 1, 1, 0, 0, 0);
@@ -945,3 +948,4 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
return o;
}
+
diff --git a/src/modules/conf_intl/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c
index d31cb2a12..af25cca78 100644
--- a/src/modules/conf_intl/e_int_config_imc_import.c
+++ b/src/modules/conf_intl/e_int_config_imc_import.c
@@ -3,37 +3,37 @@
typedef struct _Import Import;
-struct _Import
+struct _Import
{
- E_Config_Dialog *parent;
+ E_Config_Dialog *parent;
E_Config_Dialog_Data *cfdata;
- Evas_Object *bg_obj;
- Evas_Object *box_obj;
- Evas_Object *content_obj;
- Evas_Object *event_obj;
- Evas_Object *fsel_obj;
+ Evas_Object *bg_obj;
+ Evas_Object *box_obj;
+ Evas_Object *content_obj;
+ Evas_Object *event_obj;
+ Evas_Object *fsel_obj;
- Evas_Object *ok_obj;
- Evas_Object *cancel_obj;
+ Evas_Object *ok_obj;
+ Evas_Object *cancel_obj;
- E_Win *win;
+ E_Win *win;
};
-struct _E_Config_Dialog_Data
+struct _E_Config_Dialog_Data
{
char *file;
};
-static void _imc_import_cb_delete (E_Win *win);
-static void _imc_import_cb_resize (E_Win *win);
-static void _imc_import_cb_wid_focus (void *data, Evas_Object *obj);
-static void _imc_import_cb_selected (void *data, Evas_Object *obj);
-static void _imc_import_cb_changed (void *data, Evas_Object *obj);
-static void _imc_import_cb_ok (void *data, void *data2);
-static void _imc_import_cb_close (void *data, void *data2);
-static void _imc_import_cb_key_down (void *data, Evas *e, Evas_Object *obj,
- void *event);
+static void _imc_import_cb_delete(E_Win *win);
+static void _imc_import_cb_resize(E_Win *win);
+static void _imc_import_cb_wid_focus(void *data, Evas_Object *obj);
+static void _imc_import_cb_selected(void *data, Evas_Object *obj);
+static void _imc_import_cb_changed(void *data, Evas_Object *obj);
+static void _imc_import_cb_ok(void *data, void *data2);
+static void _imc_import_cb_close(void *data, void *data2);
+static void _imc_import_cb_key_down(void *data, Evas *e, Evas_Object *obj,
+ void *event);
E_Win *
e_int_config_imc_import(E_Config_Dialog *parent)
@@ -51,10 +51,10 @@ e_int_config_imc_import(E_Config_Dialog *parent)
if (!import) return NULL;
win = e_win_new(parent->con);
- if (!win)
+ if (!win)
{
- E_FREE(import);
- return NULL;
+ E_FREE(import);
+ return NULL;
}
evas = e_win_evas_get(win);
@@ -86,29 +86,29 @@ e_int_config_imc_import(E_Config_Dialog *parent)
mask = 0;
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
if (!kg)
- fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
+ fprintf(stderr, "ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
mask = evas_key_modifier_mask_get(evas, "Shift");
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
if (!kg)
- fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
+ fprintf(stderr, "ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
mask = 0;
kg = evas_object_key_grab(o, "Return", mask, ~mask, 0);
if (!kg)
- fprintf(stderr,"ERROR: unable to redirect \"Return\" key events to object %p.\n", o);
+ fprintf(stderr, "ERROR: unable to redirect \"Return\" key events to object %p.\n", o);
mask = 0;
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
if (!kg)
- fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
- evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
- _imc_import_cb_key_down, import);
+ fprintf(stderr, "ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
+ _imc_import_cb_key_down, import);
o = e_widget_list_add(evas, 0, 0);
import->content_obj = o;
ofm = e_widget_fsel_add(evas, e_user_homedir_get(), "/",
- NULL, NULL,
- _imc_import_cb_selected, import,
- _imc_import_cb_changed, import, 1);
+ NULL, NULL,
+ _imc_import_cb_selected, import,
+ _imc_import_cb_changed, import, 1);
import->fsel_obj = ofm;
e_widget_list_object_append(o, ofm, 1, 1, 0.5);
@@ -117,13 +117,13 @@ e_int_config_imc_import(E_Config_Dialog *parent)
edje_object_part_swallow(import->bg_obj, "e.swallow.content", o);
evas_object_show(o);
- import->ok_obj = e_widget_button_add(evas, _("OK"), NULL,
- _imc_import_cb_ok, win, cfdata);
+ import->ok_obj = e_widget_button_add(evas, _("OK"), NULL,
+ _imc_import_cb_ok, win, cfdata);
e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
- import->cancel_obj = e_widget_button_add(evas, _("Cancel"), NULL,
- _imc_import_cb_close,
- win, cfdata);
+ import->cancel_obj = e_widget_button_add(evas, _("Cancel"), NULL,
+ _imc_import_cb_close,
+ win, cfdata);
e_widget_list_object_append(import->box_obj, import->cancel_obj, 1, 0, 0.5);
e_widget_disabled_set(import->ok_obj, 1);
@@ -148,7 +148,7 @@ e_int_config_imc_import(E_Config_Dialog *parent)
}
void
-e_int_config_imc_import_del(E_Win *win)
+e_int_config_imc_import_del(E_Win *win)
{
Import *import;
@@ -164,14 +164,14 @@ e_int_config_imc_import_del(E_Win *win)
return;
}
-static void
-_imc_import_cb_delete(E_Win *win)
+static void
+_imc_import_cb_delete(E_Win *win)
{
e_int_config_imc_import_del(win);
}
-static void
-_imc_import_cb_resize(E_Win *win)
+static void
+_imc_import_cb_resize(E_Win *win)
{
Import *import;
@@ -179,8 +179,8 @@ _imc_import_cb_resize(E_Win *win)
evas_object_resize(import->bg_obj, win->w, win->h);
}
-static void
-_imc_import_cb_wid_focus(void *data, Evas_Object *obj)
+static void
+_imc_import_cb_wid_focus(void *data, Evas_Object *obj)
{
Import *import;
@@ -188,11 +188,11 @@ _imc_import_cb_wid_focus(void *data, Evas_Object *obj)
if (obj == import->content_obj)
e_widget_focused_object_clear(import->box_obj);
else if (import->content_obj)
- e_widget_focused_object_clear(import->content_obj);
+ e_widget_focused_object_clear(import->content_obj);
}
-static void
-_imc_import_cb_selected(void *data, Evas_Object *obj __UNUSED__)
+static void
+_imc_import_cb_selected(void *data, Evas_Object *obj __UNUSED__)
{
Import *import;
@@ -200,8 +200,8 @@ _imc_import_cb_selected(void *data, Evas_Object *obj __UNUSED__)
_imc_import_cb_ok(import->win, NULL);
}
-static void
-_imc_import_cb_changed(void *data, Evas_Object *obj __UNUSED__)
+static void
+_imc_import_cb_changed(void *data, Evas_Object *obj __UNUSED__)
{
Import *import;
const char *path;
@@ -215,33 +215,33 @@ _imc_import_cb_changed(void *data, Evas_Object *obj __UNUSED__)
if (path)
import->cfdata->file = strdup(path);
- if (import->cfdata->file)
+ if (import->cfdata->file)
{
- char *strip;
+ char *strip;
- file = ecore_file_file_get(import->cfdata->file);
- strip = ecore_file_strip_ext(file);
- if (!strip)
- {
- E_FREE(import->cfdata->file);
- e_widget_disabled_set(import->ok_obj, 1);
- return;
- }
- free(strip);
- if (!e_util_glob_case_match(file, "*.imc"))
- {
- E_FREE(import->cfdata->file);
- e_widget_disabled_set(import->ok_obj, 1);
- return;
- }
- e_widget_disabled_set(import->ok_obj, 0);
+ file = ecore_file_file_get(import->cfdata->file);
+ strip = ecore_file_strip_ext(file);
+ if (!strip)
+ {
+ E_FREE(import->cfdata->file);
+ e_widget_disabled_set(import->ok_obj, 1);
+ return;
+ }
+ free(strip);
+ if (!e_util_glob_case_match(file, "*.imc"))
+ {
+ E_FREE(import->cfdata->file);
+ e_widget_disabled_set(import->ok_obj, 1);
+ return;
+ }
+ e_widget_disabled_set(import->ok_obj, 0);
}
else
- e_widget_disabled_set(import->ok_obj, 1);
+ e_widget_disabled_set(import->ok_obj, 1);
}
-static void
-_imc_import_cb_ok(void *data, void *data2 __UNUSED__)
+static void
+_imc_import_cb_ok(void *data, void *data2 __UNUSED__)
{
Import *import;
E_Win *win;
@@ -256,61 +256,61 @@ _imc_import_cb_ok(void *data, void *data2 __UNUSED__)
if (path)
import->cfdata->file = strdup(path);
- if (import->cfdata->file)
+ if (import->cfdata->file)
{
- Eet_File *ef;
- E_Input_Method_Config *imc;
- char *strip;
+ Eet_File *ef;
+ E_Input_Method_Config *imc;
+ char *strip;
- file = ecore_file_file_get(import->cfdata->file);
+ file = ecore_file_file_get(import->cfdata->file);
- if (!(strip = ecore_file_strip_ext(file))) return;
- free(strip);
+ if (!(strip = ecore_file_strip_ext(file))) return;
+ free(strip);
- if (!e_util_glob_case_match(file, "*.imc"))
- return;
+ if (!e_util_glob_case_match(file, "*.imc"))
+ return;
- imc = NULL;
- ef = eet_open(import->cfdata->file, EET_FILE_MODE_READ);
- if (ef)
- {
- imc = e_intl_input_method_config_read(ef);
- eet_close(ef);
- }
+ imc = NULL;
+ ef = eet_open(import->cfdata->file, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ imc = e_intl_input_method_config_read(ef);
+ eet_close(ef);
+ }
- if (!imc)
- {
- e_util_dialog_show(_("Input Method Config Import Error"),
- _("Enlightenment was unable to import "
- "the configuration.
Are "
- "you sure this is really a valid "
- "configuration?"));
- }
- else
- {
- char buf[PATH_MAX];
+ if (!imc)
+ {
+ e_util_dialog_show(_("Input Method Config Import Error"),
+ _("Enlightenment was unable to import "
+ "the configuration.
Are "
+ "you sure this is really a valid "
+ "configuration?"));
+ }
+ else
+ {
+ char buf[PATH_MAX];
- e_intl_input_method_config_free(imc);
- snprintf(buf, sizeof(buf), "%s/%s",
- e_intl_imc_personal_path_get(), file);
+ e_intl_input_method_config_free(imc);
+ snprintf(buf, sizeof(buf), "%s/%s",
+ e_intl_imc_personal_path_get(), file);
- if (!ecore_file_cp(import->cfdata->file, buf))
- {
- e_util_dialog_show(_("Input Method Config Import Error"),
- _("Enlightenment was unable to import "
- "the configuration
due to a copy "
- "error."));
- }
- else
- e_int_config_imc_update(import->parent, buf);
- }
+ if (!ecore_file_cp(import->cfdata->file, buf))
+ {
+ e_util_dialog_show(_("Input Method Config Import Error"),
+ _("Enlightenment was unable to import "
+ "the configuration
due to a copy "
+ "error."));
+ }
+ else
+ e_int_config_imc_update(import->parent, buf);
+ }
}
e_int_config_imc_import_del(import->win);
}
-static void
-_imc_import_cb_close(void *data, void *data2 __UNUSED__)
+static void
+_imc_import_cb_close(void *data, void *data2 __UNUSED__)
{
E_Win *win;
@@ -318,8 +318,8 @@ _imc_import_cb_close(void *data, void *data2 __UNUSED__)
e_int_config_imc_import_del(win);
}
-static void
-_imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
+static void
+_imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
{
Evas_Event_Key_Down *ev;
Import *import;
@@ -328,51 +328,52 @@ _imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
import = data;
if (!strcmp(ev->keyname, "Tab"))
{
- if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift"))
- {
- if (e_widget_focus_get(import->box_obj))
- {
- if (!e_widget_focus_jump(import->box_obj, 0))
- {
- e_widget_focus_set(import->content_obj, 0);
- if (!e_widget_focus_get(import->content_obj))
- e_widget_focus_set(import->box_obj, 0);
- }
- }
- else
- {
- if (!e_widget_focus_jump(import->content_obj, 0))
- e_widget_focus_set(import->box_obj, 0);
- }
- }
- else
- {
- if (e_widget_focus_get(import->box_obj))
- {
- if (!e_widget_focus_jump(import->box_obj, 1))
- {
- e_widget_focus_set(import->content_obj, 1);
- if (!e_widget_focus_get(import->content_obj))
- e_widget_focus_set(import->box_obj, 1);
- }
- }
- else
- {
- if (!e_widget_focus_jump(import->content_obj, 1))
- e_widget_focus_set(import->box_obj, 1);
- }
- }
+ if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift"))
+ {
+ if (e_widget_focus_get(import->box_obj))
+ {
+ if (!e_widget_focus_jump(import->box_obj, 0))
+ {
+ e_widget_focus_set(import->content_obj, 0);
+ if (!e_widget_focus_get(import->content_obj))
+ e_widget_focus_set(import->box_obj, 0);
+ }
+ }
+ else
+ {
+ if (!e_widget_focus_jump(import->content_obj, 0))
+ e_widget_focus_set(import->box_obj, 0);
+ }
+ }
+ else
+ {
+ if (e_widget_focus_get(import->box_obj))
+ {
+ if (!e_widget_focus_jump(import->box_obj, 1))
+ {
+ e_widget_focus_set(import->content_obj, 1);
+ if (!e_widget_focus_get(import->content_obj))
+ e_widget_focus_set(import->box_obj, 1);
+ }
+ }
+ else
+ {
+ if (!e_widget_focus_jump(import->content_obj, 1))
+ e_widget_focus_set(import->box_obj, 1);
+ }
+ }
}
- else if (((!strcmp(ev->keyname, "Return")) ||
- (!strcmp(ev->keyname, "KP_Enter")) ||
- (!strcmp(ev->keyname, "space"))))
+ else if (((!strcmp(ev->keyname, "Return")) ||
+ (!strcmp(ev->keyname, "KP_Enter")) ||
+ (!strcmp(ev->keyname, "space"))))
{
- Evas_Object *o = NULL;
+ Evas_Object *o = NULL;
- if ((import->content_obj) && (e_widget_focus_get(import->content_obj)))
- o = e_widget_focused_object_get(import->content_obj);
- else
- o = e_widget_focused_object_get(import->box_obj);
- if (o) e_widget_activate(o);
- }
+ if ((import->content_obj) && (e_widget_focus_get(import->content_obj)))
+ o = e_widget_focused_object_get(import->content_obj);
+ else
+ o = e_widget_focused_object_get(import->box_obj);
+ if (o) e_widget_activate(o);
+ }
}
+
diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index a851eb70e..2633f2bfd 100644
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -1,36 +1,36 @@
#include "e.h"
-typedef struct _E_Intl_Pair E_Intl_Pair;
+typedef struct _E_Intl_Pair E_Intl_Pair;
typedef struct _E_Intl_Langauge_Node E_Intl_Language_Node;
-typedef struct _E_Intl_Region_Node E_Intl_Region_Node;
+typedef struct _E_Intl_Region_Node E_Intl_Region_Node;
-static void *_create_data (E_Config_Dialog *cfd);
-static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _ilist_basic_language_cb_change (void *data, Evas_Object *obj);
-static void _ilist_language_cb_change (void *data, Evas_Object *obj);
-static void _ilist_region_cb_change (void *data, Evas_Object *obj);
-static void _ilist_codeset_cb_change (void *data, Evas_Object *obj);
-static void _ilist_modifier_cb_change (void *data, Evas_Object *obj);
-static int _lang_list_sort (const void *data1, const void *data2);
-static void _lang_list_load (void *data);
-static int _region_list_sort (const void *data1, const void *data2);
-static void _region_list_load (void *data);
-static int _basic_lang_list_sort (const void *data1, const void *data2);
+static void _ilist_basic_language_cb_change(void *data, Evas_Object *obj);
+static void _ilist_language_cb_change(void *data, Evas_Object *obj);
+static void _ilist_region_cb_change(void *data, Evas_Object *obj);
+static void _ilist_codeset_cb_change(void *data, Evas_Object *obj);
+static void _ilist_modifier_cb_change(void *data, Evas_Object *obj);
+static int _lang_list_sort(const void *data1, const void *data2);
+static void _lang_list_load(void *data);
+static int _region_list_sort(const void *data1, const void *data2);
+static void _region_list_load(void *data);
+static int _basic_lang_list_sort(const void *data1, const void *data2);
/* Fill the clear lists, fill with language, select */
/* Update lanague */
-static void _cfdata_language_go (const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata);
-static Eina_Bool _lang_hash_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
-static Eina_Bool _region_hash_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
-static Eina_Bool _language_hash_free_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
-static Eina_Bool _region_hash_free_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
-static void _intl_current_locale_setup (E_Config_Dialog_Data *cfdata);
-static const char *_intl_charset_upper_get (const char *charset);
+static void _cfdata_language_go(const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata);
+static Eina_Bool _lang_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
+static Eina_Bool _region_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
+static Eina_Bool _language_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
+static Eina_Bool _region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
+static void _intl_current_locale_setup(E_Config_Dialog_Data *cfdata);
+static const char *_intl_charset_upper_get(const char *charset);
struct _E_Intl_Pair
{
@@ -48,16 +48,16 @@ struct _E_Intl_Pair
struct _E_Intl_Langauge_Node
{
- const char *lang_code; /* en */
- const char *lang_name; /* English (trans in ilist) */
- int lang_available; /* defined in e translation */
- Eina_Hash *region_hash; /* US->utf8 */
+ const char *lang_code; /* en */
+ const char *lang_name; /* English (trans in ilist) */
+ int lang_available; /* defined in e translation */
+ Eina_Hash *region_hash; /* US->utf8 */
};
struct _E_Intl_Region_Node
{
- const char *region_code; /* US */
- const char *region_name; /* United States */
+ const char *region_code; /* US */
+ const char *region_name; /* United States */
Eina_List *available_codesets;
Eina_List *available_modifiers;
};
@@ -65,82 +65,82 @@ struct _E_Intl_Region_Node
struct _E_Config_Dialog_Data
{
E_Config_Dialog *cfd;
- Evas *evas;
+ Evas *evas;
/* Current data */
- char *cur_language;
+ char *cur_language;
- const char *cur_blang;
+ const char *cur_blang;
- const char *cur_lang;
- const char *cur_reg;
- const char *cur_cs;
- const char *cur_mod;
+ const char *cur_lang;
+ const char *cur_reg;
+ const char *cur_cs;
+ const char *cur_mod;
- int lang_dirty;
+ int lang_dirty;
- Eina_Hash *locale_hash;
- Eina_List *lang_list;
- Eina_List *region_list;
- Eina_List *blang_list;
+ Eina_Hash *locale_hash;
+ Eina_List *lang_list;
+ Eina_List *region_list;
+ Eina_List *blang_list;
struct
- {
- Evas_Object *blang_list;
+ {
+ Evas_Object *blang_list;
- Evas_Object *lang_list;
- Evas_Object *reg_list;
- Evas_Object *cs_list;
- Evas_Object *mod_list;
+ Evas_Object *lang_list;
+ Evas_Object *reg_list;
+ Evas_Object *cs_list;
+ Evas_Object *mod_list;
- Evas_Object *locale_entry;
- }
+ Evas_Object *locale_entry;
+ }
gui;
};
-const E_Intl_Pair basic_language_predefined_pairs[ ] = {
- {"ar_AE.UTF-8", "ara_flag.png", "العربية"},
- {"bg_BG.UTF-8", "bg_flag.png", "Български"},
- {"ca_ES.UTF-8", "cat_flag.png", "Català"},
- {"cs_CZ.UTF-8", "cz_flag.png", "Čeština"},
- {"da_DK.UTF-8", "dk_flag.png", "Dansk"},
- {"de_DE.UTF-8", "de_flag.png", "Deutsch"},
- {"en_US.UTF-8", "us_flag.png", "English"},
- {"en_GB.UTF-8", "gb_flag.png", "British English"},
- {"el_GR.UTF-8", "gr_flag.png", "Ελληνικά"},
- {"eo.UTF-8", "epo_flag.png", "Esperanto"},
- {"es_AR.UTF-8", "ar_flag.png", "Español"},
- {"et_ET.UTF-8", "ee_flag.png", "Eesti keel"},
- {"fi_FI.UTF-8", "fi_flag.png", "Suomi"},
- {"fo_FO.UTF-8", "fo_flag.png", "Føroyskt"},
- {"fr_CH.UTF-8", "ch_flag.png", "Français (Suisse)"},
- {"fr_FR.UTF-8", "fr_flag.png", "Français"},
- {"he_HE.UTF-8", "il_flag.png", "עברית"},
- {"hr_HR.UTF-8", "hr_flag.png", "Hrvatski"},
- {"hu_HU.UTF-8", "hu_flag.png", "Magyar"},
- {"it_IT.UTF-8", "it_flag.png", "Italiano"},
- {"ja_JP.UTF-8", "jp_flag.png", "日本語"},
- {"km_KM.UTF-8", "kh_flag.png", "ភាសាខ្មែរ"},
- {"ko_KR.UTF-8", "kr_flag.png", "한국어"},
- {"ku.UTF-8", "ku_flag.png", "یدروك"},
- {"lt_LT.UTF-8", "lt_flag.png", "Lietuvių kalba"},
- {"ms_MY.UTF-8", "my_flag.png", "Bahasa Melayu"},
- {"nb_NO.UTF-8", "no_flag.png", "Norsk Bokmål"},
- {"nl_NL.UTF-8", "nl_flag.png", "Nederlands"},
- {"pl_PL.UTF-8", "pl_flag.png", "Polski"},
- {"pt_BR.UTF-8", "br_flag.png", "Português"},
- {"ru_RU.UTF-8", "ru_flag.png", "Русский"},
- {"sk_SK.UTF-8", "sk_flag.png", "Slovenčina"},
- {"sl_SI.UTF-8", "si_flag.png", "Slovenščina"},
- {"sv_SE.UTF-8", "se_flag.png", "Svenska"},
- {"tr_TR.UTF-8", "tr_flag.png", "Türkçe"},
- {"uk_UK.UTF-8", "ua_flag.png", "Українська мова"},
- {"zh_CN.UTF-8", "cn_flag.png", "中文 (繁体)"},
- {"zh_TW.UTF-8", "tw_flag.png", "中文 (繁體)"},
+const E_Intl_Pair basic_language_predefined_pairs[] = {
+ {"ar_AE.UTF-8", "ara_flag.png", "العربية"},
+ {"bg_BG.UTF-8", "bg_flag.png", "Български"},
+ {"ca_ES.UTF-8", "cat_flag.png", "Català"},
+ {"cs_CZ.UTF-8", "cz_flag.png", "Čeština"},
+ {"da_DK.UTF-8", "dk_flag.png", "Dansk"},
+ {"de_DE.UTF-8", "de_flag.png", "Deutsch"},
+ {"en_US.UTF-8", "us_flag.png", "English"},
+ {"en_GB.UTF-8", "gb_flag.png", "British English"},
+ {"el_GR.UTF-8", "gr_flag.png", "Ελληνικά"},
+ {"eo.UTF-8", "epo_flag.png", "Esperanto"},
+ {"es_AR.UTF-8", "ar_flag.png", "Español"},
+ {"et_ET.UTF-8", "ee_flag.png", "Eesti keel"},
+ {"fi_FI.UTF-8", "fi_flag.png", "Suomi"},
+ {"fo_FO.UTF-8", "fo_flag.png", "Føroyskt"},
+ {"fr_CH.UTF-8", "ch_flag.png", "Français (Suisse)"},
+ {"fr_FR.UTF-8", "fr_flag.png", "Français"},
+ {"he_HE.UTF-8", "il_flag.png", "עברית"},
+ {"hr_HR.UTF-8", "hr_flag.png", "Hrvatski"},
+ {"hu_HU.UTF-8", "hu_flag.png", "Magyar"},
+ {"it_IT.UTF-8", "it_flag.png", "Italiano"},
+ {"ja_JP.UTF-8", "jp_flag.png", "日本語"},
+ {"km_KM.UTF-8", "kh_flag.png", "ភាសាខ្មែរ"},
+ {"ko_KR.UTF-8", "kr_flag.png", "한국어"},
+ {"ku.UTF-8", "ku_flag.png", "یدروك"},
+ {"lt_LT.UTF-8", "lt_flag.png", "Lietuvių kalba"},
+ {"ms_MY.UTF-8", "my_flag.png", "Bahasa Melayu"},
+ {"nb_NO.UTF-8", "no_flag.png", "Norsk Bokmål"},
+ {"nl_NL.UTF-8", "nl_flag.png", "Nederlands"},
+ {"pl_PL.UTF-8", "pl_flag.png", "Polski"},
+ {"pt_BR.UTF-8", "br_flag.png", "Português"},
+ {"ru_RU.UTF-8", "ru_flag.png", "Русский"},
+ {"sk_SK.UTF-8", "sk_flag.png", "Slovenčina"},
+ {"sl_SI.UTF-8", "si_flag.png", "Slovenščina"},
+ {"sv_SE.UTF-8", "se_flag.png", "Svenska"},
+ {"tr_TR.UTF-8", "tr_flag.png", "Türkçe"},
+ {"uk_UK.UTF-8", "ua_flag.png", "Українська мова"},
+ {"zh_CN.UTF-8", "cn_flag.png", "中文 (繁体)"},
+ {"zh_TW.UTF-8", "tw_flag.png", "中文 (繁體)"},
{ NULL, NULL, NULL }
};
-const E_Intl_Pair language_predefined_pairs[ ] = {
+const E_Intl_Pair language_predefined_pairs[] = {
{"aa", NULL, "Qafár af"},
{"af", NULL, "Afrikaans"},
{"ak", NULL, "Akan"},
@@ -279,7 +279,7 @@ const E_Intl_Pair language_predefined_pairs[ ] = {
{ NULL, NULL, NULL}
};
-const E_Intl_Pair region_predefined_pairs[ ] = {
+const E_Intl_Pair region_predefined_pairs[] = {
{ "AF", NULL, "Afghanistan"},
{ "AX", NULL, "Åland"},
{ "AL", NULL, "Shqipëria"},
@@ -536,7 +536,7 @@ const E_Intl_Pair region_predefined_pairs[ ] = {
* make sure that locale -a output gets converted to upper-case form in
* 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 */
{"cp1255", NULL, "CP1255"},
{"euc", NULL, "EUC"},
@@ -545,7 +545,7 @@ const E_Intl_Pair charset_predefined_pairs[ ] = {
{"koi8t", NULL, "KOI8-T"},
{"tcvn", NULL, "TCVN"},
{"ujis", NULL, "UJIS"},
-
+
/* These are from charsets man page */
{"big5", NULL, "BIG5"},
{"big5hkscs", NULL, "BIG5-HKSCS"},
@@ -590,9 +590,9 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
v->basic.apply_cfdata = _basic_apply_data;
cfd = e_config_dialog_new(con,
- _("Language Settings"),
- "E", "language/language_settings",
- "preferences-desktop-locale", 0, v, NULL);
+ _("Language Settings"),
+ "E", "language/language_settings",
+ "preferences-desktop-locale", 0, v, NULL);
return cfd;
}
@@ -608,8 +608,8 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
- Eina_List *e_lang_list;
- FILE *output;
+ Eina_List *e_lang_list;
+ FILE *output;
e_lang_list = e_intl_language_list();
@@ -621,173 +621,173 @@ _fill_data(E_Config_Dialog_Data *cfdata)
#endif
if ( output )
{
- char line[32];
- while (fscanf(output, "%[^\n]\n", line) == 1)
- {
- E_Locale_Parts *locale_parts;
+ char line[32];
+ while (fscanf(output, "%[^\n]\n", line) == 1)
+ {
+ E_Locale_Parts *locale_parts;
- locale_parts = e_intl_locale_parts_get(line);
+ locale_parts = e_intl_locale_parts_get(line);
- if (locale_parts)
- {
- char *basic_language;
+ if (locale_parts)
+ {
+ char *basic_language;
- basic_language = e_intl_locale_parts_combine(locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION);
- if (basic_language)
- {
- int i;
+ basic_language = e_intl_locale_parts_combine(locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION);
+ if (basic_language)
+ {
+ int i;
- i = 0;
- while (basic_language_predefined_pairs[i].locale_key)
- {
- /* if basic language is supported by E and System*/
- if (!strncmp(basic_language_predefined_pairs[i].locale_key,
- basic_language, strlen(basic_language)))
- {
- if (!eina_list_data_find(cfdata->blang_list, &basic_language_predefined_pairs[i]))
- cfdata->blang_list = eina_list_append(cfdata->blang_list, &basic_language_predefined_pairs[i]);
- break;
- }
- i++;
- }
- }
- E_FREE(basic_language);
+ i = 0;
+ while (basic_language_predefined_pairs[i].locale_key)
+ {
+ /* if basic language is supported by E and System*/
+ if (!strncmp(basic_language_predefined_pairs[i].locale_key,
+ basic_language, strlen(basic_language)))
+ {
+ if (!eina_list_data_find(cfdata->blang_list, &basic_language_predefined_pairs[i]))
+ cfdata->blang_list = eina_list_append(cfdata->blang_list, &basic_language_predefined_pairs[i]);
+ break;
+ }
+ i++;
+ }
+ }
+ E_FREE(basic_language);
- /* If the language is a valid ll_RR[.enc[@mod]] locale add it to the hash */
- if (locale_parts->lang)
- {
- E_Intl_Language_Node *lang_node;
- E_Intl_Region_Node *region_node;
+ /* If the language is a valid ll_RR[.enc[@mod]] locale add it to the hash */
+ if (locale_parts->lang)
+ {
+ E_Intl_Language_Node *lang_node;
+ E_Intl_Region_Node *region_node;
- /* Add the language to the new locale properties to the hash */
- /* First check if the LANGUAGE exists in there already */
+ /* Add the language to the new locale properties to the hash */
+ /* First check if the LANGUAGE exists in there already */
- lang_node = eina_hash_find(cfdata->locale_hash, locale_parts->lang);
- if (!lang_node)
- {
- Eina_List *next;
- int i;
+ lang_node = eina_hash_find(cfdata->locale_hash, locale_parts->lang);
+ if (!lang_node)
+ {
+ Eina_List *next;
+ int i;
- /* create new node */
- lang_node = E_NEW(E_Intl_Language_Node, 1);
+ /* create new node */
+ lang_node = E_NEW(E_Intl_Language_Node, 1);
- lang_node->lang_code = eina_stringshare_add(locale_parts->lang);
+ lang_node->lang_code = eina_stringshare_add(locale_parts->lang);
- /* Check if the language list exists */
- /* Linear Search */
- for (next = e_lang_list; next; next = next->next)
- {
- char *e_lang;
+ /* Check if the language list exists */
+ /* Linear Search */
+ for (next = e_lang_list; next; next = next->next)
+ {
+ char *e_lang;
- e_lang = next->data;
- if (!strncmp(e_lang, locale_parts->lang, 2) || !strcmp("en", locale_parts->lang))
- {
- lang_node->lang_available = 1;
- break;
- }
- }
+ e_lang = next->data;
+ if (!strncmp(e_lang, locale_parts->lang, 2) || !strcmp("en", locale_parts->lang))
+ {
+ lang_node->lang_available = 1;
+ break;
+ }
+ }
- /* Search for translation */
- /* Linear Search */
- i = 0;
- while (language_predefined_pairs[i].locale_key)
- {
- if (!strcmp(language_predefined_pairs[i].locale_key, locale_parts->lang))
- {
- lang_node->lang_name = _(language_predefined_pairs[i].locale_translation);
- break;
- }
- i++;
- }
+ /* Search for translation */
+ /* Linear Search */
+ i = 0;
+ while (language_predefined_pairs[i].locale_key)
+ {
+ if (!strcmp(language_predefined_pairs[i].locale_key, locale_parts->lang))
+ {
+ lang_node->lang_name = _(language_predefined_pairs[i].locale_translation);
+ break;
+ }
+ i++;
+ }
- if (!cfdata->locale_hash)
- cfdata->locale_hash = eina_hash_string_superfast_new(NULL);
- eina_hash_add(cfdata->locale_hash, locale_parts->lang, lang_node);
- }
+ if (!cfdata->locale_hash)
+ cfdata->locale_hash = eina_hash_string_superfast_new(NULL);
+ eina_hash_add(cfdata->locale_hash, locale_parts->lang, lang_node);
+ }
- /* We now have the current language hash node, lets see if there is
- region data that needs to be added.
- */
+ /* We now have the current language hash node, lets see if there is
+ region data that needs to be added.
+ */
- if (locale_parts->region)
- {
- region_node = eina_hash_find(lang_node->region_hash, locale_parts->region);
+ if (locale_parts->region)
+ {
+ region_node = eina_hash_find(lang_node->region_hash, locale_parts->region);
- if (!region_node)
- {
- int i;
+ if (!region_node)
+ {
+ int i;
- /* create new node */
- region_node = E_NEW(E_Intl_Region_Node, 1);
- region_node->region_code = eina_stringshare_add(locale_parts->region);
+ /* create new node */
+ region_node = E_NEW(E_Intl_Region_Node, 1);
+ region_node->region_code = eina_stringshare_add(locale_parts->region);
- /* Get the region translation */
- /* Linear Search */
- i = 0;
- while (region_predefined_pairs[i].locale_key)
- {
- if (!strcmp(region_predefined_pairs[i].locale_key, locale_parts->region))
- {
- region_node->region_name = _(region_predefined_pairs[i].locale_translation);
- break;
- }
- i++;
- }
- if (!lang_node->region_hash)
- lang_node->region_hash = eina_hash_string_superfast_new(NULL);
- eina_hash_add(lang_node->region_hash, locale_parts->region, region_node);
- }
+ /* Get the region translation */
+ /* Linear Search */
+ i = 0;
+ while (region_predefined_pairs[i].locale_key)
+ {
+ if (!strcmp(region_predefined_pairs[i].locale_key, locale_parts->region))
+ {
+ region_node->region_name = _(region_predefined_pairs[i].locale_translation);
+ break;
+ }
+ i++;
+ }
+ if (!lang_node->region_hash)
+ lang_node->region_hash = eina_hash_string_superfast_new(NULL);
+ eina_hash_add(lang_node->region_hash, locale_parts->region, region_node);
+ }
- /* We now have the current region hash node */
- /* Add codeset to the region hash node if it exists */
- if (locale_parts->codeset)
- {
- const char * cs = NULL;
- const char * cs_trans;
+ /* We now have the current region hash node */
+ /* Add codeset to the region hash node if it exists */
+ if (locale_parts->codeset)
+ {
+ const char *cs = NULL;
+ const char *cs_trans;
- cs_trans = _intl_charset_upper_get(locale_parts->codeset);
- if (!cs_trans)
- cs = eina_stringshare_add(locale_parts->codeset);
- else
- cs = eina_stringshare_add(cs_trans);
+ cs_trans = _intl_charset_upper_get(locale_parts->codeset);
+ if (!cs_trans)
+ cs = eina_stringshare_add(locale_parts->codeset);
+ else
+ cs = eina_stringshare_add(cs_trans);
- /* Exclusive */
- /* Linear Search */
- if (!eina_list_data_find(region_node->available_codesets, cs))
- region_node->available_codesets = eina_list_append(region_node->available_codesets, cs);
+ /* Exclusive */
+ /* Linear Search */
+ if (!eina_list_data_find(region_node->available_codesets, cs))
+ region_node->available_codesets = eina_list_append(region_node->available_codesets, cs);
else eina_stringshare_del(cs);
- }
+ }
- /* Add modifier to the region hash node if it exists */
- if (locale_parts->modifier)
- {
- const char *mod;
+ /* Add modifier to the region hash node if it exists */
+ if (locale_parts->modifier)
+ {
+ const char *mod;
- mod = eina_stringshare_add(locale_parts->modifier);
- /* Find only works here because we are using stringshare*/
+ mod = eina_stringshare_add(locale_parts->modifier);
+ /* Find only works here because we are using stringshare*/
- /* Exclusive */
- /* Linear Search */
- if (!eina_list_data_find(region_node->available_modifiers, mod))
- region_node->available_modifiers = eina_list_append(region_node->available_modifiers, mod);
- }
- }
- }
- e_intl_locale_parts_free(locale_parts);
- }
- }
+ /* Exclusive */
+ /* Linear Search */
+ if (!eina_list_data_find(region_node->available_modifiers, mod))
+ region_node->available_modifiers = eina_list_append(region_node->available_modifiers, mod);
+ }
+ }
+ }
+ e_intl_locale_parts_free(locale_parts);
+ }
+ }
- /* Sort basic languages */
- cfdata->blang_list = eina_list_sort(cfdata->blang_list,
- eina_list_count(cfdata->blang_list),
- _basic_lang_list_sort);
+ /* Sort basic languages */
+ cfdata->blang_list = eina_list_sort(cfdata->blang_list,
+ eina_list_count(cfdata->blang_list),
+ _basic_lang_list_sort);
while (e_lang_list)
- {
- free(e_lang_list->data);
- e_lang_list = eina_list_remove_list(e_lang_list, e_lang_list);
- }
- pclose(output);
+ {
+ free(e_lang_list->data);
+ e_lang_list = eina_list_remove_list(e_lang_list, e_lang_list);
+ }
+ pclose(output);
}
/* Make sure we know the currently configured locale */
@@ -852,21 +852,21 @@ _region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_
if (node->region_code) eina_stringshare_del(node->region_code);
while (node->available_codesets)
{
- const char *str;
+ const char *str;
- str = node->available_codesets->data;
- if (str) eina_stringshare_del(str);
- node->available_codesets =
+ str = node->available_codesets->data;
+ if (str) eina_stringshare_del(str);
+ node->available_codesets =
eina_list_remove_list(node->available_codesets, node->available_codesets);
}
while (node->available_modifiers)
{
- const char *str;
+ const char *str;
- str = node->available_modifiers->data;
- if (str) eina_stringshare_del(str);
- node->available_modifiers =
+ str = node->available_modifiers->data;
+ if (str) eina_stringshare_del(str);
+ node->available_modifiers =
eina_list_remove_list(node->available_modifiers, node->available_modifiers);
}
@@ -881,24 +881,24 @@ _lc_check(void)
buf[0] = 0;
- if (getenv("LC_CTYPE")) strcat(buf, "
LC_CTYPE");
- if (getenv("LC_NUMERIC")) strcat(buf, "
LC_NUMERIC");
- if (getenv("LC_TIME")) strcat(buf, "
LC_TIME");
- if (getenv("LC_COLLATE")) strcat(buf, "
LC_COLLATE");
+ if (getenv("LC_CTYPE")) strcat(buf, "
LC_CTYPE");
+ if (getenv("LC_NUMERIC")) strcat(buf, "
LC_NUMERIC");
+ if (getenv("LC_TIME")) strcat(buf, "
LC_TIME");
+ if (getenv("LC_COLLATE")) strcat(buf, "
LC_COLLATE");
if (getenv("LC_MONETARY")) strcat(buf, "
LC_MONETARY");
if (getenv("LC_MESSAGES")) strcat(buf, "
LC_MESSAGES");
- if (getenv("LC_ALL")) strcat(buf, "
LC_ALL");
+ if (getenv("LC_ALL")) strcat(buf, "
LC_ALL");
if (buf[0] != 0)
- e_util_dialog_show(_("Possible Locale problems"),
- _("You have some extra locale environment
"
- "variables set that may interfere with
"
- "correct display of your chosen language.
"
- "If you don't want these affected, use the
"
- "Environment variable settings to unset them.
"
- "The variables that may affect you are
"
- "as follows:
"
- "%s"), buf);
+ e_util_dialog_show(_("Possible Locale problems"),
+ _("You have some extra locale environment
"
+ "variables set that may interfere with
"
+ "correct display of your chosen language.
"
+ "If you don't want these affected, use the
"
+ "Environment variable settings to unset them.
"
+ "The variables that may affect you are
"
+ "as follows:
"
+ "%s"), buf);
}
static int
@@ -906,11 +906,11 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
if (cfdata->cur_language)
{
- if (e_config->language) eina_stringshare_del(e_config->language);
+ if (e_config->language) eina_stringshare_del(e_config->language);
e_config->language = NULL;
if ((cfdata->cur_language) && (cfdata->cur_language[0]))
- e_config->language = eina_stringshare_add(cfdata->cur_language);
- e_intl_language_set(e_config->language);
+ e_config->language = eina_stringshare_add(cfdata->cur_language);
+ e_intl_language_set(e_config->language);
_lc_check();
}
@@ -923,11 +923,11 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
{
if (cfdata->cur_language)
{
- if (e_config->language) eina_stringshare_del(e_config->language);
+ if (e_config->language) eina_stringshare_del(e_config->language);
e_config->language = NULL;
if ((cfdata->cur_language) && (cfdata->cur_language[0]))
- e_config->language = eina_stringshare_add(cfdata->cur_language);
- e_intl_language_set(e_config->language);
+ e_config->language = eina_stringshare_add(cfdata->cur_language);
+ e_intl_language_set(e_config->language);
_lc_check();
}
@@ -960,17 +960,17 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_ilist_freeze(ob);
if (cfdata->cur_language)
{
- E_Locale_Parts *locale_parts;
- locale_parts = e_intl_locale_parts_get(cfdata->cur_language);
- if (locale_parts)
- {
- cur_sig_loc = e_intl_locale_parts_combine(locale_parts,
- E_INTL_LOC_LANG | E_INTL_LOC_REGION);
+ E_Locale_Parts *locale_parts;
+ locale_parts = e_intl_locale_parts_get(cfdata->cur_language);
+ if (locale_parts)
+ {
+ cur_sig_loc = e_intl_locale_parts_combine(locale_parts,
+ E_INTL_LOC_LANG | E_INTL_LOC_REGION);
- e_intl_locale_parts_free(locale_parts);
- }
- else
- cur_sig_loc = NULL;
+ e_intl_locale_parts_free(locale_parts);
+ }
+ else
+ cur_sig_loc = NULL;
}
else
cur_sig_loc = NULL;
@@ -979,31 +979,31 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ic = e_util_icon_add(buf, evas);
e_widget_ilist_append(cfdata->gui.blang_list, ic, _("System Default"), NULL, NULL, "");
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++;
for (next = cfdata->blang_list; next; next = next->next)
{
- E_Intl_Pair *pair;
- const char *key;
- const char *trans;
+ E_Intl_Pair *pair;
+ const char *key;
+ const char *trans;
- pair = next->data;
- key = pair->locale_key;
- trans = _(pair->locale_translation);
- if (pair->locale_icon)
- {
- e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon);
- ic = e_util_icon_add(buf, evas);
- }
+ pair = next->data;
+ key = pair->locale_key;
+ trans = _(pair->locale_translation);
+ if (pair->locale_icon)
+ {
+ e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon);
+ ic = e_util_icon_add(buf, evas);
+ }
else
- ic = NULL;
- e_widget_ilist_append(cfdata->gui.blang_list, ic, trans, NULL, NULL, key);
- if ((cur_sig_loc) &&
+ ic = NULL;
+ e_widget_ilist_append(cfdata->gui.blang_list, ic, trans, NULL, NULL, key);
+ if ((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_widget_ilist_go(ob);
@@ -1019,7 +1019,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_disabled_set(cfdata->gui.locale_entry, 1);
e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
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_dialog_resizable_set(cfd->dia, 1);
@@ -1050,10 +1050,10 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
if (cfdata->lang_list)
{
- cfdata->lang_list =
+ cfdata->lang_list =
eina_list_sort(cfdata->lang_list, eina_list_count(cfdata->lang_list),
_lang_list_sort);
- _lang_list_load(cfdata);
+ _lang_list_load(cfdata);
}
e_widget_ilist_go(ob);
@@ -1097,7 +1097,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_disabled_set(cfdata->gui.locale_entry, 1);
e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
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);
/* all these cur_* values are not guaranteed to be const so we need to
@@ -1150,7 +1150,7 @@ _ilist_language_cb_change(void *data, Evas_Object *obj __UNUSED__)
static void
_ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
{
- E_Config_Dialog_Data * cfdata;
+ E_Config_Dialog_Data *cfdata;
char locale[32];
cfdata = data;
@@ -1163,7 +1163,7 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
e_widget_entry_text_set(cfdata->gui.locale_entry, locale);
}
else
- e_widget_entry_text_set(cfdata->gui.locale_entry, "");
+ e_widget_entry_text_set(cfdata->gui.locale_entry, "");
eina_stringshare_del(cfdata->cur_cs);
eina_stringshare_del(cfdata->cur_mod);
cfdata->cur_cs = NULL;
@@ -1173,7 +1173,7 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__)
static void
_ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__)
{
- E_Config_Dialog_Data * cfdata;
+ E_Config_Dialog_Data *cfdata;
char locale[32];
cfdata = data;
@@ -1181,19 +1181,19 @@ _ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__)
if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
{
if (cfdata->cur_mod)
- sprintf(locale, "%s_%s.%s@%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_cs, cfdata->cur_mod);
+ sprintf(locale, "%s_%s.%s@%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_cs, cfdata->cur_mod);
else
- sprintf(locale, "%s_%s.%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_cs);
+ sprintf(locale, "%s_%s.%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_cs);
e_widget_entry_text_set(cfdata->gui.locale_entry, locale);
}
else
- e_widget_entry_text_set(cfdata->gui.locale_entry, "");
+ e_widget_entry_text_set(cfdata->gui.locale_entry, "");
}
static void
_ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__)
{
- E_Config_Dialog_Data * cfdata;
+ E_Config_Dialog_Data *cfdata;
char locale[32];
cfdata = data;
@@ -1201,13 +1201,13 @@ _ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__)
if ((cfdata->cur_lang) && (cfdata->cur_lang[0]))
{
if (cfdata->cur_cs)
- sprintf(locale, "%s_%s.%s@%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_cs, cfdata->cur_mod);
+ sprintf(locale, "%s_%s.%s@%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_cs, cfdata->cur_mod);
else
- sprintf(locale, "%s_%s@%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_mod);
+ sprintf(locale, "%s_%s@%s", cfdata->cur_lang, cfdata->cur_reg, cfdata->cur_mod);
e_widget_entry_text_set(cfdata->gui.locale_entry, locale);
}
else
- e_widget_entry_text_set(cfdata->gui.locale_entry, "");
+ e_widget_entry_text_set(cfdata->gui.locale_entry, "");
}
static void
@@ -1230,88 +1230,87 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
if ((!lang) || (!lang[0]))
{
e_widget_ilist_clear(cfdata->gui.reg_list);
- e_widget_ilist_clear(cfdata->gui.cs_list);
- e_widget_ilist_clear(cfdata->gui.mod_list);
+ e_widget_ilist_clear(cfdata->gui.cs_list);
+ e_widget_ilist_clear(cfdata->gui.mod_list);
}
if (cfdata->lang_dirty || (lang && !region))
{
- lang_update = 1;
- region_update = 1;
- e_widget_ilist_clear(cfdata->gui.cs_list);
- e_widget_ilist_clear(cfdata->gui.mod_list);
+ lang_update = 1;
+ region_update = 1;
+ e_widget_ilist_clear(cfdata->gui.cs_list);
+ e_widget_ilist_clear(cfdata->gui.mod_list);
}
if (lang && region)
{
- region_update = 1;
- e_widget_ilist_clear(cfdata->gui.cs_list);
- e_widget_ilist_clear(cfdata->gui.mod_list);
+ region_update = 1;
+ e_widget_ilist_clear(cfdata->gui.cs_list);
+ e_widget_ilist_clear(cfdata->gui.mod_list);
}
cfdata->lang_dirty = 0;
if (lang)
{
- lang_node = eina_hash_find(cfdata->locale_hash, lang);
+ lang_node = eina_hash_find(cfdata->locale_hash, lang);
- if (lang_node)
- {
- if (lang_update)
- {
- e_widget_ilist_clear(cfdata->gui.reg_list);
- cfdata->region_list = eina_list_free(cfdata->region_list);
- eina_hash_foreach(lang_node->region_hash,
+ if (lang_node)
+ {
+ if (lang_update)
+ {
+ e_widget_ilist_clear(cfdata->gui.reg_list);
+ cfdata->region_list = eina_list_free(cfdata->region_list);
+ eina_hash_foreach(lang_node->region_hash,
_region_hash_cb, cfdata);
- cfdata->region_list =
+ cfdata->region_list =
eina_list_sort(cfdata->region_list,
eina_list_count(cfdata->region_list),
_region_list_sort);
- _region_list_load(cfdata);
- }
+ _region_list_load(cfdata);
+ }
- if (region && region_update)
- {
- E_Intl_Region_Node *reg_node;
+ if (region && region_update)
+ {
+ E_Intl_Region_Node *reg_node;
- reg_node = eina_hash_find(lang_node->region_hash, region);
- if (reg_node)
- {
- Eina_List *next;
+ reg_node = eina_hash_find(lang_node->region_hash, region);
+ if (reg_node)
+ {
+ Eina_List *next;
- for (next = reg_node->available_codesets; next; next = next->next)
- {
- const char * cs;
+ for (next = reg_node->available_codesets; next; next = next->next)
+ {
+ const char *cs;
- cs = next->data;
- e_widget_ilist_append(cfdata->gui.cs_list, NULL, cs, NULL, NULL, cs);
- if (codeset && !strcmp(cs, codeset))
- {
- int count;
+ cs = next->data;
+ e_widget_ilist_append(cfdata->gui.cs_list, NULL, cs, NULL, NULL, cs);
+ if (codeset && !strcmp(cs, codeset))
+ {
+ int count;
- count = e_widget_ilist_count(cfdata->gui.cs_list);
- e_widget_ilist_selected_set(cfdata->gui.cs_list, count - 1);
- }
- }
+ count = e_widget_ilist_count(cfdata->gui.cs_list);
+ e_widget_ilist_selected_set(cfdata->gui.cs_list, count - 1);
+ }
+ }
- for (next = reg_node->available_modifiers; next; next = next->next)
- {
- const char * mod;
+ for (next = reg_node->available_modifiers; next; next = next->next)
+ {
+ const char *mod;
- mod = next->data;
- e_widget_ilist_append(cfdata->gui.mod_list, NULL, mod, NULL, NULL, mod);
- if (modifier && !strcmp(mod, modifier))
- {
- int count;
+ mod = next->data;
+ e_widget_ilist_append(cfdata->gui.mod_list, NULL, mod, NULL, NULL, mod);
+ if (modifier && !strcmp(mod, modifier))
+ {
+ int count;
- count = e_widget_ilist_count(cfdata->gui.mod_list);
- e_widget_ilist_selected_set(cfdata->gui.mod_list, count - 1);
- }
-
- }
- }
- e_widget_ilist_go(cfdata->gui.cs_list);
- e_widget_ilist_go(cfdata->gui.mod_list);
- }
- }
+ count = e_widget_ilist_count(cfdata->gui.mod_list);
+ e_widget_ilist_selected_set(cfdata->gui.mod_list, count - 1);
+ }
+ }
+ }
+ e_widget_ilist_go(cfdata->gui.cs_list);
+ e_widget_ilist_go(cfdata->gui.mod_list);
+ }
+ }
}
e_widget_ilist_thaw(cfdata->gui.cs_list);
e_widget_ilist_thaw(cfdata->gui.mod_list);
@@ -1363,26 +1362,26 @@ _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
if (cfdata->cur_language)
{
- E_Locale_Parts *locale_parts;
+ E_Locale_Parts *locale_parts;
- locale_parts = e_intl_locale_parts_get(cfdata->cur_language);
- if (locale_parts)
- {
- cfdata->cur_lang = eina_stringshare_add(locale_parts->lang);
- cfdata->cur_reg = eina_stringshare_add(locale_parts->region);
- if (locale_parts->codeset)
- {
- const char *cs_trans;
+ locale_parts = e_intl_locale_parts_get(cfdata->cur_language);
+ if (locale_parts)
+ {
+ cfdata->cur_lang = eina_stringshare_add(locale_parts->lang);
+ cfdata->cur_reg = eina_stringshare_add(locale_parts->region);
+ if (locale_parts->codeset)
+ {
+ const char *cs_trans;
- cs_trans = _intl_charset_upper_get(locale_parts->codeset);
- if (!cs_trans)
- cfdata->cur_cs = eina_stringshare_add(locale_parts->codeset);
- else
- cfdata->cur_cs = eina_stringshare_add(cs_trans);
- }
- cfdata->cur_mod = eina_stringshare_add(locale_parts->modifier);
- }
- e_intl_locale_parts_free(locale_parts);
+ cs_trans = _intl_charset_upper_get(locale_parts->codeset);
+ if (!cs_trans)
+ cfdata->cur_cs = eina_stringshare_add(locale_parts->codeset);
+ else
+ cfdata->cur_cs = eina_stringshare_add(cs_trans);
+ }
+ cfdata->cur_mod = eina_stringshare_add(locale_parts->modifier);
+ }
+ e_intl_locale_parts_free(locale_parts);
}
cfdata->lang_dirty = 1;
}
@@ -1406,7 +1405,7 @@ _lang_list_sort(const void *data1, const void *data2)
if (!ln2->lang_name) return -1;
trans2 = ln2->lang_name;
- return (strcmp(trans1, trans2));
+ return strcmp(trans1, trans2);
}
static void
@@ -1431,33 +1430,33 @@ _lang_list_load(void *data)
e_widget_ilist_append(cfdata->gui.lang_list, ic, _("System Default"), NULL, NULL, "");
for (l = cfdata->lang_list; l; l = l->next)
{
- E_Intl_Language_Node *ln;
- const char *trans;
+ E_Intl_Language_Node *ln;
+ const char *trans;
- ln = l->data;
- if (!ln) continue;
- if (ln->lang_name)
- trans = ln->lang_name;
- else
- trans = ln->lang_code;
+ ln = l->data;
+ if (!ln) continue;
+ if (ln->lang_name)
+ trans = ln->lang_name;
+ else
+ trans = ln->lang_code;
- if (ln->lang_available)
- {
- ic = e_icon_add(cfdata->evas);
- e_util_icon_theme_set(ic, "dialog-ok-apply");
- }
- else
- ic = NULL;
+ if (ln->lang_available)
+ {
+ ic = e_icon_add(cfdata->evas);
+ e_util_icon_theme_set(ic, "dialog-ok-apply");
+ }
+ else
+ ic = NULL;
- 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))
- {
- int count;
+ if (cfdata->cur_lang && !strcmp(cfdata->cur_lang, ln->lang_code))
+ {
+ int count;
- count = e_widget_ilist_count(cfdata->gui.lang_list);
- e_widget_ilist_selected_set(cfdata->gui.lang_list, count - 1);
- }
+ count = e_widget_ilist_count(cfdata->gui.lang_list);
+ e_widget_ilist_selected_set(cfdata->gui.lang_list, count - 1);
+ }
}
e_widget_ilist_thaw(cfdata->gui.lang_list);
edje_thaw();
@@ -1483,7 +1482,7 @@ _region_list_sort(const void *data1, const void *data2)
if (!rn2->region_name) return -1;
trans2 = rn2->region_name;
- return (strcmp(trans1, trans2));
+ return strcmp(trans1, trans2);
}
static void
@@ -1503,25 +1502,25 @@ _region_list_load(void *data)
for (l = cfdata->region_list; l; l = l->next)
{
- E_Intl_Region_Node *rn;
- const char *trans;
+ E_Intl_Region_Node *rn;
+ const char *trans;
- rn = l->data;
- if (!rn) continue;
- if (rn->region_name)
- trans = rn->region_name;
- else
- trans = rn->region_code;
+ rn = l->data;
+ if (!rn) continue;
+ if (rn->region_name)
+ trans = rn->region_name;
+ else
+ 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))
- {
- int count;
+ if (cfdata->cur_reg && !strcmp(cfdata->cur_reg, rn->region_code))
+ {
+ int count;
- count = e_widget_ilist_count(cfdata->gui.reg_list);
- e_widget_ilist_selected_set(cfdata->gui.reg_list, count - 1);
- }
+ count = e_widget_ilist_count(cfdata->gui.reg_list);
+ e_widget_ilist_selected_set(cfdata->gui.reg_list, count - 1);
+ }
}
e_widget_ilist_thaw(cfdata->gui.reg_list);
edje_thaw();
@@ -1547,7 +1546,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
if (!ln2->locale_translation) return -1;
trans2 = ln2->locale_translation;
- return (strcmp(trans1, trans2));
+ return strcmp(trans1, trans2);
}
const char *
@@ -1558,11 +1557,12 @@ _intl_charset_upper_get(const char *charset)
i = 0;
while (charset_predefined_pairs[i].locale_key)
{
- if (!strcmp(charset_predefined_pairs[i].locale_key, charset))
- {
- return charset_predefined_pairs[i].locale_translation;
- }
- i++;
+ if (!strcmp(charset_predefined_pairs[i].locale_key, charset))
+ {
+ return charset_predefined_pairs[i].locale_translation;
+ }
+ i++;
}
return NULL;
}
+
diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c
index 58baabba2..f748ab235 100644
--- a/src/modules/conf_intl/e_mod_main.c
+++ b/src/modules/conf_intl/e_mod_main.c
@@ -14,11 +14,11 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
- e_configure_registry_category_add("language", 70, _("Language"), NULL,
+ e_configure_registry_category_add("language", 70, _("Language"), NULL,
"preferences-desktop-locale");
- e_configure_registry_item_add("language/language_settings", 10,
- _("Language Settings"), NULL,
- "preferences-desktop-locale",
+ e_configure_registry_item_add("language/language_settings", 10,
+ _("Language Settings"), NULL,
+ "preferences-desktop-locale",
e_int_config_intl);
e_configure_registry_item_add("language/input_method_settings", 20,
_("Input Method Settings"), NULL,
@@ -34,8 +34,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "language/input_method_settings")))
- e_object_del(E_OBJECT(cfd));
- while ((cfd = e_config_dialog_get("E", "language/language_settings")))
+ e_object_del(E_OBJECT(cfd));
+ while ((cfd = e_config_dialog_get("E", "language/language_settings")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("language/input_method_settings");
e_configure_registry_item_del("language/language_settings");
@@ -49,3 +49,4 @@ e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}
+