From 7100fa4a9d2e7240c99ba74dc4fa266bc745b94d Mon Sep 17 00:00:00 2001 From: "kyle.yuan%sun.com" Date: Tue, 21 Jan 2003 01:54:07 +0000 Subject: [PATCH] Bug 188156 gtk2 build is broken on Solaris (@embedding\browser\gtk\tests) r=Roland.Mainz@informatik.med.uni-giessen.de, sr=blizzard Sun compiler can't deal with a complicated arg in g_warning() git-svn-id: svn://10.0.0.236/trunk@136707 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/gtk/tests/TestGtkEmbedChild.cpp | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/mozilla/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp b/mozilla/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp index 783fceb8f0c..1c8937c1e34 100644 --- a/mozilla/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp +++ b/mozilla/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp @@ -31,19 +31,20 @@ int error_handler (Display *d, XErrorEvent *e) { if ((e->error_code == BadWindow) || (e->error_code == BadDrawable)) { - GdkWindow *window = gdk_window_lookup (e->resourceid); + XID resourceid = e->resourceid; + GdkWindow *window = gdk_window_lookup (resourceid); if (window) - { - if (!g_dataset_get_data (window, "bonobo-error")) - { - g_dataset_set_data_full (window, "bonobo-error", - g_new (gint, 1), - (GDestroyNotify)g_free); - - g_warning ("Error accessing window %ld", e->resourceid); - } - } + { + if (!g_dataset_get_data (window, "bonobo-error")) + { + g_dataset_set_data_full (window, "bonobo-error", + g_new (gint, 1), + (GDestroyNotify)g_free); + + g_warning ("Error accessing window %ld", resourceid); + } + } return 0; } else