[mutter] pointer: Update the button count after repicking

[Jasper St. Pierre <jstpierre src gnome org>]

commit 8d9653dece35df7530d0e6be0b35f4ba932fa4e8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu May 15 13:56:53 2014 -0400

    pointer: Update the button count after repicking
    
    The default focus interface uses the button count to determine
    whether we should update the pointer focused surface. When releasing
    an implicit grab, we need to send the button release events to the
    implicitly grabbed surface, so we can't reset the focus surface too
    soon. We already explicitly set the focus at the end of implicit
    grabs, so counting the buttons after is perfectly fine.

 src/wayland/meta-wayland-pointer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index f68c29c..31ae17b 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -300,10 +300,10 @@ void
 meta_wayland_pointer_update (MetaWaylandPointer *pointer,
                              const ClutterEvent *event)
 {
-  pointer->button_count = count_buttons (event);
-
   repick_for_event (pointer, event);
 
+  pointer->button_count = count_buttons (event);
+
   if (pointer->cursor_tracker)
     {
       ClutterPoint pos;