diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2004-10-28 17:37:50 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2004-10-28 17:37:50 +0000 |
| commit | 8eac60b61649118fa39346adf117844935a5e623 (patch) | |
| tree | a72d27811eec7a38458ac66850325408431691c6 /gnome-settings-daemon | |
| parent | 7d643f1f53cbdcaf1e9f19d927b0a1a9182a4b95 (diff) | |
| download | gnome-control-center-8eac60b61649118fa39346adf117844935a5e623.tar.gz | |
Don't nuke .Xdefaults when restarting g-s-d. Patch from Nick
2004-10-28 Kjartan Maraas <kmaraas@gnome.org>
* gnome-settings-xrdb.c: (append_xresource_file), (apply_settings):
Don't nuke .Xdefaults when restarting g-s-d. Patch from Nick
Diffstat (limited to 'gnome-settings-daemon')
| -rw-r--r-- | gnome-settings-daemon/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-settings-daemon/gnome-settings-xrdb.c | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 9d427a191..975704494 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,9 @@ +2004-10-28 Kjartan Maraas <kmaraas@gnome.org> + + * gnome-settings-xrdb.c: (append_xresource_file), (apply_settings): + Don't nuke .Xdefaults when restarting g-s-d. Patch from Nick + Welch <mack at incise org>. Closes bug #127050. + 2004-10-21 Sebastien Bacher <seb128@debian.org> * gnome-settings-default-editor.c: (vfs_change_cb): diff --git a/gnome-settings-daemon/gnome-settings-xrdb.c b/gnome-settings-daemon/gnome-settings-xrdb.c index aace108a9..736ee1d21 100644 --- a/gnome-settings-daemon/gnome-settings-xrdb.c +++ b/gnome-settings-daemon/gnome-settings-xrdb.c @@ -35,6 +35,7 @@ #define GENERAL_AD SYSTEM_AD_DIR "/General.ad" #define USER_AD_DIR ".gnome2/xrdb" #define USER_X_RESOURCES ".Xresources" +#define USER_X_DEFAULTS ".Xdefaults" #define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme" @@ -245,10 +246,10 @@ scan_for_files (GError **error) } /** - * Append the users .Xresources file if it exists + * Append an X resources file, such as .Xresources, or .Xdefaults */ static void -append_xresources (GString *string, GError **error) +append_xresource_file (const char * filename, GString *string, GError **error) { const char* home_path; char *xresources; @@ -261,7 +262,7 @@ append_xresources (GString *string, GError **error) return; } - xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); + xresources = g_build_filename (home_path, filename, NULL); if (g_file_test (xresources, G_FILE_TEST_EXISTS)) { append_file (xresources, string, error); if (*error) { @@ -305,7 +306,9 @@ apply_settings (GtkStyle *style) g_slist_foreach (list, (GFunc)g_free, NULL); g_slist_free (list); - append_xresources (string, &error); + append_xresource_file (USER_X_RESOURCES, string, &error); + append_xresource_file (USER_X_DEFAULTS, string, &error); + if (error) { g_warning (error->message); g_error_free (error); |