From 0db3796eee169c3cfd1d916ecc8869d0dd960c36 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 2 May 2003 14:22:32 +0000 Subject: [PATCH] Don't break if ~/.gnome2/xrdb doesn't exist, and add .cvsignore --- gnome-settings-daemon/ChangeLog | 8 ++++++++ gnome-settings-daemon/gnome-settings-xrdb.c | 15 +++++++++------ gnome-settings-daemon/xrdb/.cvsignore | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 gnome-settings-daemon/xrdb/.cvsignore diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index e67e0e272..908181426 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,11 @@ +2003-05-02 Ross Burton + + * gnome-settings-xrdb.c (scan_for_files): + If ~/.gnome2/xrdb doesn't exist, don't stop. + + * xrdb/.cvsignore: + Added. + 2003-05-02 Ross Burton * xrdb/Makefile.am (xrdbdir): diff --git a/gnome-settings-daemon/gnome-settings-xrdb.c b/gnome-settings-daemon/gnome-settings-xrdb.c index 7840ae8e4..de8eaf2d1 100644 --- a/gnome-settings-daemon/gnome-settings-xrdb.c +++ b/gnome-settings-daemon/gnome-settings-xrdb.c @@ -198,13 +198,16 @@ scan_for_files (GError **error) home_dir = g_get_home_dir (); if (home_dir) { char *user_ad = g_build_filename (home_dir, USER_AD_DIR, NULL); - user_list = scan_ad_directory (user_ad, error); - if (*error) { - g_slist_foreach (system_list, (GFunc)g_free, NULL); - g_slist_free (system_list); - g_free (user_ad); - return NULL; + if (g_file_test (user_ad, G_FILE_TEST_IS_DIR)) { + user_list = scan_ad_directory (user_ad, error); + if (*error) { + g_slist_foreach (system_list, (GFunc)g_free, NULL); + g_slist_free (system_list); + g_free (user_ad); + return NULL; + } } + g_free (user_ad); } else { g_warning (_("Cannot determine user's home directory")); } diff --git a/gnome-settings-daemon/xrdb/.cvsignore b/gnome-settings-daemon/xrdb/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/gnome-settings-daemon/xrdb/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in