Merge lp:~matttbe/gtk/949414 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Matthieu Baerts]

Hello,

This branch includes a patch (from git) to fix this bug LP: #949414 .
I don't know where I've to push this branch because it seems lp:ubuntu/gtk+3.0 is not up to date :-/
But I'm going to propose a debdiff on the bug report too.

Thank you,

Matt

[Sebastien Bacher (seb128)]

Thanks Matthieu, not sure what your "where to push" is about, the merge request location and diff seems fine, the packaging vcs is debian dir only which is easier to handle than full source outdated imports ;-)

review: Approve

[Matthieu Baerts (matttbe)]

Thank you!

> the packaging vcs is debian dir only which is easier to handle than full source outdated imports ;-)
Yes, I understand :)

> not sure what your "where to push" is about, the merge request location and diff seems fine
It's just because I used to modify the content of a branch like "lp:ubuntu/PROGRAM" and I didn't know if I had to change the reviewer (but I guess most people from ubuntu-sponsors team can't push on this branch: lp:~ubuntu-desktop/gtk/ubuntugtk3 ) or to push my modification on a BZR branch linked to "ubuntu/gtk+3-0".

[Sebastien Bacher (seb128)]

> but I guess most people from ubuntu-sponsors team can't push on this branch: lp:~ubuntu-desktop/gtk/ubuntugtk3

they can, the dev teams is a member of the desktop team to let anyone who has upload rights be able to commit as well ;-)

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-16 16:00:24 +0000
+++ debian/changelog	2012-03-20 07:56:21 +0000
@@ -1,3 +1,11 @@
+gtk+3.0 (3.3.18-0ubuntu4) precise; urgency=low
+
+  * debian/patches/git_touchpad_like_mouse.patch:
+    - git patch, a touchpad device should behave like a mouse and not like a
+       touchscreen (lp: #949414) 
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Tue, 20 Mar 2012 07:35:57 +0100
+
 gtk+3.0 (3.3.18-0ubuntu3) precise; urgency=low
 
   * debian/patches/043_ubuntu_menu_proxy.patch:
 
=== added file 'debian/patches/git_touchpad_like_mouse.patch'
--- debian/patches/git_touchpad_like_mouse.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_touchpad_like_mouse.patch	2012-03-20 07:56:21 +0000
@@ -0,0 +1,53 @@
+From bd55519f7e6bb5da2fdf6f5e99bd79213059f81b Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <[e-mail]>
+Date: Tue, 20 Mar 2012 01:04:22 +0000
+Subject: gdk: A TOUCHPAD device behaves like a mouse
+
+and not like a TOUCHSCREEN. So treat it like that.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672009
+---
+diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
+index 72f0a18..4ae08ca 100644
+--- a/gdk/gdkwindow.c
++++ b/gdk/gdkwindow.c
+@@ -9271,7 +9271,6 @@ proxy_pointer_event (GdkDisplay                 *display,
+ 
+   if (pointer_info->need_touch_press_enter &&
+       gdk_device_get_source (pointer_info->last_slave) != GDK_SOURCE_TOUCHSCREEN &&
+-      gdk_device_get_source (pointer_info->last_slave) != GDK_SOURCE_TOUCHPAD &&
+       (source_event->type != GDK_TOUCH_UPDATE ||
+        _gdk_event_get_pointer_emulated (source_event)))
+     {
+@@ -9682,8 +9681,7 @@ proxy_button_event (GdkEvent *source_event,
+        * which synthesized a leave notify event, so synthesize another enter
+        * notify to tell the pointer is on the window.
+        */
+-      if (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN ||
+-          gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHPAD)
++      if (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN)
+         mode = GDK_CROSSING_TOUCH_BEGIN;
+       else
+         mode = GDK_CROSSING_DEVICE_SWITCH;
+@@ -9743,8 +9741,7 @@ proxy_button_event (GdkEvent *source_event,
+                 (type == GDK_TOUCH_END &&
+                  _gdk_event_get_pointer_emulated (source_event))) &&
+                pointer_window == pointer_info->window_under_pointer &&
+-               (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN ||
+-                gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHPAD))
++               gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN)
+         {
+           /* Synthesize a leave notify event
+            * whenever a touch device is released
+@@ -9780,8 +9777,7 @@ proxy_button_event (GdkEvent *source_event,
+       if ((type == GDK_TOUCH_END &&
+            _gdk_event_get_pointer_emulated (source_event)) &&
+            pointer_window == pointer_info->window_under_pointer &&
+-           (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN ||
+-            gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHPAD))
++           gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN)
+         {
+           /* Synthesize a leave notify event
+            * whenever a touch device is released
+--
+cgit v0.9.0.2
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-09 17:06:39 +0000
+++ debian/patches/series	2012-03-20 07:56:21 +0000
@@ -14,3 +14,4 @@
 dont_rename_annotation.patch
 dont_show_numlock_warning.patch
 git_scroll_reset.patch
+git_touchpad_like_mouse.patch