summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStafford Mitchell Horne <shorne@gmail.com>2007-01-27 05:52:17 +0000
committerStafford Mitchell Horne <shorne@gmail.com>2007-01-27 05:52:17 +0000
commit691bda6ed7a05291f71bd88a9193e86f173d27de (patch)
tree0b4bd4a29fa8d157d049a635e8111e00917dec37
parentae453dc42aa4beeaf46418dd28ea7d4fa38e4532 (diff)
IMC updates
* Add cleanups which were conflicting * Update imc binaries * Update command line tool for new fields SVN revision: 28131
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh6
-rw-r--r--configure.in2
-rw-r--r--data/input_methods/scim.imcbin211 -> 246 bytes
-rw-r--r--data/input_methods/uim.imcbin210 -> 244 bytes
-rw-r--r--src/bin/e_imc_main.c58
-rw-r--r--src/bin/e_int_config_imc.c14
-rw-r--r--src/bin/e_intl.h12
8 files changed, 40 insertions, 54 deletions
diff --git a/Makefile.am b/Makefile.am
index 518533c8b..331687e14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
8 8
9bin_SCRIPTS = enlightenment-config 9bin_SCRIPTS = enlightenment-config
10 10
11EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \ 11EXTRA_DIST = mkinstalldirs config.rpath config.rpath mkinstalldirs mkinstalldirs config.rpath mkinstalldirs config.rpath config.rpath mkinstalldirs config.rpath README AUTHORS COPYING COPYING-PLAIN \
12 enlightenment.spec.in enlightenment.spec \ 12 enlightenment.spec.in enlightenment.spec \
13 debian/changelog \ 13 debian/changelog \
14 debian/changelog.in \ 14 debian/changelog.in \
diff --git a/autogen.sh b/autogen.sh
index 43cef3338..f58a5ac86 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,11 +6,15 @@ rm -f aclocal.m4 ltmain.sh
6touch README 6touch README
7touch ABOUT-NLS 7touch ABOUT-NLS
8 8
9echo "Running autopoint..." ; autopoint -f || exit 1 9#echo "Running autopoint..." ; autopoint -f || exit 1
10echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 10echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
11echo "Running autoconf..." ; autoconf || exit 1 11echo "Running autoconf..." ; autoconf || exit 1
12echo "Running autoheader..." ; autoheader || exit 1 12echo "Running autoheader..." ; autoheader || exit 1
13echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 13echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
14echo "Running gettextize..." ; gettextize -f --no-changelog
15# hack - gettextize is interactive and demands input from a user. "screw it".
16#sleep 20
17#kill %1
14echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 18echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
15 19
16if [ -z "$NOCONFIGURE" ]; then 20if [ -z "$NOCONFIGURE" ]; then
diff --git a/configure.in b/configure.in
index 112d0b302..f819dcbdc 100644
--- a/configure.in
+++ b/configure.in
@@ -146,7 +146,7 @@ ALL_LINGUAS="bg de eo ja ru hu sl it fr"
146AC_SUBST(ALL_LINGUAS) 146AC_SUBST(ALL_LINGUAS)
147 147
148AM_GNU_GETTEXT([external]) 148AM_GNU_GETTEXT([external])
149AM_GNU_GETTEXT_VERSION([0.12.1]) 149AM_GNU_GETTEXT_VERSION([0.14.6])
150if test "x$LIBINTL" = "x"; then 150if test "x$LIBINTL" = "x"; then
151 LIBINTL="$INTLLIBS" 151 LIBINTL="$INTLLIBS"
152fi 152fi
diff --git a/data/input_methods/scim.imc b/data/input_methods/scim.imc
index c092d283a..4af421da9 100644
--- a/data/input_methods/scim.imc
+++ b/data/input_methods/scim.imc
Binary files differ
diff --git a/data/input_methods/uim.imc b/data/input_methods/uim.imc
index aac18340b..40e392209 100644
--- a/data/input_methods/uim.imc
+++ b/data/input_methods/uim.imc
Binary files differ
diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c
index 67ffe4d9b..c7854054d 100644
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@@ -18,11 +18,10 @@ main(int argc, char **argv)
18 E_Input_Method_Config *write_imc = NULL; 18 E_Input_Method_Config *write_imc = NULL;
19 E_Input_Method_Config *read_imc = NULL; 19 E_Input_Method_Config *read_imc = NULL;
20 20
21 int del_name = 0;
22 int del_exe = 0;
23 char *file = NULL; 21 char *file = NULL;
24 char *set_name = NULL; 22 char *set_name = NULL;
25 char *set_exe = NULL; 23 char *set_exe = NULL;
24 char *set_setup = NULL;
26 char *set_gtk_im_module = NULL; 25 char *set_gtk_im_module = NULL;
27 char *set_qt_im_module = NULL; 26 char *set_qt_im_module = NULL;
28 char *set_xmodifiers = NULL; 27 char *set_xmodifiers = NULL;
@@ -45,6 +44,13 @@ main(int argc, char **argv)
45 valid_args++; 44 valid_args++;
46 write_ops++; 45 write_ops++;
47 } 46 }
47 else if ((!strcmp(argv[i], "-set-setup")) && (i < (argc - 1)))
48 {
49 i++;
50 set_setup = argv[i];
51 valid_args++;
52 write_ops++;
53 }
48 else if ((!strcmp(argv[i], "-set-gtk-im-module")) && (i < (argc - 1))) 54 else if ((!strcmp(argv[i], "-set-gtk-im-module")) && (i < (argc - 1)))
49 { 55 {
50 i++; 56 i++;
@@ -66,25 +72,6 @@ main(int argc, char **argv)
66 valid_args++; 72 valid_args++;
67 write_ops++; 73 write_ops++;
68 } 74 }
69 else if ((!strcmp(argv[i], "-del-all")))
70 {
71 del_name = 1;
72 del_exe = 1;
73 valid_args++;
74 write_ops++;
75 }
76 else if ((!strcmp(argv[i], "-del-name")))
77 {
78 del_name = 1;
79 valid_args++;
80 write_ops++;
81 }
82 else if ((!strcmp(argv[i], "-del-exe")))
83 {
84 del_exe = 1;
85 valid_args++;
86 write_ops++;
87 }
88 else if ((!strcmp(argv[i], "-h")) || 75 else if ((!strcmp(argv[i], "-h")) ||
89 (!strcmp(argv[i], "-help")) || 76 (!strcmp(argv[i], "-help")) ||
90 (!strcmp(argv[i], "--h")) || 77 (!strcmp(argv[i], "--h")) ||
@@ -144,23 +131,16 @@ main(int argc, char **argv)
144 { 131 {
145 int write_ok; 132 int write_ok;
146 133
147 write_imc = malloc(sizeof(E_Input_Method_Config)); 134 write_imc = calloc(sizeof(E_Input_Method_Config), 1);
148 write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION; 135 write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
149 if (read_imc == NULL) 136 if (read_imc != NULL)
150 {
151 write_imc->e_im_name = NULL;
152 write_imc->gtk_im_module = NULL;
153 write_imc->qt_im_module = NULL;
154 write_imc->xmodifiers = NULL;
155 write_imc->e_im_exec = NULL;
156 }
157 else
158 { 137 {
159 write_imc->e_im_name = read_imc->e_im_name; 138 write_imc->e_im_name = read_imc->e_im_name;
160 write_imc->gtk_im_module = read_imc->gtk_im_module; 139 write_imc->gtk_im_module = read_imc->gtk_im_module;
161 write_imc->qt_im_module = read_imc->qt_im_module; 140 write_imc->qt_im_module = read_imc->qt_im_module;
162 write_imc->xmodifiers = read_imc->xmodifiers; 141 write_imc->xmodifiers = read_imc->xmodifiers;
163 write_imc->e_im_exec = read_imc->e_im_exec; 142 write_imc->e_im_exec = read_imc->e_im_exec;
143 write_imc->e_im_setup_exec = read_imc->e_im_setup_exec;
164 } 144 }
165 145
166 if (set_name != NULL) 146 if (set_name != NULL)
@@ -173,7 +153,9 @@ main(int argc, char **argv)
173 write_imc->xmodifiers = set_xmodifiers; 153 write_imc->xmodifiers = set_xmodifiers;
174 if (set_exe != NULL) 154 if (set_exe != NULL)
175 write_imc->e_im_exec = set_exe; 155 write_imc->e_im_exec = set_exe;
176 156 if (set_setup != NULL)
157 write_imc->e_im_setup_exec = set_setup;
158
177 159
178 /* write imc to file */ 160 /* write imc to file */
179 write_ok = e_intl_input_method_config_write (ef, write_imc); 161 write_ok = e_intl_input_method_config_write (ef, write_imc);
@@ -186,6 +168,7 @@ main(int argc, char **argv)
186 printf("Config Version:\t%d\n", read_imc->version); 168 printf("Config Version:\t%d\n", read_imc->version);
187 printf("Config Name:\t%s\n", read_imc->e_im_name); 169 printf("Config Name:\t%s\n", read_imc->e_im_name);
188 printf("Command Line:\t%s\n", read_imc->e_im_exec); 170 printf("Command Line:\t%s\n", read_imc->e_im_exec);
171 printf("Setup Line:\t%s\n", read_imc->e_im_setup_exec);
189 printf("gtk_im_module:\t%s\n", read_imc->gtk_im_module); 172 printf("gtk_im_module:\t%s\n", read_imc->gtk_im_module);
190 printf("qt_im_module:\t%s\n", read_imc->qt_im_module); 173 printf("qt_im_module:\t%s\n", read_imc->qt_im_module);
191 printf("xmodifiers:\t%s\n", read_imc->xmodifiers); 174 printf("xmodifiers:\t%s\n", read_imc->xmodifiers);
@@ -206,11 +189,10 @@ _e_help(void)
206 printf("OPTIONS:\n" 189 printf("OPTIONS:\n"
207 " -set-name NAME Set the application name\n" 190 " -set-name NAME Set the application name\n"
208 " -set-exe EXE Set the application execute line\n" 191 " -set-exe EXE Set the application execute line\n"
209 " -set-gtk-im-module Set the gtk_im_module env var\n" 192 " -set-setup EXE Set the setup application execute line\n"
210 " -set-qt-im-module Set the qt_im_module env var\n" 193 " -set-gtk-im-module Set the gtk_im_module env var\n"
211 " -set-xmodifiers Set the xmodifiers env var\n" 194 " -set-qt-im-module Set the qt_im_module env var\n"
212 " -del-name Delete the application name\n" 195 " -set-xmodifiers Set the xmodifiers env var\n"
213 " -del-exe Delete the application execute line\n" 196 " -list List Contents of Input Method Config file\n"
214 " -list List Contents of Input Method Config file\n"
215 ); 197 );
216} 198}
diff --git a/src/bin/e_int_config_imc.c b/src/bin/e_int_config_imc.c
index 9765329c2..0cfdaf8ee 100644
--- a/src/bin/e_int_config_imc.c
+++ b/src/bin/e_int_config_imc.c
@@ -267,7 +267,7 @@ _e_imc_setup_cb(void *data, void *data2)
267 if (imc && imc->e_im_setup_exec) 267 if (imc && imc->e_im_setup_exec)
268 { 268 {
269 Ecore_Exe *exe; 269 Ecore_Exe *exe;
270 char *cmd; 270 const char *cmd;
271 271
272 cmd = imc->e_im_setup_exec; 272 cmd = imc->e_im_setup_exec;
273 273
@@ -725,12 +725,12 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
725 imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION; 725 imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
726 726
727 /* TODO: need to only add if the string is not empty */ 727 /* TODO: need to only add if the string is not empty */
728 imc_update->e_im_name = (char *) evas_stringshare_add(cfdata->imc.e_im_name); 728 imc_update->e_im_name = evas_stringshare_add(cfdata->imc.e_im_name);
729 imc_update->e_im_exec = (char *) evas_stringshare_add(cfdata->imc.e_im_exec); 729 imc_update->e_im_exec = evas_stringshare_add(cfdata->imc.e_im_exec);
730 imc_update->e_im_setup_exec = (char *) evas_stringshare_add(cfdata->imc.e_im_setup_exec); 730 imc_update->e_im_setup_exec = evas_stringshare_add(cfdata->imc.e_im_setup_exec);
731 imc_update->gtk_im_module = (char *) evas_stringshare_add(cfdata->imc.gtk_im_module); 731 imc_update->gtk_im_module = evas_stringshare_add(cfdata->imc.gtk_im_module);
732 imc_update->qt_im_module = (char *) evas_stringshare_add(cfdata->imc.qt_im_module); 732 imc_update->qt_im_module = evas_stringshare_add(cfdata->imc.qt_im_module);
733 imc_update->xmodifiers = (char *) evas_stringshare_add(cfdata->imc.xmodifiers); 733 imc_update->xmodifiers = evas_stringshare_add(cfdata->imc.xmodifiers);
734 734
735 /* look for changes to this file and remove them */ 735 /* look for changes to this file and remove them */
736 imc_update_old = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current); 736 imc_update_old = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current);
diff --git a/src/bin/e_intl.h b/src/bin/e_intl.h
index aa71f67a5..9f3389d4d 100644
--- a/src/bin/e_intl.h
+++ b/src/bin/e_intl.h
@@ -39,12 +39,12 @@ struct _E_Language_Pack
39struct _E_Input_Method_Config 39struct _E_Input_Method_Config
40{ 40{
41 int version; 41 int version;
42 char *e_im_name; 42 const char *e_im_name;
43 char *gtk_im_module; 43 const char *gtk_im_module;
44 char *qt_im_module; 44 const char *qt_im_module;
45 char *xmodifiers; 45 const char *xmodifiers;
46 char *e_im_exec; 46 const char *e_im_exec;
47 char *e_im_setup_exec; 47 const char *e_im_setup_exec;
48}; 48};
49 49
50struct _E_Locale_Parts 50struct _E_Locale_Parts