In R5, certain structures of the Display structure are private, so we

should use the appropriate routines to extract the information.  These
routines have existed since at least X11R3...

1 files changed, 5 insertions, 4 deletions

diff --git a/zwgc/X_driver.c b/zwgc/X_driver.c
index a7a78f1..96aa2c1 100644
--- a/zwgc/X_driver.c
+++ b/zwgc/X_driver.c
@@ -247,7 +247,7 @@ int open_display_and_load_resources(pargc, argv)
      char **argv;
 {
     XrmDatabase temp_db1, temp_db2, temp_db3;
-    char *filename, *res;
+    char *filename, *res, *xdef;
     extern char *getenv();
 
     /* Initialize X resource manager: */
@@ -274,8 +274,9 @@ int open_display_and_load_resources(pargc, argv)
     /*
      * Get resources from the just opened display:
      */
-    if (dpy->xdefaults != NULL)
-	temp_db2 = XrmGetStringDatabase(dpy->xdefaults);
+    xdef = XResourceManagerString(dpy);
+    if (xdef)
+	temp_db2 = XrmGetStringDatabase(xdef);
     else
 	temp_db2 = NULL;
 
@@ -324,7 +325,7 @@ Display *display;
 {
     extern void finalize_zephyr();
 
-    ERROR2("X IO error on display '%s'--exiting\n", display->display_name);
+    ERROR2("X IO error on display '%s'--exiting\n", DisplayString(display));
     finalize_zephyr();
     exit(1);
 }