From e1fa17399fc137a508f195aa6976b5f32189de96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 17 Jun 2009 10:01:52 +0200 Subject: [PATCH] Put configuration data in XDG_CONFIG_DIRS (GNOME bug 494007) --- libempathy-gtk/empathy-account-widget-irc.c | 2 +- libempathy-gtk/empathy-geometry.c | 2 +- libempathy/empathy-chatroom-manager.c | 2 +- libempathy/empathy-contact-groups.c | 4 ++-- libempathy/empathy-status-presets.c | 4 ++-- src/empathy-main-window.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index 688a3e0e..c0699b23 100644 --- 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 2bfa14e3..14e794c4 100644 --- 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 1ce7a6e5..940b5622 100644 --- 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 a9040f2d..22d81d05 100644 --- 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 135212cc..1fa991b0 100644 --- 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 0e71229c..a600fd42 100644 --- 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); -- 2.39.2