Put all files in $(HOME)/.ibus

diff --git a/bus/registry.c b/bus/registry.c
index e931ad4324c29aa795cfcff4dee5f1207c76d457..1820123f68cf132e74e2bfe0e34df5004e620eda 100644 (file)
--- a/bus/registry.c
+++ b/bus/registry.c
@@ -154,10 +154,7 @@ bus_registry_load (BusRegistry *registry)
 
     g_free (dirname);
 
-    homedir = (gchar *) g_getenv ("HOME");
-    if (!homedir)
-        homedir = (gchar *) g_get_home_dir ();
-    dirname = g_build_filename (homedir, ".ibus", "component", NULL);
+    dirname = g_build_filename (g_get_home_dir (), ".ibus", "component", NULL);
 
     path = ibus_observed_path_new (dirname, TRUE);
     registry->observed_paths = g_list_append (registry->observed_paths, path);
@@ -187,7 +184,7 @@ bus_registry_load_cache (BusRegistry *registry)
     XMLNode *node;
     GList *p;
 
-    filename = g_build_filename (g_get_user_cache_dir (), "ibus", "registry.xml", NULL);
+    filename = g_build_filename (g_get_home_dir (), ".ibus", "bus", "registry.xml", NULL);
     node = ibus_xml_parse_file (filename);
     g_free (filename);
 
@@ -262,7 +259,7 @@ bus_registry_save_cache (BusRegistry *registry)
     GList *p;
     FILE *pf;
 
-    cachedir = g_build_filename (g_get_user_cache_dir (), "ibus", NULL);
+    cachedir = g_build_filename (g_get_home_dir (), ".ibus", "bus", NULL);
     filename = g_build_filename (cachedir, "registry.xml", NULL);
     g_mkdir_with_parents (cachedir, 0775);
     pf = g_fopen (filename, "w");

diff --git a/src/ibusshare.c b/src/ibusshare.c
index 95f2d5f46ccc2bf9f729aebdc7a68d260c951c76..e75f1a6c9ae4c29faa75a230b79bfe33c87a3ab4 100644 (file)
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -166,11 +166,11 @@ ibus_get_socket_path (void)
                              ibus_get_local_machine_id (),
                              hostname,
                              displaynumber);
-        path = g_build_path (G_DIR_SEPARATOR_S,
-                             g_get_user_config_dir (),
-                             "ibus" G_DIR_SEPARATOR_S "bus",
-                             p,
-                             NULL);
+        path = g_build_filename (g_get_home_dir (),
+                                 ".ibus",
+                                 "bus",
+                                 p,
+                                 NULL);
         g_free (p);
         g_free (display);
     }