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

formatting 

SVN revision: 72102
This commit is contained in:
Mike Blumenkrantz 2012-06-14 06:55:01 +00:00
parent 6a88a855d9
commit 90304246b4
4 changed files with 840 additions and 834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

490
src/modules/conf_intl/e_int_config_imc.c
View File

@ -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:<br>"
"<br>%s<br>"),
cmd);
}
}
if (!exe)
{
e_util_dialog_show(_("Run Error"),
_("Enlightenment was unable to fork a child process:<br>"
"<br>%s<br>"),
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:<br>"
"<br>%s<br>"), cmd);
}
if (!exe)
{
e_util_dialog_show(_("Run Error"),
_("Enlightenment was unable to fork a child process:<br>"
"<br>%s<br>"), 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;
}

317
src/modules/conf_intl/e_int_config_imc_import.c
View File

@ -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.<br><br>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.<br><br>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<br>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<br>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);
}
}

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

File diff suppressed because it is too large Load Diff

13
src/modules/conf_intl/e_mod_main.c
View File

@ -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;
}