- Add some default input method configurations use 'enlightenment_imc' to look

  at and edit these files
- Change the input method path, intl means something else

SVN revision: 17789

diff --git a/configure.in b/configure.in
index 344da5e..f0c3b84 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -298,6 +298,7 @@ data/fonts/Makefile
 data/images/Makefile
 data/init/Makefile
 data/init/images/Makefile
+data/input_methods/Makefile
 data/themes/Makefile
 data/themes/images/Makefile
 data/other/Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
index 8c8db84..6b1e137 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = fonts images init themes other xsession
+SUBDIRS = fonts images init themes other xsession input_methods
 

diff --git a/data/input_methods/Makefile.am b/data/input_methods/Makefile.am
new file mode 100644 (file)
index 0000000..153b2d5
--- /dev/null
+++ b/data/input_methods/Makefile.am
@@ -0,0 +1,7 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/enlightenment/data/input_methods
+files_DATA = \
+scim.imc \
+uim.imc
+          
+EXTRA_DIST = $(files_DATA)

diff --git a/data/input_methods/scim.imc b/data/input_methods/scim.imc
new file mode 100644 (file)
index 0000000..cca6b8f
Binary files /dev/null and b/data/input_methods/scim.imc differ

diff --git a/data/input_methods/uim.imc b/data/input_methods/uim.imc
new file mode 100644 (file)
index 0000000..aaf1d55
Binary files /dev/null and b/data/input_methods/uim.imc differ

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 15887bd..e2f528c 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -681,7 +681,8 @@ _e_main_dirs_init(void)
        "%s/.e/e/applications/trash",
        "%s/.e/e/modules",
        "%s/.e/e/config",
-       "%s/.e/e/locale"
+       "%s/.e/e/locale",
+       "%s/.e/e/input_methods"
      };
    int i;
    
@@ -921,8 +922,8 @@ _e_main_path_init(void)
        e_error_message_show("Cannot allocate path for path_input_methods\n");
        return 0;
      }
-   e_path_default_path_append(path_input_methods, "~/.e/e/intl");
-   snprintf(buf, sizeof(buf), "%s/enlightenment/intl", e_prefix_lib_get());
+   e_path_default_path_append(path_input_methods, "~/.e/e/input_methods");
+   snprintf(buf, sizeof(buf), "%s/data/input_methods", e_prefix_data_get());
    e_path_default_path_append(path_input_methods, buf);
    e_path_user_path_set(path_input_methods, &(e_config->path_append_input_methods));