[Emacs-diffs] /srv/bzr/emacs/trunk r108912: * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 is defined.

[Jan D.]

------------------------------------------------------------
revno: 108912
fixes bug: http://debbugs.gnu.org/11768
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-06 17:02:29 +0200
message:
  * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 is 
defined.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-06 14:16:54 +0000
+++ b/src/ChangeLog     2012-07-06 15:02:29 +0000
@@ -1,3 +1,8 @@
+2012-07-06  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3
+       is defined (Bug#11768).
+
 2012-07-06  Dmitry Antipov  <address@hidden>
 
        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  <address@hidden>

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-07-05 18:35:48 +0000
+++ b/src/gtkutil.c     2012-07-06 15:02:29 +0000
@@ -3730,7 +3730,7 @@
 #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