Merge lp:~muktupavels/compiz/gwd-meta-frame-type-from-string-removed into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: stop using meta_frame_type_from_string.

Use custom meta_frame_type_from_string - it will be removed in Metacity 3.20. Also by using custom function we can avoid checks to ensure that we have valid MetaFrameType.

Use custom meta_frame_type_from_string - it will be removed in Metacity 3.20. Also by using custom function we can avoid checks to ensure that we have valid MetaFrameType.

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-07 18:43:27 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-06-07 18:43:27 +0000
@@ -46,6 +46,21 @@
 
 G_DEFINE_TYPE (GWDThemeMetacity, gwd_theme_metacity, GWD_TYPE_THEME)
 
+static MetaFrameType
+frame_type_from_string (const gchar *str)
+{
+    if (strcmp ("dialog", str) == 0)
+        return META_FRAME_TYPE_DIALOG;
+    else if (strcmp ("modal_dialog", str) == 0)
+        return META_FRAME_TYPE_MODAL_DIALOG;
+    else if (strcmp ("utility", str) == 0)
+        return META_FRAME_TYPE_UTILITY;
+    else if (strcmp ("menu", str) == 0)
+        return META_FRAME_TYPE_MENU;
+
+    return META_FRAME_TYPE_NORMAL;
+}
+
 static void
 initialize_button_layout (MetaButtonLayout *layout)
 {
@@ -769,9 +784,7 @@
         return;
     }
 
-    frame_type = meta_frame_type_from_string (decor->frame->type);
-    if (!(frame_type < META_FRAME_TYPE_LAST))
-        frame_type = META_FRAME_TYPE_NORMAL;
+    frame_type = frame_type_from_string (decor->frame->type);
 
     get_decoration_geometry (GWD_THEME_METACITY (theme), decor, &flags,
                              &fgeom, frame_type);
@@ -975,10 +988,7 @@
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-    frame_type = meta_frame_type_from_string (decor->frame->type);
-
-    if (frame_type == META_FRAME_TYPE_LAST)
-        frame_type = META_FRAME_TYPE_NORMAL;
+    frame_type = frame_type_from_string (decor->frame->type);
 
     get_decoration_geometry (metacity, decor, &flags, &fgeom, frame_type);
 
@@ -1165,15 +1175,11 @@
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
     GdkScreen *screen = gtk_widget_get_screen (frame->style_window_rgba);
     MetaStyleInfo *style_info = meta_theme_create_style_info (screen, NULL);
-    MetaFrameType frame_type;
+    MetaFrameType frame_type = frame_type_from_string (frame->type);
     MetaFrameBorders borders;
 
     gwd_decor_frame_ref (frame);
 
-    frame_type = meta_frame_type_from_string (frame->type);
-    if (!(frame_type < META_FRAME_TYPE_LAST))
-        frame_type = META_FRAME_TYPE_NORMAL;
-
     meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
                                   frame->text_height, 0, &borders);
 
@@ -1217,7 +1223,7 @@
     MetaFrameFlags flags;
 
     get_decoration_geometry (metacity, decor, &flags, &fgeom,
-                             meta_frame_type_from_string (decor->frame->type));
+                             frame_type_from_string (decor->frame->type));
 
     width += fgeom.borders.total.right + fgeom.borders.total.left;
     height += fgeom.borders.total.top  + fgeom.borders.total.bottom;
@@ -1345,9 +1351,7 @@
         return FALSE;
     }
 
-    frame_type = meta_frame_type_from_string (decor->frame->type);
-    if (!(frame_type < META_FRAME_TYPE_LAST))
-        frame_type = META_FRAME_TYPE_NORMAL;
+    frame_type = frame_type_from_string (decor->frame->type);
 
     get_decoration_geometry (metacity, decor, &flags, &fgeom, frame_type);
 
@@ -1407,13 +1411,10 @@
                                               PangoFontDescription *titlebar_font)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-    MetaFrameType type = meta_frame_type_from_string (frame->type);
+    MetaFrameType type = frame_type_from_string (frame->type);
     MetaFrameFlags flags = 0xc33; /* FIXME */
     MetaFrameStyle *style;
 
-    if (type == META_FRAME_TYPE_LAST)
-        type = META_FRAME_TYPE_NORMAL;
-
     style = meta_theme_get_frame_style (metacity->theme, type, flags);
 
     meta_frame_style_apply_scale (style, titlebar_font);