From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 6 Jul 2012 15:02:29 +0000 (+0200)
Subject: * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 is defined.
X-Git-Tag: emacs-24.2.90~1199^2~175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bdd091e45b38fbbf4fc1fe8ab6b0674f7194d28d;p=emacs.git

* gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 is defined.

Fixes: debbugs:11768
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cfc4a00512f..e80d4f322e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3
+	is defined (Bug#11768).
+
 2012-07-06  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Fix marker debugging code.
@@ -122,7 +127,7 @@
 	(xg_event_is_for_scrollbar): Use Gdk Device functions for HAVE_GTK3.
 	(is_box_type): New function (Bug#11768).
 	(xg_tool_item_stale_p): Call is_box_type.
-	(xg_initialize): Get settings by calling gtk_settings_get_for_screen
+	(xg_initialize): Get settings by calli<g gtk_settings_get_for_screen
 	with default display (Bug#11768).
 
 2012-07-05  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 82c7d643551..f4551b4b9f7 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3730,7 +3730,7 @@ xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event)
 #ifdef HAVE_GTK3
       GdkDevice *gdev = gdk_device_manager_get_client_pointer
         (gdk_display_get_device_manager (gdpy));
-      gdk_device_get_window_at_position (gdev, NULL, NULL);
+      gwin = gdk_device_get_window_at_position (gdev, NULL, NULL);
 #else
       gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL);
 #endif