diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
| commit | 1d153c1cf91edce537bc64efb01b5a496b35518e (patch) | |
| tree | de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1 /libempathy-gtk/empathy-account-widget-irc.c | |
| parent | b50b7039d3b52f33df94e5a3526d9f43a51401ad (diff) | |
| parent | 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (diff) | |
| download | gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.gz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.bz2 gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.lz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.xz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.zst gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.zip | |
Merge commit 'upstream/master' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
Diffstat (limited to 'libempathy-gtk/empathy-account-widget-irc.c')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-irc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index 4bca91073..c04f3463d 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -431,7 +431,7 @@ empathy_account_widget_irc_new (EmpathyAccountSettings *account_settings) settings = g_slice_new0 (EmpathyAccountWidgetIrc); settings->settings = g_object_ref (account_settings); - 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); |