Enlightenment CVS committal
Author : stffrdhrn
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_intl.c e_intl.h e_ipc_handlers.h
Log Message:
fix memory problem with input_method listing
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_config.c 15 Oct 2005 10:49:54 -0000 1.118
+++ e_config.c 16 Oct 2005 02:40:13 -0000 1.119
@@ -488,7 +488,7 @@
e_config->menu_eap_name_show = 1;
e_config->menu_eap_generic_show = 1;
e_config->menu_eap_comment_show = 0;
- e_config->input_method = NULL;
+ e_config->input_method = NULL;
{
E_Config_Module *em;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_intl.c 15 Oct 2005 10:49:54 -0000 1.44
+++ e_intl.c 16 Oct 2005 02:40:13 -0000 1.45
@@ -222,7 +222,7 @@
e_util_env_set("GTK_IM_MODULE", _e_intl_orig_gtk_im_module);
e_util_env_set("QT_IM_MODULE", _e_intl_orig_qt_im_module);
e_util_env_set("XMODIFIERS", _e_intl_orig_xmodifiers);
- e_util_env_set("GTK_IM_MODULE_FILE", _e_intl_orig_gtk_im_module_file);
+ e_util_env_set("GTk_IM_MODULE_FILE", _e_intl_orig_gtk_im_module_file);
}
if (method)
@@ -236,7 +236,7 @@
e_util_env_set("GTK_IM_MODULE", elp->gtk_im_module);
e_util_env_set("QT_IM_MODULE", elp->qt_im_module);
e_util_env_set("XMODIFIERS", elp->xmodifiers);
- e_util_env_set("GTK_IM_MODULE_FILE", elp->gtk_im_module_file);
+ e_util_env_set("GTk_IM_MODULE_FILE", elp->gtk_im_module_file);
if (elp->e_im_exec != NULL)
{
/* FIXME: first check ok exec availability */
@@ -258,7 +258,7 @@
return _e_intl_input_method;
}
-const Evas_List *
+Evas_List *
e_intl_input_method_list(void)
{
Evas_List *im_list;
@@ -270,7 +270,7 @@
for (next = _e_intl_input_methods; next; next = next->next)
{
elp = next->data;
- im_list = evas_list_append(im_list, elp->e_im_name);
+ im_list = evas_list_append(im_list, strdup(elp->e_im_name));
}
return im_list;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_intl.h 15 Oct 2005 10:49:54 -0000 1.4
+++ e_intl.h 16 Oct 2005 02:40:13 -0000 1.5
@@ -35,7 +35,7 @@
/* Setting & Getting Input Method */
EAPI void e_intl_input_method_set(const char *method);
EAPI const char *e_intl_input_method_get(void);
-EAPI const Evas_List *e_intl_input_method_list(void);
+EAPI Evas_List *e_intl_input_method_list(void);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- e_ipc_handlers.h 15 Oct 2005 10:49:54 -0000 1.100
+++ e_ipc_handlers.h 16 Oct 2005 02:40:13 -0000 1.101
@@ -5457,8 +5457,11 @@
#elif (TYPE == E_WM_IN)
GENERIC(HDL);
LIST_DATA();
- ENCODE((Evas_List *)e_intl_input_method_list(), e_ipc_codec_str_list_enc);
+ Evas_List *iml;
+ iml = e_intl_input_method_list();
+ ENCODE(iml, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_IM_LIST_REPLY);
+ FREE_LIST(iml);
END_GENERIC();
#elif (TYPE == E_REMOTE_IN)
#endif
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
