applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't break if ~/.gnome2/xrdb doesn't exist, and add .cvsignore

Browse source
This commit is contained in:
Ross Burton 2003-05-02 14:22:32 +00:00
parent dace5bb4a7
commit 0db3796eee
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,11 @@
2003-05-02 Ross Burton <ross@burtonini.com>
* gnome-settings-xrdb.c (scan_for_files):
If ~/.gnome2/xrdb doesn't exist, don't stop.
* xrdb/.cvsignore:
Added.
2003-05-02 Ross Burton <ross@burtonini.com> 2003-05-02 Ross Burton <ross@burtonini.com>
* xrdb/Makefile.am (xrdbdir): * xrdb/Makefile.am (xrdbdir):

3
gnome-settings-daemon/gnome-settings-xrdb.c
View file

@ -198,6 +198,7 @@ scan_for_files (GError **error)
home_dir = g_get_home_dir (); home_dir = g_get_home_dir ();
if (home_dir) { if (home_dir) {
char *user_ad = g_build_filename (home_dir, USER_AD_DIR, NULL); char *user_ad = g_build_filename (home_dir, USER_AD_DIR, NULL);
if (g_file_test (user_ad, G_FILE_TEST_IS_DIR)) {
user_list = scan_ad_directory (user_ad, error); user_list = scan_ad_directory (user_ad, error);
if (*error) { if (*error) {
g_slist_foreach (system_list, (GFunc)g_free, NULL); g_slist_foreach (system_list, (GFunc)g_free, NULL);
@ -205,6 +206,8 @@ scan_for_files (GError **error)
g_free (user_ad); g_free (user_ad);
return NULL; return NULL;
} }
}
g_free (user_ad);
} else { } else {
g_warning (_("Cannot determine user's home directory")); g_warning (_("Cannot determine user's home directory"));
} }

2
gnome-settings-daemon/xrdb/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in