diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/display.c | 5 | ||||
| -rw-r--r-- | src/core/events.c | 4 | ||||
| -rw-r--r-- | src/core/stack.c | 6 | ||||
| -rw-r--r-- | src/core/window.c | 8 |
4 files changed, 9 insertions, 14 deletions
diff --git a/src/core/display.c b/src/core/display.c index e7afd63a3..a7bf0cd58 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -607,12 +607,11 @@ meta_display_open (void) meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names)); XInternAtoms (display->xdisplay, (char **)atom_names, G_N_ELEMENTS (atom_names), False, atoms); - { - int i = 0; + + i = 0; #define item(x) display->atom_##x = atoms[i++]; #include <x11/atomnames.h> #undef item - } display->prop_hooks = NULL; meta_display_init_window_prop_hooks (display); diff --git a/src/core/events.c b/src/core/events.c index 4c6d33438..25e07194b 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -206,8 +206,8 @@ meta_display_handle_event (MetaDisplay *display, if (meta_is_wayland_compositor () && event->type == CLUTTER_MOTION) { - MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL); - meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y); + meta_cursor_tracker_update_position (meta_cursor_tracker_get_for_screen (NULL), + event->motion.x, event->motion.y); display->monitor_cache_invalidated = TRUE; } diff --git a/src/core/stack.c b/src/core/stack.c index 87dade1d8..90655ab85 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -1088,11 +1088,7 @@ stack_sync_to_xserver (MetaStack *stack) if (w->hidden) { if (w->client_type == META_WINDOW_CLIENT_TYPE_X11) - { - guint64 stack_id = top_level_window; - - g_array_append_val (x11_hidden_stack_ids, stack_id); - } + g_array_append_val (x11_hidden_stack_ids, top_level_window); continue; } diff --git a/src/core/window.c b/src/core/window.c index eeeb2e098..19d5c48a1 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -4312,8 +4312,8 @@ set_workspace_state (MetaWindow *window, GList *l; for (l = window->screen->workspaces; l != NULL; l = l->next) { - MetaWorkspace *workspace = l->data; - meta_workspace_remove_window (workspace, window); + MetaWorkspace *ws = l->data; + meta_workspace_remove_window (ws, window); } } @@ -4327,8 +4327,8 @@ set_workspace_state (MetaWindow *window, GList *l; for (l = window->screen->workspaces; l != NULL; l = l->next) { - MetaWorkspace *workspace = l->data; - meta_workspace_add_window (workspace, window); + MetaWorkspace *ws = l->data; + meta_workspace_add_window (ws, window); } } |