bug-buddy r2658 - in trunk: . gnome-breakpad

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Sep  1 13:01:13 2008
New Revision: 2658
URL: http://svn.gnome.org/viewvc/bug-buddy?rev=2658&view=rev

Log:
2008-09-01  Cosimo Cecchi  <cosimoc gnome org>

	* configure.in:
	* gnome-breakpad/gnome-breakpad.cc:
	Reverted latest commit as it throws out a runtime warning.
	Added a comment with reference to a GTK+ bug.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gnome-breakpad/gnome-breakpad.cc

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Sep  1 13:01:13 2008
@@ -118,7 +118,7 @@
 AM_CONDITIONAL(BREAKPAD_SOLARIS, test x$solaris = xyes)
 AM_CONDITIONAL(BREAKPAD_LINUX, test x$linux = xyes)
 
-GDK_REQUIRED="gdk-x11-2.0 >= 2.9"
+GDK_REQUIRED="x11 gdk-x11-2.0 >= 2.9"
 PKG_CHECK_MODULES(GNOME_BREAKPAD,
 [
 	$GDK_REQUIRED

Modified: trunk/gnome-breakpad/gnome-breakpad.cc
==============================================================================
--- trunk/gnome-breakpad/gnome-breakpad.cc	(original)
+++ trunk/gnome-breakpad/gnome-breakpad.cc	Mon Sep  1 13:01:13 2008
@@ -20,6 +20,7 @@
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <X11/Xlib.h>
 
 #include <config.h>
 
@@ -180,7 +181,11 @@
         /* Make sure we release grabs */
         gdk_pointer_ungrab(GDK_CURRENT_TIME);
         gdk_keyboard_ungrab(GDK_CURRENT_TIME);
-	gdk_x11_ungrab_server ();
+
+        /* TODO: can we replace this with gdk_x11_ungrab_server ()?
+         * see http://bugzilla.gnome.org/show_bug.cgi?id=550135.
+         */
+	XUngrabServer (GDK_DISPLAY ());
 
         gdk_flush();