brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Fix build

Browse Source 
The proper function name is "meta_window_recalc_features"
This commit is contained in:
Jasper St. Pierre 2014-02-01 18:58:58 -05:00
parent f7097e6f66
commit 14db280fab
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/window.c
View File

@ -229,7 +229,7 @@ prefs_changed_callback (MetaPreference pref,
window->type == META_WINDOW_MODAL_DIALOG) window->type == META_WINDOW_MODAL_DIALOG)
{ {
window->attached = meta_window_should_attach_to_parent (window); window->attached = meta_window_should_attach_to_parent (window);
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
meta_window_queue (window, META_QUEUE_MOVE_RESIZE); meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
} }
} }
@ -1112,7 +1112,7 @@ meta_window_new_shared (MetaDisplay *display,
window->attached = meta_window_should_attach_to_parent (window); window->attached = meta_window_should_attach_to_parent (window);
if (window->attached) if (window->attached)
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
if (window->decorated) if (window->decorated)
meta_window_ensure_frame (window); meta_window_ensure_frame (window);
@ -3524,7 +3524,7 @@ meta_window_maximize_internal (MetaWindow *window,
if (maximize_horizontally || maximize_vertically) if (maximize_horizontally || maximize_vertically)
window->force_save_user_rect = FALSE; window->force_save_user_rect = FALSE;
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
set_net_wm_state (window); set_net_wm_state (window);
g_object_freeze_notify (G_OBJECT (window)); g_object_freeze_notify (G_OBJECT (window));
@ -3914,7 +3914,7 @@ meta_window_unmaximize_internal (MetaWindow *window,
window->maximized_vertically = window->maximized_vertically =
window->maximized_vertically && !unmaximize_vertically; window->maximized_vertically && !unmaximize_vertically;
/* recalc_window_features() will eventually clear the cached frame /* recalc_features() will eventually clear the cached frame
* extents, but we need the correct frame extents in the code below, * extents, but we need the correct frame extents in the code below,
* so invalidate the old frame extents manually up front. * so invalidate the old frame extents manually up front.
*/ */
@ -4008,7 +4008,7 @@ meta_window_unmaximize_internal (MetaWindow *window,
window->display->grab_anchor_window_pos = window->user_rect; window->display->grab_anchor_window_pos = window->user_rect;
} }
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
set_net_wm_state (window); set_net_wm_state (window);
} }
@ -4112,7 +4112,7 @@ meta_window_make_fullscreen_internal (MetaWindow *window)
meta_window_raise (window); meta_window_raise (window);
meta_stack_thaw (window->screen->stack); meta_stack_thaw (window->screen->stack);
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
set_net_wm_state (window); set_net_wm_state (window);
/* For the auto-minimize feature, if we fail to get focus */ /* For the auto-minimize feature, if we fail to get focus */
@ -4158,7 +4158,7 @@ meta_window_unmake_fullscreen (MetaWindow *window)
/* Need to update window->has_resize_func before we move_resize() /* Need to update window->has_resize_func before we move_resize()
*/ */
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
set_net_wm_state (window); set_net_wm_state (window);
meta_window_move_resize (window, meta_window_move_resize (window,
@ -4832,7 +4832,7 @@ meta_window_update_monitor (MetaWindow *window)
/* If we're changing monitors, we need to update the has_maximize_func flag, /* If we're changing monitors, we need to update the has_maximize_func flag,
* as the working area has changed. */ * as the working area has changed. */
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
} }
} }
@ -7537,7 +7537,7 @@ meta_window_type_changed (MetaWindow *window)
GObject *object = G_OBJECT (window); GObject *object = G_OBJECT (window);
window->attached = meta_window_should_attach_to_parent (window); window->attached = meta_window_should_attach_to_parent (window);
meta_window_recalc_window_features (window); meta_window_recalc_features (window);
if (!window->override_redirect) if (!window->override_redirect)
set_net_wm_state (window); set_net_wm_state (window);
@ -7852,10 +7852,9 @@ meta_window_recalc_features (MetaWindow *window)
g_object_notify (G_OBJECT (window), "skip-taskbar"); g_object_notify (G_OBJECT (window), "skip-taskbar");
/* FIXME: /* FIXME:
* Lame workaround for recalc_window_features * Lame workaround for recalc_features being used overzealously.
* being used overzealously. The fix is to * The fix is to only recalc_features when something has
* only recalc_window_features when something * actually changed.
* has actually changed.
*/ */
if (window->constructing || if (window->constructing ||
old_has_close_func != window->has_close_func || old_has_close_func != window->has_close_func ||