diff -u xfwm4-4.6.2/src/settings.c xfwm4-4.6.2-modified/src/settings.c --- xfwm4-4.6.2/src/settings.c 2010-05-21 20:02:40.000000000 +0300 +++ xfwm4-4.6.2-modified/src/settings.c 2010-07-17 22:44:32.094863464 +0300 @@ -194,15 +194,20 @@ } static void -loadRcData (ScreenInfo *screen_info, Settings *rc) +loadDefaultRcData (ScreenInfo *screen_info, Settings *rc) { - gchar *homedir; - if (!parseRc ("defaults", PACKAGE_DATADIR, rc)) { g_warning ("Missing defaults file"); exit (1); } +} + +static void +loadUserRcData (ScreenInfo *screen_info, Settings *rc) +{ + gchar *homedir; + homedir = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfce4" G_DIR_SEPARATOR_S "xfwm4", FALSE); @@ -727,9 +732,10 @@ TRACE ("entering loadSettings"); - loadRcData (screen_info, rc); + loadDefaultRcData (screen_info, rc); loadXfconfData (screen_info, rc); loadTheme (screen_info, rc); + loadUserRcData (screen_info, rc); update_grabs (screen_info); loadKeyBindings (screen_info);