From f71315eb1e52d40fd3aa291f05ac09aaf6bbd8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 13 Jan 2015 18:09:20 +0100 Subject: [PATCH] frames: Fix window-type/frame-type mix-up Commit 7e66d2a484e4b2 killed off META_CORE_GET_FRAME_TYPE, but got the replacement wrong - MetaWindowType is an enum like MetaFrameType, but the two are not interchangeable. https://bugzilla.gnome.org/show_bug.cgi?id=742841 --- src/ui/frames.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/frames.c b/src/ui/frames.c index b277b63f2..990854411 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -424,7 +424,7 @@ meta_ui_frame_calc_geometry (MetaUIFrame *frame, MetaWindowX11Private *priv = window_x11->priv; flags = meta_frame_get_flags (frame->meta_window->frame); - type = meta_window_get_window_type (frame->meta_window); + type = meta_window_get_frame_type (frame->meta_window); meta_ui_frame_ensure_layout (frame, type); @@ -585,7 +585,7 @@ meta_ui_frame_get_borders (MetaUIFrame *frame, MetaFrameType type; flags = meta_frame_get_flags (frame->meta_window->frame); - type = meta_window_get_window_type (frame->meta_window); + type = meta_window_get_frame_type (frame->meta_window); g_return_if_fail (type < META_FRAME_TYPE_LAST); @@ -1407,7 +1407,7 @@ get_visible_frame_border_region (MetaUIFrame *frame) MetaRectangle frame_rect = frame->meta_window->rect; flags = meta_frame_get_flags (frame->meta_window->frame); - type = meta_window_get_window_type (frame->meta_window); + type = meta_window_get_frame_type (frame->meta_window); meta_theme_get_frame_borders (meta_theme_get_default (), frame->style_info, type, frame->text_height, flags, @@ -1577,7 +1577,7 @@ meta_ui_frame_paint (MetaUIFrame *frame, mini_icon = frame->meta_window->mini_icon; flags = meta_frame_get_flags (frame->meta_window->frame); - type = meta_window_get_window_type (frame->meta_window); + type = meta_window_get_frame_type (frame->meta_window); meta_ui_frame_ensure_layout (frame, type); @@ -1753,7 +1753,7 @@ get_control (MetaUIFrame *frame, int x, int y) return META_FRAME_CONTROL_APPMENU; flags = meta_frame_get_flags (frame->meta_window->frame); - type = meta_window_get_window_type (frame->meta_window); + type = meta_window_get_frame_type (frame->meta_window); has_north_resize = (type != META_FRAME_TYPE_ATTACHED); has_vert = (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE) != 0;