Enlightenment CVS committal
Author : shorne
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_imc_main.c e_int_config_imc.c e_intl.h
Log Message:
IMC updates
* Add cleanups which were conflicting
* Update imc binaries
* Update command line tool for new fields
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_imc_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_imc_main.c 10 Jan 2006 04:23:43 -0000 1.2
+++ e_imc_main.c 27 Jan 2007 05:52:17 -0000 1.3
@@ -18,11 +18,10 @@
E_Input_Method_Config *write_imc = NULL;
E_Input_Method_Config *read_imc = NULL;
- int del_name = 0;
- int del_exe = 0;
char *file = NULL;
char *set_name = NULL;
char *set_exe = NULL;
+ char *set_setup = NULL;
char *set_gtk_im_module = NULL;
char *set_qt_im_module = NULL;
char *set_xmodifiers = NULL;
@@ -45,6 +44,13 @@
valid_args++;
write_ops++;
}
+ else if ((!strcmp(argv[i], "-set-setup")) && (i < (argc - 1)))
+ {
+ i++;
+ set_setup = argv[i];
+ valid_args++;
+ write_ops++;
+ }
else if ((!strcmp(argv[i], "-set-gtk-im-module")) && (i < (argc - 1)))
{
i++;
@@ -66,25 +72,6 @@
valid_args++;
write_ops++;
}
- else if ((!strcmp(argv[i], "-del-all")))
- {
- del_name = 1;
- del_exe = 1;
- valid_args++;
- write_ops++;
- }
- else if ((!strcmp(argv[i], "-del-name")))
- {
- del_name = 1;
- valid_args++;
- write_ops++;
- }
- else if ((!strcmp(argv[i], "-del-exe")))
- {
- del_exe = 1;
- valid_args++;
- write_ops++;
- }
else if ((!strcmp(argv[i], "-h")) ||
(!strcmp(argv[i], "-help")) ||
(!strcmp(argv[i], "--h")) ||
@@ -144,23 +131,16 @@
{
int write_ok;
- write_imc = malloc(sizeof(E_Input_Method_Config));
+ write_imc = calloc(sizeof(E_Input_Method_Config), 1);
write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
- if (read_imc == NULL)
- {
- write_imc->e_im_name = NULL;
- write_imc->gtk_im_module = NULL;
- write_imc->qt_im_module = NULL;
- write_imc->xmodifiers = NULL;
- write_imc->e_im_exec = NULL;
- }
- else
+ if (read_imc != NULL)
{
write_imc->e_im_name = read_imc->e_im_name;
write_imc->gtk_im_module = read_imc->gtk_im_module;
write_imc->qt_im_module = read_imc->qt_im_module;
write_imc->xmodifiers = read_imc->xmodifiers;
write_imc->e_im_exec = read_imc->e_im_exec;
+ write_imc->e_im_setup_exec = read_imc->e_im_setup_exec;
}
if (set_name != NULL)
@@ -173,7 +153,9 @@
write_imc->xmodifiers = set_xmodifiers;
if (set_exe != NULL)
write_imc->e_im_exec = set_exe;
-
+ if (set_setup != NULL)
+ write_imc->e_im_setup_exec = set_setup;
+
/* write imc to file */
write_ok = e_intl_input_method_config_write (ef, write_imc);
@@ -186,6 +168,7 @@
printf("Config Version:\t%d\n", read_imc->version);
printf("Config Name:\t%s\n", read_imc->e_im_name);
printf("Command Line:\t%s\n", read_imc->e_im_exec);
+ printf("Setup Line:\t%s\n", read_imc->e_im_setup_exec);
printf("gtk_im_module:\t%s\n", read_imc->gtk_im_module);
printf("qt_im_module:\t%s\n", read_imc->qt_im_module);
printf("xmodifiers:\t%s\n", read_imc->xmodifiers);
@@ -206,11 +189,10 @@
printf("OPTIONS:\n"
" -set-name NAME Set the application name\n"
" -set-exe EXE Set the application execute line\n"
- " -set-gtk-im-module Set the gtk_im_module env var\n"
- " -set-qt-im-module Set the qt_im_module env var\n"
- " -set-xmodifiers Set the xmodifiers env var\n"
- " -del-name Delete the application name\n"
- " -del-exe Delete the application execute line\n"
- " -list List Contents of Input Method Config
file\n"
+ " -set-setup EXE Set the setup application execute
line\n"
+ " -set-gtk-im-module Set the gtk_im_module env var\n"
+ " -set-qt-im-module Set the qt_im_module env var\n"
+ " -set-xmodifiers Set the xmodifiers env var\n"
+ " -list List Contents of Input Method Config
file\n"
);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_imc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_config_imc.c 27 Jan 2007 05:30:33 -0000 1.11
+++ e_int_config_imc.c 27 Jan 2007 05:52:17 -0000 1.12
@@ -267,7 +267,7 @@
if (imc && imc->e_im_setup_exec)
{
Ecore_Exe *exe;
- char *cmd;
+ const char *cmd;
cmd = imc->e_im_setup_exec;
@@ -725,12 +725,12 @@
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 = (char *)
evas_stringshare_add(cfdata->imc.e_im_name);
- imc_update->e_im_exec = (char *)
evas_stringshare_add(cfdata->imc.e_im_exec);
- imc_update->e_im_setup_exec = (char *)
evas_stringshare_add(cfdata->imc.e_im_setup_exec);
- imc_update->gtk_im_module = (char *)
evas_stringshare_add(cfdata->imc.gtk_im_module);
- imc_update->qt_im_module = (char *)
evas_stringshare_add(cfdata->imc.qt_im_module);
- imc_update->xmodifiers = (char *)
evas_stringshare_add(cfdata->imc.xmodifiers);
+ imc_update->e_im_name = evas_stringshare_add(cfdata->imc.e_im_name);
+ imc_update->e_im_exec = evas_stringshare_add(cfdata->imc.e_im_exec);
+ imc_update->e_im_setup_exec =
evas_stringshare_add(cfdata->imc.e_im_setup_exec);
+ imc_update->gtk_im_module =
evas_stringshare_add(cfdata->imc.gtk_im_module);
+ imc_update->qt_im_module =
evas_stringshare_add(cfdata->imc.qt_im_module);
+ imc_update->xmodifiers = evas_stringshare_add(cfdata->imc.xmodifiers);
/* look for changes to this file and remove them */
imc_update_old = evas_hash_find(cfdata->imc_change_map,
cfdata->imc_current);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_intl.h 27 Jan 2007 05:30:33 -0000 1.18
+++ e_intl.h 27 Jan 2007 05:52:17 -0000 1.19
@@ -39,12 +39,12 @@
struct _E_Input_Method_Config
{
int version;
- char *e_im_name;
- char *gtk_im_module;
- char *qt_im_module;
- char *xmodifiers;
- char *e_im_exec;
- char *e_im_setup_exec;
+ const char *e_im_name;
+ const char *gtk_im_module;
+ const char *qt_im_module;
+ const char *xmodifiers;
+ const char *e_im_exec;
+ const char *e_im_setup_exec;
};
struct _E_Locale_Parts
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
