From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 21 Aug 2008 19:37:04 +0000 (+0000)
Subject: (x_delete_display): Don't call XrmDestroyDatabase on GTK+.
X-Git-Tag: emacs-pretest-23.0.90~3370
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f59f2e77a03242188076872e8e7ef7f4851e57c;p=emacs.git

(x_delete_display): Don't call XrmDestroyDatabase on GTK+.
---

diff --git a/src/xterm.c b/src/xterm.c
index a32f4e1a397..63d86bf6cba 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10514,7 +10514,8 @@ x_delete_display (dpyinfo)
 	  tail->next = tail->next->next;
     }
 
-#ifndef USE_X_TOOLKIT   /* I'm told Xt does this itself.  */
+  /* Xt and GTK do this themselves.  */
+#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #ifndef AIX		/* On AIX, XCloseDisplay calls this.  */
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif