--- src/xrdb.c +++ src/xrdb.c 2007-05-15 18:01:41.439517668 +0200 @@ -54,6 +54,9 @@ Boston, MA 02110-1301, USA. */ #include #include #include +#ifdef USE_X_TOOLKIT +#include +#endif #ifdef HAVE_PWD_H #include #endif @@ -609,6 +612,15 @@ x_load_resources (display, xrm_string, m XrmPutLineResource (&rdb, line); #endif /* not USE_MOTIF */ +#ifdef USE_X_TOOLKIT + if ((db = XtScreenDatabase(DefaultScreenOfDisplay (display)))) + { + XrmCombineDatabase (rdb, &db, FALSE); + rdb = db; + } + else + { +#endif /* not USE_X_TOOLKIT */ user_database = get_user_db (display); @@ -651,6 +663,10 @@ x_load_resources (display, xrm_string, m XrmMergeDatabases (db, &rdb); } +#ifdef USE_X_TOOLKIT + } /* (db != XtScreenDatabase()) */ +#endif /* not USE_X_TOOLKIT */ + return rdb; }