[gtk+/touch-for-3.4-2: 18/44] tooltips: Use the source device instead of gtk-touchscreen-mode

[Matthias Clasen <matthiasc src gnome org>]

commit c569438e53dae52404aa43756e2465453cb69643
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Nov 26 20:28:53 2011 +0100

    tooltips: Use the source device instead of gtk-touchscreen-mode
    
    This makes tooltips behavior dynamic based on the interacting device.

 gtk/gtktooltip.c |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 19fb0c5..84c80e6 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1535,22 +1535,33 @@ _gtk_tooltip_hide (GtkWidget *widget)
 }
 
 static gboolean
-tooltips_enabled (GdkWindow *window)
+tooltips_enabled (GdkEvent *event)
 {
+  GdkDevice *source_device;
+  GdkInputSource source;
+  GdkWindow *window;
   gboolean enabled;
-  gboolean touchscreen;
   GdkScreen *screen;
   GtkSettings *settings;
 
+  window = event->any.window;
+  source_device = gdk_event_get_source_device (event);
+
+  if (!source_device)
+    return FALSE;
+
+  source = gdk_device_get_source (source_device);
   screen = gdk_window_get_screen (window);
   settings = gtk_settings_get_for_screen (screen);
 
   g_object_get (settings,
-		"gtk-touchscreen-mode", &touchscreen,
 		"gtk-enable-tooltips", &enabled,
 		NULL);
 
-  return (!touchscreen && enabled);
+  if (enabled && source != GDK_SOURCE_TOUCHSCREEN)
+    return TRUE;
+
+  return FALSE;
 }
 
 void
@@ -1562,7 +1573,7 @@ _gtk_tooltip_handle_event (GdkEvent *event)
   GdkDisplay *display;
   GtkTooltip *current_tooltip;
 
-  if (!tooltips_enabled (event->any.window))
+  if (!tooltips_enabled (event))
     return;
 
   /* Returns coordinates relative to has_tooltip_widget's allocation. */