[Xfce4-commits] [xfce/xfwm4] 01/01: Revert "Experiment with button events."

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 0151f6b2ddffe2f817bfff650b7dc8eb8e2137d6
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Dec 28 23:18:23 2014 +0100

    Revert "Experiment with button events."
    
    Bug: 11167
    
    This reverts commit 7c87af29befcc91ba2e890dd822a4a69cb3263d9.
---
 src/cycle.c  |    5 -----
 src/tabwin.c |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/cycle.c b/src/cycle.c
index d949e1a..93819d4 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -424,7 +424,6 @@ clientCycle (Client * c, XKeyEvent * ev)
     GList *client_list, *selected;
     gboolean g1, g2;
     int key, modifier;
-    Client *c2;
 
     g_return_if_fail (c != NULL);
     TRACE ("entering clientCycle");
@@ -471,7 +470,6 @@ clientCycle (Client * c, XKeyEvent * ev)
     g1 = myScreenGrabKeyboard (screen_info, ev->time);
     g2 = myScreenGrabPointer (screen_info, TRUE, LeaveWindowMask, None, ev->time);
 
-
     if (!g1 || !g2)
     {
         TRACE ("grab failed in clientCycle");
@@ -494,9 +492,6 @@ clientCycle (Client * c, XKeyEvent * ev)
     passdata.tabwin = tabwinCreate (&client_list, selected, screen_info->params->cycle_workspaces);
     eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
 
-    c2 = myScreenGetClientFromWindow (screen_info, GDK_WINDOW_XID (gtk_widget_get_window ( passdata.tabwin->tabwin_list->data)), SEARCH_FRAME);
-    clientSetFocus (screen_info, c2, ev->time, NO_FOCUS_FLAG);
-
     gtk_main ();
     eventFilterPop (display_info->xfilter);
     TRACE ("leaving cycle loop");
diff --git a/src/tabwin.c b/src/tabwin.c
index aee6635..56d2d43 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -805,8 +805,8 @@ tabwinCreate (GList **client_list, GList *selected, gboolean display_workspace)
     ScreenInfo *screen_info;
     Client *c;
     Tabwin *tabwin;
-    int num_monitors, i;
     TabwinWidget *win;
+    int num_monitors, i;
 
     g_return_val_if_fail (selected, NULL);
     g_return_val_if_fail (client_list, NULL);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.