add user.lua

diff --git a/lua/Makefile.am b/lua/Makefile.am
index 39ecdac..9f2b9b3 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -20,6 +20,7 @@
 
 lua_script_DATA = \
        base.lua \
+       user.lua \
        $(NULL)
 
 lua_scriptdir = $(pkgdatadir)
@@ -83,4 +84,5 @@ lua_ext_console_LDADD = \
 
 EXTRA_DIST = \
        base.lua \
+       user.lua \
        $(NULL)

diff --git a/lua/user.lua b/lua/user.lua
new file mode 100644 (file)
index 0000000..9e09224
--- /dev/null
+++ b/lua/user.lua
@@ -0,0 +1,3 @@
+-- encoding: UTF-8
+
+-- Note: the changes in user.lua script may take effect only after ime restart.
\ No newline at end of file

diff --git a/src/PYExtEditor.cc b/src/PYExtEditor.cc
index dfbe064..8178fb1 100644 (file)
--- a/src/PYExtEditor.cc
+++ b/src/PYExtEditor.cc
@@ -57,6 +57,11 @@ ExtEditor::ExtEditor (PinyinProperties & props, Config & config)
         loadLuaScript (PKGDATADIR G_DIR_SEPARATOR_S "base.lua");
 
     g_free(path);
+
+    path = g_build_filename (g_get_user_config_dir (),
+                             "ibus", "libpinyin", "user.lua", NULL);
+    loadLuaScript(path);
+    g_free(path);
 }
 
 int

diff --git a/src/PYLibPinyin.cc b/src/PYLibPinyin.cc
index f1854ba..3187706 100644 (file)
--- a/src/PYLibPinyin.cc
+++ b/src/PYLibPinyin.cc
@@ -58,7 +58,7 @@ LibPinyinBackEnd::initPinyinContext (Config *config)
 {
     pinyin_context_t * context = NULL;
 
-    gchar * userdir = g_build_filename (g_get_home_dir(), ".cache",
+    gchar * userdir = g_build_filename (g_get_user_cache_dir (),
                                         "ibus", "libpinyin", NULL);
     int retval = g_mkdir_with_parents (userdir, 0700);
     if (retval) {
@@ -104,7 +104,7 @@ LibPinyinBackEnd::initChewingContext (Config *config)
 {
     pinyin_context_t * context = NULL;
 
-    gchar * userdir = g_build_filename (g_get_home_dir(), ".cache",
+    gchar * userdir = g_build_filename (g_get_user_cache_dir (),
                                         "ibus", "libbopomofo", NULL);
     int retval = g_mkdir_with_parents (userdir, 0700);
     if (retval) {