From cd4e6fcdeee26eb591e291a33c5047f31edbe41b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 20 Apr 2014 13:05:08 -0400 Subject: [PATCH] display: Remove unused grab variables --- src/core/display-private.h | 1 - src/core/display.c | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/src/core/display-private.h b/src/core/display-private.h index 962281715..74b59894d 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -207,7 +207,6 @@ struct _MetaDisplay gboolean grab_threshold_movement_reached; /* raise_on_click == FALSE. */ MetaResizePopup *grab_resize_popup; GTimeVal grab_last_moveresize_time; - GList* grab_old_window_stacking; MetaEdgeResistanceData *grab_edge_resistance_data; unsigned int grab_last_user_action_was_snap; guint32 grab_timestamp; diff --git a/src/core/display.c b/src/core/display.c index bc6d1fcb6..fd7a49663 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -482,7 +482,6 @@ meta_display_open (void) the_display->focus_serial = 0; the_display->server_focus_window = None; the_display->server_focus_serial = 0; - the_display->grab_old_window_stacking = NULL; the_display->mouse_mode = TRUE; /* Only relevant for mouse or sloppy focus */ the_display->allow_terminal_deactivation = TRUE; /* Only relevant for when a @@ -1023,9 +1022,6 @@ meta_display_close (MetaDisplay *display, g_source_remove (display->focus_timeout_id); display->focus_timeout_id = 0; - if (display->grab_old_window_stacking) - g_list_free (display->grab_old_window_stacking); - /* Stop caring about events */ meta_display_free_events (display); @@ -1931,7 +1927,6 @@ meta_display_begin_grab_op (MetaDisplay *display, display->grab_latest_motion_y = root_y; display->grab_last_moveresize_time.tv_sec = 0; display->grab_last_moveresize_time.tv_usec = 0; - display->grab_old_window_stacking = NULL; #ifdef HAVE_XSYNC display->grab_last_user_action_was_snap = FALSE; #endif @@ -2013,15 +2008,6 @@ meta_display_end_grab_op (MetaDisplay *display, meta_window_raise (display->grab_window); } - if (display->grab_old_window_stacking != NULL) - { - meta_topic (META_DEBUG_WINDOW_OPS, - "Clearing out the old stack position, which was %p.\n", - display->grab_old_window_stacking); - g_list_free (display->grab_old_window_stacking); - display->grab_old_window_stacking = NULL; - } - if (display->grab_have_pointer) { meta_topic (META_DEBUG_WINDOW_OPS,