Put configuration data in XDG_CONFIG_DIRS (GNOME bug 494007)

diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 688a3e0e699d03e7d90886b8d3055473a2e8e02d..c0699b23a70fec490a0a9e78853d556d2b6e1d2c 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -432,7 +432,7 @@ empathy_account_widget_irc_new (EmpathyAccount *account)
   settings = g_slice_new0 (EmpathyAccountWidgetIrc);
   settings->account = g_object_ref (account);
 
-  dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+  dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
   g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
   user_file_with_path = g_build_filename (dir, IRC_NETWORKS_FILENAME, NULL);
   g_free (dir);

diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 2bfa14e336c379c816e9d0e327989580601f0384..14e794c44b2760fe7d3b9c7d3131b6c814f83d6e 100644 (file)
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -49,7 +49,7 @@ geometry_get_filename (void)
        gchar *dir;
        gchar *filename;
 
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
        if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
                DEBUG ("Creating directory:'%s'", dir);
                g_mkdir_with_parents (dir, GEOMETRY_DIR_CREATE_MODE);

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 1ce7a6e5d1477c4daa0f006b9d10fd8de957bbad..940b5622014f1f0e2aa5287acfecacb20191fa42 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -409,7 +409,7 @@ empathy_chatroom_manager_constructor (GType type,
       /* Set the default file path */
       gchar *dir;
 
-      dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+      dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
       if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
         g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
 

diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
index a9040f2df6e8f52d8b0cb1bbe8a22b61a03caba4..22d81d05178d7f6692f184646566a341c239bcdf 100644 (file)
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -67,7 +67,7 @@ empathy_contact_groups_get_all (void)
                groups = NULL;
        }
 
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
        file_with_path = g_build_filename (dir, CONTACT_GROUPS_XML_FILENAME, NULL);
        g_free (dir);
 
@@ -190,7 +190,7 @@ contact_groups_file_save (void)
        gchar      *dir;
        gchar      *file;
 
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
        g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
        file = g_build_filename (dir, CONTACT_GROUPS_XML_FILENAME, NULL);
        g_free (dir);

diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 135212cc5a50e452fee3218f4f803dff98f7d633..1fa991b0b4e30ea728a7184fcd24ce74136bc38b 100644 (file)
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -176,7 +176,7 @@ empathy_status_presets_get_all (void)
                presets = NULL;
        }
 
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
        g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
        file_with_path = g_build_filename (dir, STATUS_PRESETS_XML_FILENAME, NULL);
        g_free (dir);
@@ -203,7 +203,7 @@ status_presets_file_save (void)
                count[i] = 0;
        }
 
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
        g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
        file = g_build_filename (dir, STATUS_PRESETS_XML_FILENAME, NULL);
        g_free (dir);

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 0e71229c5076a4ab218b1849bc318f801fa13ad6..a600fd429147619edf024abfaeab50302bf073df 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -611,7 +611,7 @@ main_window_accels_load (void)
 {
        gchar *filename;
 
-       filename = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, ACCELS_FILENAME, NULL);
+       filename = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, ACCELS_FILENAME, NULL);
        if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
                DEBUG ("Loading from:'%s'", filename);
                gtk_accel_map_load (filename);
@@ -626,7 +626,7 @@ main_window_accels_save (void)
        gchar *dir;
        gchar *file_with_path;
 
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
        g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
        file_with_path = g_build_filename (dir, ACCELS_FILENAME, NULL);
        g_free (dir);