Merge lp:~muktupavels/compiz/require-libmetacity-3-20 into lp:compiz/0.9.13

[Alberts Muktupāvels]

gtk-window-decorator: require libmetacity 3.20 or newer.

Require libmetacity 3.20 or newer.

[Marco Trevisan (Treviño) (3v1n0)]

We're after feature freeze, we need an exception to get this landed for yakkety

[Alberts Muktupāvels (muktupavels)]

Yakkety will not have Metacity 3.22 so this can wait...

[Alberts Muktupāvels (muktupavels)]

Can this now be merged?

[Marco Trevisan (Treviño) (3v1n0)]

Ack!

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-05-30 13:28:51 +0000
+++ debian/control	2016-08-31 17:53:28 +0000
@@ -22,7 +22,7 @@
                libglibmm-2.4-dev,
                libgtk-3-dev,
                libice-dev (>= 1:1.0.1), 
-               libmetacity-dev (>= 1:3.16.0),
+               libmetacity-dev (>= 1:3.20.0),
                libpango1.0-dev,
                libpng-dev,
                librsvg2-dev, 
 
=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2016-06-08 18:35:52 +0000
+++ gtk/CMakeLists.txt	2016-08-31 17:53:28 +0000
@@ -25,24 +25,13 @@
         set (CMAKE_REQUIRED_LIBRARIES "")
 
         if (USE_METACITY)
-            pkg_check_modules (LIBMETACITY libmetacity>=3.19.1)
+            pkg_check_modules (LIBMETACITY libmetacity>=3.20.0)
 
             if (LIBMETACITY_FOUND)
-                compiz_set (HAVE_METACITY_3_20_0 1)
-
                 set (METACITY_INCLUDE_DIRS ${LIBMETACITY_INCLUDE_DIRS})
                 set (METACITY_LIBRARIES ${LIBMETACITY_LIBRARIES})
             else (LIBMETACITY_FOUND)
-                pkg_check_modules (LIBMETACITY_PRIVATE libmetacity-private>=3.16.0)
-
-                if (LIBMETACITY_PRIVATE_FOUND)
-                    compiz_set (HAVE_METACITY_3_20_0 0)
-
-                    set (METACITY_INCLUDE_DIRS ${LIBMETACITY_PRIVATE_INCLUDE_DIRS})
-                    set (METACITY_LIBRARIES ${LIBMETACITY_PRIVATE_LIBRARIES})
-                else (LIBMETACITY_PRIVATE_FOUND)
-                    compiz_set (USE_METACITY 0)
-                endif (LIBMETACITY_PRIVATE_FOUND)
+                compiz_set (USE_METACITY 0)
             endif (LIBMETACITY_FOUND)
         endif (USE_METACITY)
 
 
=== modified file 'gtk/config.h.gtk.in'
--- gtk/config.h.gtk.in	2016-06-01 16:08:13 +0000
+++ gtk/config.h.gtk.in	2016-08-31 17:53:28 +0000
@@ -1,7 +1,4 @@
 /* Define to 1 if Metacity support is enabled */
 #cmakedefine USE_METACITY 1
 
-/* Define to 1 if Metacity version >= 3.20.0 */
-#cmakedefine HAVE_METACITY_3_20_0 1
-
 #define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
 
=== modified file 'gtk/window-decorator/gwd-settings-storage.c'
--- gtk/window-decorator/gwd-settings-storage.c	2016-06-09 20:28:14 +0000
+++ gtk/window-decorator/gwd-settings-storage.c	2016-08-31 17:53:28 +0000
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef HAVE_METACITY_3_20_0
+#ifdef USE_METACITY
 #include <libmetacity/meta-theme.h>
 #endif
 
@@ -33,13 +33,7 @@
 
 static const gchar * ORG_COMPIZ_GWD = "org.compiz.gwd";
 static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES = "org.gnome.desktop.wm.preferences";
-
-#ifdef HAVE_METACITY_3_20_0
 static const gchar * ORG_GNOME_METACITY_THEME = "org.gnome.metacity.theme";
-#else
-static const gchar * ORG_GNOME_METACITY = "org.gnome.metacity";
-#endif
-
 static const gchar * ORG_MATE_MARCO_GENERAL = "org.mate.Marco.general";
 
 static const gchar * ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS = "use-tooltips";
@@ -51,12 +45,8 @@
 static const gchar * ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME = "use-metacity-theme";
 static const gchar * ORG_COMPIZ_GWD_KEY_MOUSE_WHEEL_ACTION = "mouse-wheel-action";
 
-#ifdef HAVE_METACITY_3_20_0
 static const gchar * ORG_GNOME_METACITY_THEME_NAME = "name";
 static const gchar * ORG_GNOME_METACITY_THEME_TYPE = "type";
-#else
-static const gchar * ORG_GNOME_METACITY_THEME = "theme";
-#endif
 
 static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR = "action-double-click-titlebar";
 static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR = "action-middle-click-titlebar";
@@ -213,7 +203,6 @@
     if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
         metacity_theme_name = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_THEME);
     } else if (storage->current_desktop == GWD_DESKTOP_GNOME_FLASHBACK && storage->metacity) {
-#ifdef HAVE_METACITY_3_20_0
         metacity_theme_type = g_settings_get_enum (storage->metacity, ORG_GNOME_METACITY_THEME_TYPE);
 
         if (metacity_theme_type == META_THEME_TYPE_GTK) {
@@ -221,9 +210,6 @@
         } else {
             metacity_theme_name = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME_NAME);
         }
-#else
-        metacity_theme_name = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME);
-#endif
     } else if (storage->desktop) {
         metacity_theme_name = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME);
     } else {
@@ -385,14 +371,9 @@
                                      const gchar        *key,
                                      GWDSettingsStorage *storage)
 {
-#ifdef HAVE_METACITY_3_20_0
     if (strcmp (key, ORG_GNOME_METACITY_THEME_NAME) == 0 ||
         strcmp (key, ORG_GNOME_METACITY_THEME_TYPE) == 0)
         update_metacity_theme (storage);
-#else
-    if (strcmp (key, ORG_GNOME_METACITY_THEME) == 0)
-        update_metacity_theme (storage);
-#endif
 }
 
 static void
@@ -423,12 +404,12 @@
     update_button_layout (storage);
 }
 
-#ifdef HAVE_METACITY_3_20_0
 static void
 gtk_theme_name_changed (GtkSettings        *settings,
                         GParamSpec         *pspec,
                         GWDSettingsStorage *storage)
 {
+#ifdef USE_METACITY
     MetaThemeType type;
 
     if (!storage->metacity)
@@ -438,8 +419,8 @@
 
     if (type == META_THEME_TYPE_GTK)
         update_metacity_theme (storage);
+#endif
 }
-#endif
 
 static void
 gwd_settings_storage_constructed (GObject *object)
@@ -573,22 +554,15 @@
         case GWD_DESKTOP_GNOME_FLASHBACK:
             storage->gwd = get_settings_no_abort (ORG_COMPIZ_GWD);
             storage->desktop = get_settings_no_abort (ORG_GNOME_DESKTOP_WM_PREFERENCES);
-
-#ifdef HAVE_METACITY_3_20_0
             storage->metacity = get_settings_no_abort (ORG_GNOME_METACITY_THEME);
-#else
-            storage->metacity = get_settings_no_abort (ORG_GNOME_METACITY);
-#endif
 
             storage->gtk_decoration_layout_id =
                 g_signal_connect (gtk_settings_get_default (), "notify::gtk-decoration-layout",
                                   G_CALLBACK (gtk_decoration_layout_changed), storage);
 
-#ifdef HAVE_METACITY_3_20_0
             storage->gtk_theme_name_id =
                 g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
                                   G_CALLBACK (gtk_theme_name_changed), storage);
-#endif
             break;
 
         case GWD_DESKTOP_MATE:
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 16:06:40 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-08-31 17:53:28 +0000
@@ -27,12 +27,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_METACITY_3_20_0
 #include <libmetacity/meta-theme.h>
-#else
-#include <metacity-private/theme.h>
-#include <metacity-private/theme-parser.h>
-#endif
 
 #include "gtk-window-decorator.h"
 #include "gwd-settings.h"
@@ -40,47 +35,16 @@
 
 struct _GWDThemeMetacity
 {
-    GObject                     parent;
-
-    MetaTheme                  *theme;
-
-#ifndef HAVE_METACITY_3_20_0
-    GHashTable                 *style_variants;
-#endif
-
-    gulong                      button_layout_id;
-    MetaButtonLayout            button_layout;
-
-#ifndef HAVE_METACITY_3_20_0
-    const PangoFontDescription *titlebar_font;
-#endif
+    GObject           parent;
+
+    MetaTheme        *theme;
+
+    gulong            button_layout_id;
+    MetaButtonLayout  button_layout;
 };
 
 G_DEFINE_TYPE (GWDThemeMetacity, gwd_theme_metacity, GWD_TYPE_THEME)
 
-#ifndef HAVE_METACITY_3_20_0
-static MetaStyleInfo *
-get_style_info (GWDThemeMetacity *metacity,
-                decor_t          *decor)
-{
-    const gchar *variant = decor != NULL ? decor->gtk_theme_variant : NULL;
-    const gchar *key = variant != NULL ? variant : "default";
-    MetaStyleInfo *style = g_hash_table_lookup (metacity->style_variants, key);
-
-    if (style == NULL) {
-        GWDTheme *theme = GWD_THEME (metacity);
-        GtkWidget *style_window = gwd_theme_get_style_window (theme);
-        GdkScreen *screen = gtk_widget_get_screen (style_window);
-
-        style = meta_theme_create_style_info (screen, variant);
-
-        g_hash_table_insert (metacity->style_variants, g_strdup (key), style);
-    }
-
-    return style;
-}
-#endif
-
 static MetaFrameType
 frame_type_from_string (const gchar *str)
 {
@@ -96,232 +60,14 @@
     return META_FRAME_TYPE_NORMAL;
 }
 
-#ifndef HAVE_METACITY_3_20_0
-static void
-initialize_button_layout (MetaButtonLayout *layout)
-{
-    gint i;
-
-    for (i = 0; i < MAX_BUTTONS_PER_CORNER; ++i) {
-        layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
-        layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
-        layout->left_buttons_has_spacer[i] = FALSE;
-        layout->right_buttons_has_spacer[i] = FALSE;
-    }
-}
-
-static MetaButtonFunction
-meta_button_function_from_string (const char *str)
-{
-    if (strcmp (str, "menu") == 0)
-        return META_BUTTON_FUNCTION_MENU;
-    else if (strcmp (str, "appmenu") == 0)
-        return META_BUTTON_FUNCTION_APPMENU;
-    else if (strcmp (str, "minimize") == 0)
-        return META_BUTTON_FUNCTION_MINIMIZE;
-    else if (strcmp (str, "maximize") == 0)
-        return META_BUTTON_FUNCTION_MAXIMIZE;
-    else if (strcmp (str, "close") == 0)
-        return META_BUTTON_FUNCTION_CLOSE;
-    else if (strcmp (str, "shade") == 0)
-        return META_BUTTON_FUNCTION_SHADE;
-    else if (strcmp (str, "above") == 0)
-        return META_BUTTON_FUNCTION_ABOVE;
-    else if (strcmp (str, "stick") == 0)
-        return META_BUTTON_FUNCTION_STICK;
-    else if (strcmp (str, "unshade") == 0)
-        return META_BUTTON_FUNCTION_UNSHADE;
-    else if (strcmp (str, "unabove") == 0)
-        return META_BUTTON_FUNCTION_UNABOVE;
-    else if (strcmp (str, "unstick") == 0)
-        return META_BUTTON_FUNCTION_UNSTICK;
-    else
-        return META_BUTTON_FUNCTION_LAST;
-}
-
-static MetaButtonFunction
-meta_button_opposite_function (MetaButtonFunction ofwhat)
-{
-    switch (ofwhat) {
-        case META_BUTTON_FUNCTION_SHADE:
-            return META_BUTTON_FUNCTION_UNSHADE;
-        case META_BUTTON_FUNCTION_UNSHADE:
-            return META_BUTTON_FUNCTION_SHADE;
-
-        case META_BUTTON_FUNCTION_ABOVE:
-            return META_BUTTON_FUNCTION_UNABOVE;
-        case META_BUTTON_FUNCTION_UNABOVE:
-            return META_BUTTON_FUNCTION_ABOVE;
-
-        case META_BUTTON_FUNCTION_STICK:
-            return META_BUTTON_FUNCTION_UNSTICK;
-        case META_BUTTON_FUNCTION_UNSTICK:
-            return META_BUTTON_FUNCTION_STICK;
-
-        default:
-            return META_BUTTON_FUNCTION_LAST;
-    }
-}
-#endif
-
 static void
 update_metacity_button_layout_cb (GWDSettings      *settings,
                                   const gchar      *button_layout,
                                   GWDThemeMetacity *metacity)
 {
-#ifdef HAVE_METACITY_3_20_0
     gboolean invert = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
 
     metacity->button_layout = meta_button_layout_new (button_layout, invert);
-#else
-    MetaButtonLayout new_layout;
-
-    initialize_button_layout (&new_layout);
-
-    if (button_layout != NULL) {
-        gint i;
-        gchar **sides;
-        MetaButtonFunction f;
-
-        sides = g_strsplit (button_layout, ":", 2);
-
-        if (sides[0] != NULL) {
-            gchar **buttons;
-            gint b;
-            gboolean used[META_BUTTON_FUNCTION_LAST];
-
-            for (i = 0; i < META_BUTTON_FUNCTION_LAST; ++i)
-                used[i] = FALSE;
-
-            buttons = g_strsplit (sides[0], ",", -1);
-
-            i = b = 0;
-            while (buttons[b] != NULL) {
-                f = meta_button_function_from_string (buttons[b]);
-
-                if (i > 0 && strcmp ("spacer", buttons[b]) == 0) {
-                    new_layout.left_buttons_has_spacer[i - 1] = TRUE;
-                    f = meta_button_opposite_function (f);
-
-                    if (f != META_BUTTON_FUNCTION_LAST)
-                        new_layout.left_buttons_has_spacer[i - 2] = TRUE;
-                } else {
-                    if (f != META_BUTTON_FUNCTION_LAST && !used[f]) {
-                        used[f] = TRUE;
-                        new_layout.left_buttons[i++] = f;
-
-                        f = meta_button_opposite_function (f);
-
-                        if (f != META_BUTTON_FUNCTION_LAST)
-                            new_layout.left_buttons[i++] = f;
-                    } else {
-                        g_warning ("Ignoring unknown or already-used "
-                                   "button name \"%s\"", buttons[b]);
-                    }
-                }
-
-                ++b;
-            }
-
-            new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
-
-            g_strfreev (buttons);
-
-            if (sides[1] != NULL) {
-                for (i = 0; i < META_BUTTON_FUNCTION_LAST; ++i)
-                    used[i] = FALSE;
-
-                buttons = g_strsplit (sides[1], ",", -1);
-
-                i = b = 0;
-                while (buttons[b] != NULL) {
-                    f = meta_button_function_from_string (buttons[b]);
-
-                    if (i > 0 && strcmp ("spacer", buttons[b]) == 0) {
-                        new_layout.right_buttons_has_spacer[i - 1] = TRUE;
-                        f = meta_button_opposite_function (f);
-
-                        if (f != META_BUTTON_FUNCTION_LAST)
-                            new_layout.right_buttons_has_spacer[i - 2] = TRUE;
-                    } else {
-                        if (f != META_BUTTON_FUNCTION_LAST && !used[f]) {
-                            used[f] = TRUE;
-                            new_layout.right_buttons[i++] = f;
-
-                            f = meta_button_opposite_function (f);
-
-                            if (f != META_BUTTON_FUNCTION_LAST)
-                                new_layout.right_buttons[i++] = f;
-                        } else {
-                            g_warning ("Ignoring unknown or already-used "
-                                       "button name \"%s\"", buttons[b]);
-                        }
-                    }
-
-                    ++b;
-                }
-
-                new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
-
-                g_strfreev (buttons);
-            }
-        }
-
-        g_strfreev (sides);
-
-        /* Invert the button layout for RTL languages */
-        if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
-            MetaButtonLayout rtl_layout;
-            gint j;
-
-            initialize_button_layout (&rtl_layout);
-
-            i = 0;
-            while (new_layout.left_buttons[i] != META_BUTTON_FUNCTION_LAST)
-                ++i;
-
-            for (j = 0; j < i; ++j) {
-                rtl_layout.right_buttons[j] = new_layout.left_buttons[i - j - 1];
-
-                if (j == 0)
-                    rtl_layout.right_buttons_has_spacer[i - 1] = new_layout.left_buttons_has_spacer[i - j - 1];
-                else
-                    rtl_layout.right_buttons_has_spacer[j - 1] = new_layout.left_buttons_has_spacer[i - j - 1];
-            }
-
-            i = 0;
-            while (new_layout.right_buttons[i] != META_BUTTON_FUNCTION_LAST)
-                ++i;
-
-            for (j = 0; j < i; ++j) {
-                rtl_layout.left_buttons[j] = new_layout.right_buttons[i - j - 1];
-
-                if (j == 0)
-                    rtl_layout.left_buttons_has_spacer[i - 1] = new_layout.right_buttons_has_spacer[i - j - 1];
-                else
-                    rtl_layout.left_buttons_has_spacer[j - 1] = new_layout.right_buttons_has_spacer[i - j - 1];
-            }
-
-            new_layout = rtl_layout;
-        }
-    } else {
-        gint i;
-
-        new_layout.left_buttons[0] = META_BUTTON_FUNCTION_MENU;
-
-        for (i = 1; i < MAX_BUTTONS_PER_CORNER; ++i)
-            new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
-
-        new_layout.right_buttons[0] = META_BUTTON_FUNCTION_MINIMIZE;
-        new_layout.right_buttons[1] = META_BUTTON_FUNCTION_MAXIMIZE;
-        new_layout.right_buttons[2] = META_BUTTON_FUNCTION_CLOSE;
-
-        for (i = 3; i < MAX_BUTTONS_PER_CORNER; ++i)
-            new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
-    }
-
-    metacity->button_layout = new_layout;
-#endif
 }
 
 static MetaButtonType
@@ -447,8 +193,7 @@
 }
 
 static Region
-get_top_border_region (const MetaFrameGeometry *fgeom,
-                       gint                     width)
+get_top_border_region (const MetaFrameGeometry *fgeom)
 {
     Region corners_xregion;
     Region border_xregion;
@@ -459,6 +204,7 @@
     gint bottom_right_radius;
     gint w;
     gint i;
+    gint width;
     gint height;
 
     corners_xregion = XCreateRegion ();
@@ -466,7 +212,7 @@
     get_corner_radius (fgeom, &top_left_radius, &top_right_radius,
                        &bottom_left_radius, &bottom_right_radius);
 
-    width = width - fgeom->borders.invisible.left - fgeom->borders.invisible.right;
+    width = fgeom->width - fgeom->borders.invisible.left - fgeom->borders.invisible.right;
     height = fgeom->borders.visible.top;
 
     if (top_left_radius) {
@@ -511,8 +257,7 @@
 }
 
 static Region
-get_bottom_border_region (const MetaFrameGeometry *fgeom,
-                          gint                     width)
+get_bottom_border_region (const MetaFrameGeometry *fgeom)
 {
     Region corners_xregion;
     Region border_xregion;
@@ -523,6 +268,7 @@
     gint bottom_right_radius;
     gint w;
     gint i;
+    gint width;
     gint height;
 
     corners_xregion = XCreateRegion ();
@@ -530,7 +276,7 @@
     get_corner_radius (fgeom, &top_left_radius, &top_right_radius,
                        &bottom_left_radius, &bottom_right_radius);
 
-    width = width - fgeom->borders.invisible.left - fgeom->borders.invisible.right;
+    width = fgeom->width - fgeom->borders.invisible.left - fgeom->borders.invisible.right;
     height = fgeom->borders.visible.bottom;
 
     if (bottom_left_radius) {
@@ -575,8 +321,7 @@
 }
 
 static Region
-get_left_border_region (const MetaFrameGeometry *fgeom,
-                        gint                     height)
+get_left_border_region (const MetaFrameGeometry *fgeom)
 {
     Region border_xregion;
     XRectangle xrect;
@@ -586,7 +331,7 @@
     xrect.x = 0;
     xrect.y = 0;
     xrect.width = fgeom->borders.visible.left;
-    xrect.height = height - fgeom->borders.total.top - fgeom->borders.total.bottom;
+    xrect.height = fgeom->height - fgeom->borders.total.top - fgeom->borders.total.bottom;
 
     XUnionRectWithRegion (&xrect, border_xregion, border_xregion);
 
@@ -594,8 +339,7 @@
 }
 
 static Region
-get_right_border_region (const MetaFrameGeometry *fgeom,
-                         gint                     height)
+get_right_border_region (const MetaFrameGeometry *fgeom)
 {
     Region border_xregion;
     XRectangle xrect;
@@ -605,7 +349,7 @@
     xrect.x = 0;
     xrect.y = 0;
     xrect.width = fgeom->borders.visible.right;
-    xrect.height = height - fgeom->borders.total.top - fgeom->borders.total.bottom;
+    xrect.height = fgeom->height - fgeom->borders.total.top - fgeom->borders.total.bottom;
 
     XUnionRectWithRegion (&xrect, border_xregion, border_xregion);
 
@@ -652,13 +396,8 @@
         MetaFrameBorders borders;
 
         tmp_flags = flags & ~META_FRAME_MAXIMIZED;
-#ifdef HAVE_METACITY_3_20_0
         meta_theme_get_frame_borders (metacity->theme, d->gtk_theme_variant,
                                       type, tmp_flags, &borders);
-#else
-        meta_theme_get_frame_borders (metacity->theme, get_style_info (metacity, d),
-                                      type, d->frame->text_height, tmp_flags, &borders);
-#endif
 
         if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE) {
             frame_win_extents.left += borders.invisible.left;
@@ -671,13 +410,8 @@
         }
 
         tmp_flags = flags | META_FRAME_MAXIMIZED;
-#ifdef HAVE_METACITY_3_20_0
         meta_theme_get_frame_borders (metacity->theme, d->gtk_theme_variant,
                                       type, tmp_flags, &borders);
-#else
-        meta_theme_get_frame_borders (metacity->theme, get_style_info (metacity, d),
-                                      type, d->frame->text_height, tmp_flags, &borders);
-#endif
 
         if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE) {
             frame_max_win_extents.left += borders.invisible.left;
@@ -807,15 +541,9 @@
     else
         client_height = decor->border_layout.left.y2 - decor->border_layout.left.y1;
 
-#ifdef HAVE_METACITY_3_20_0
     meta_theme_calc_geometry (metacity->theme, decor->gtk_theme_variant,
                               frame_type, *flags, client_width, client_height,
                               &metacity->button_layout, fgeom);
-#else
-    meta_theme_calc_geometry (metacity->theme, get_style_info (metacity, decor),
-                              frame_type, decor->frame->text_height, *flags, client_width,
-                              client_height, &metacity->button_layout, fgeom);
-#endif
 }
 
 static void
@@ -915,12 +643,8 @@
 {
     GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
     const gchar *metacity_theme_name = gwd_settings_get_metacity_theme_name (settings);
-#ifdef HAVE_METACITY_3_20_0
     gint metacity_theme_type = gwd_settings_get_metacity_theme_type (settings);
     GError *error = NULL;
-#else
-    MetaTheme *theme;
-#endif
 
     /* metacity_theme can be NULL only in one case - if user has disabled
      * metacity theme with use-metacity-theme setting. In that case
@@ -928,7 +652,6 @@
      */
     g_assert (metacity_theme_name != NULL);
 
-#ifdef HAVE_METACITY_3_20_0
     if (metacity_theme_type == -1)
         metacity_theme_type = META_THEME_TYPE_METACITY;
 
@@ -943,25 +666,6 @@
 
         return FALSE;
     }
-#else
-
-    /* meta_theme_get_current returns the last good theme, so we will try to
-     * load theme manually to know that theme is 100% valid.
-     */
-    theme = meta_theme_load (metacity_theme_name, NULL);
-    if (theme == NULL)
-        return FALSE;
-
-    /* We can not use this manually loaded theme because Metacity internaly
-     * also use meta_theme_get_current wich in this case will return NULL,
-     * boom - segfault...
-     */
-    meta_theme_free (theme);
-
-    /* If we are here then we know that this will not fail. */
-    meta_theme_set_current (metacity_theme_name, TRUE);
-    metacity->theme = meta_theme_get_current ();
-#endif
 
     return TRUE;
 }
@@ -997,11 +701,7 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (object);
 
-#ifdef HAVE_METACITY_3_20_0
     g_clear_object (&metacity->theme);
-#else
-    g_clear_pointer (&metacity->style_variants, g_hash_table_destroy);
-#endif
 
     if (metacity->button_layout_id != 0) {
         GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
@@ -1010,10 +710,6 @@
         metacity->button_layout_id = 0;
     }
 
-#ifndef HAVE_METACITY_3_20_0
-    metacity->titlebar_font = NULL;
-#endif
-
     G_OBJECT_CLASS (gwd_theme_metacity_parent_class)->dispose (object);
 }
 
@@ -1022,11 +718,7 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
 
-#ifdef HAVE_METACITY_3_20_0
     meta_theme_invalidate (metacity->theme);
-#else
-    g_hash_table_remove_all (metacity->style_variants);
-#endif
 }
 
 static void
@@ -1038,10 +730,6 @@
     GdkDisplay *display = gdk_display_get_default ();
     Display *xdisplay = gdk_x11_display_get_xdisplay (display);
     GtkWidget *style_window = gwd_theme_get_style_window (theme);
-#ifndef HAVE_METACITY_3_20_0
-    MetaStyleInfo *style_info = get_style_info (metacity, decor);
-    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
-#endif
     cairo_surface_t *surface;
     Picture src;
     MetaButtonState button_states [META_BUTTON_TYPE_LAST];
@@ -1056,10 +744,6 @@
     Region right_region;
     double alpha;
     gboolean shade_alpha;
-#ifndef HAVE_METACITY_3_20_0
-    MetaFrameStyle *frame_style;
-    GdkRGBA bg_rgba;
-#endif
 
     if (!decor->surface || !decor->picture)
         return;
@@ -1094,20 +778,6 @@
     for (i = 0; i < META_BUTTON_TYPE_LAST; ++i)
         button_states[i] = meta_button_state_for_button_type (metacity, decor, i);
 
-#ifndef HAVE_METACITY_3_20_0
-    frame_style = meta_theme_get_frame_style (metacity->theme, frame_type, flags);
-
-    gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg_rgba);
-    bg_rgba.alpha = 1.0;
-
-    if (frame_style->window_background_color) {
-        meta_color_spec_render (frame_style->window_background_color,
-                                context, &bg_rgba);
-
-        bg_rgba.alpha = frame_style->window_background_alpha / 255.0;
-    }
-#endif
-
     /* Draw something that will be almost invisible to user. This is hacky way
      * to fix invisible decorations. */
     cairo_set_source_rgba (cr, 0, 0, 0, 0.01);
@@ -1118,34 +788,19 @@
     cairo_destroy (cr);
 
     surface = create_surface (fgeom.width, fgeom.height, style_window);
-
     cr = cairo_create (surface);
 
-#ifndef HAVE_METACITY_3_20_0
-    gdk_cairo_set_source_rgba (cr, &bg_rgba);
-    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    cairo_paint (cr);
-#endif
-
     src = XRenderCreatePicture (xdisplay, cairo_xlib_surface_get_drawable (surface),
                                 xformat_rgba, 0, NULL);
 
-#ifdef HAVE_METACITY_3_20_0
     meta_theme_draw_frame (metacity->theme, decor->gtk_theme_variant, cr, frame_type, flags,
                            fgeom.width - fgeom.borders.total.left - fgeom.borders.total.right,
                            fgeom.height - fgeom.borders.total.top - fgeom.borders.total.bottom,
                            decor->name, &metacity->button_layout,
                            button_states, decor->icon_pixbuf, NULL);
-#else
-    meta_theme_draw_frame (metacity->theme, style_info, cr, frame_type, flags,
-                           fgeom.width - fgeom.borders.total.left - fgeom.borders.total.right,
-                           fgeom.height - fgeom.borders.total.top - fgeom.borders.total.bottom,
-                           decor->layout, decor->frame->text_height, &metacity->button_layout,
-                           button_states, decor->icon_pixbuf, NULL);
-#endif
 
     if (fgeom.borders.visible.top) {
-        top_region = get_top_border_region (&fgeom, fgeom.width);
+        top_region = get_top_border_region (&fgeom);
 
         decor_blend_border_picture (xdisplay, decor->context, src,
                                     fgeom.borders.invisible.left,
@@ -1156,7 +811,7 @@
     }
 
     if (fgeom.borders.visible.bottom) {
-        bottom_region = get_bottom_border_region (&fgeom, fgeom.width);
+        bottom_region = get_bottom_border_region (&fgeom);
 
         decor_blend_border_picture (xdisplay, decor->context, src,
                                     fgeom.borders.invisible.left,
@@ -1167,7 +822,7 @@
     }
 
     if (fgeom.borders.visible.left) {
-        left_region = get_left_border_region (&fgeom, fgeom.height);
+        left_region = get_left_border_region (&fgeom);
 
         decor_blend_border_picture (xdisplay, decor->context, src,
                                     fgeom.borders.invisible.left,
@@ -1178,7 +833,7 @@
     }
 
     if (fgeom.borders.visible.right) {
-        right_region = get_right_border_region (&fgeom, fgeom.height);
+        right_region = get_right_border_region (&fgeom);
 
         decor_blend_border_picture (xdisplay, decor->context, src,
                                     fgeom.width - fgeom.borders.total.right,
@@ -1278,35 +933,21 @@
                                           decor_frame_t *frame)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-#ifndef HAVE_METACITY_3_20_0
-    MetaStyleInfo *style_info = get_style_info (metacity, NULL);
-#endif
     MetaFrameType frame_type = frame_type_from_string (frame->type);
     MetaFrameBorders borders;
 
     gwd_decor_frame_ref (frame);
 
-#ifdef HAVE_METACITY_3_20_0
     meta_theme_get_frame_borders (metacity->theme, NULL, frame_type,
                                   0, &borders);
-#else
-    meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
-                                  frame->text_height, 0, &borders);
-#endif
 
     frame->win_extents.top = borders.visible.top;
     frame->win_extents.bottom = borders.visible.bottom;
     frame->win_extents.left = borders.visible.left;
     frame->win_extents.right = borders.visible.right;
 
-#ifdef HAVE_METACITY_3_20_0
     meta_theme_get_frame_borders (metacity->theme, NULL, frame_type,
                                   META_FRAME_MAXIMIZED, &borders);
-#else
-    meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
-                                  frame->text_height, META_FRAME_MAXIMIZED,
-                                  &borders);
-#endif
 
     frame->max_win_extents.top = borders.visible.top;
     frame->max_win_extents.bottom = borders.visible.bottom;
@@ -1521,32 +1162,7 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
 
-#ifdef HAVE_METACITY_3_20_0
     meta_theme_set_titlebar_font (metacity->theme, titlebar_font);
-#else
-    metacity->titlebar_font = titlebar_font;
-#endif
-}
-
-static PangoFontDescription *
-gwd_theme_metacity_get_titlebar_font (GWDTheme      *theme,
-                                      decor_frame_t *frame)
-{
-#ifdef HAVE_METACITY_3_20_0
-    return NULL;
-#else
-    GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-    MetaStyleInfo *style_info = get_style_info (metacity, NULL);
-    PangoFontDescription *font_desc = meta_style_info_create_font_desc (style_info);
-    MetaFrameType type = frame_type_from_string (frame->type);
-    MetaFrameFlags flags = 0xc33; /* FIXME */
-    MetaFrameStyle *style = meta_theme_get_frame_style (metacity->theme, type, flags);
-
-    pango_font_description_merge (font_desc, metacity->titlebar_font, TRUE);
-    meta_frame_style_apply_scale (style, font_desc);
-
-    return font_desc;
-#endif
 }
 
 static void
@@ -1565,16 +1181,11 @@
     theme_class->get_event_window_position = gwd_theme_metacity_get_event_window_position;
     theme_class->get_button_position = gwd_theme_metacity_get_button_position;
     theme_class->update_titlebar_font = gwd_theme_metacity_update_titlebar_font;
-    theme_class->get_titlebar_font = gwd_theme_metacity_get_titlebar_font;
 }
 
 static void
 gwd_theme_metacity_init (GWDThemeMetacity *metacity)
 {
-#ifndef HAVE_METACITY_3_20_0
-    metacity->style_variants = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-                                                      (GDestroyNotify) meta_style_info_unref);
-#endif
 }
 
 /**
 
=== modified file 'gtk/window-decorator/gwd-theme.c'
--- gtk/window-decorator/gwd-theme.c	2016-06-09 16:00:00 +0000
+++ gtk/window-decorator/gwd-theme.c	2016-08-31 17:53:28 +0000
@@ -248,13 +248,6 @@
 {
 }
 
-static PangoFontDescription *
-gwd_theme_real_get_titlebar_font (GWDTheme      *theme,
-                                  decor_frame_t *frame)
-{
-    return NULL;
-}
-
 static void
 gwd_theme_class_init (GWDThemeClass *theme_class)
 {
@@ -275,7 +268,6 @@
     theme_class->get_event_window_position = gwd_theme_real_get_event_window_position;
     theme_class->get_button_position = gwd_theme_real_get_button_position;
     theme_class->update_titlebar_font = gwd_theme_real_update_titlebar_font;
-    theme_class->get_titlebar_font = gwd_theme_real_get_titlebar_font;
 
     properties[PROP_SETTINGS] =
         g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
@@ -433,11 +425,6 @@
     GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
     GtkStyleContext *context = gtk_widget_get_style_context (priv->style_window);
 
-    /* Check if Metacity or Cairo will create titlebar font */
-    font_desc = GWD_THEME_GET_CLASS (theme)->get_titlebar_font (theme, frame);
-    if (font_desc)
-        return font_desc;
-
     /* Check if non-system font is in use */
     if (priv->titlebar_font)
         return pango_font_description_copy (priv->titlebar_font);
 
=== modified file 'gtk/window-decorator/gwd-theme.h'
--- gtk/window-decorator/gwd-theme.h	2016-06-09 15:47:07 +0000
+++ gtk/window-decorator/gwd-theme.h	2016-08-31 17:53:28 +0000
@@ -37,53 +37,50 @@
 {
     GObjectClass parent_class;
 
-    void     (* style_updated)                      (GWDTheme                   *theme);
-
-    void     (* get_shadow)                         (GWDTheme                   *theme,
-                                                     decor_frame_t              *frame,
-                                                     decor_shadow_options_t     *options,
-                                                     gboolean                    active);
-
-    void     (* draw_window_decoration)             (GWDTheme                   *theme,
-                                                     decor_t                    *decor);
-
-    gboolean (* calc_decoration_size)               (GWDTheme                   *theme,
-                                                     decor_t                    *decor,
-                                                     gint                        w,
-                                                     gint                        h,
-                                                     gint                        name_width,
-                                                     gint                       *width,
-                                                     gint                       *height);
-
-    void     (* update_border_extents)              (GWDTheme                   *theme,
-                                                     decor_frame_t              *frame);
-
-    void     (* get_event_window_position)          (GWDTheme                   *theme,
-                                                     decor_t                    *decor,
-                                                     gint                        i,
-                                                     gint                        j,
-                                                     gint                        width,
-                                                     gint                        height,
-                                                     gint                       *x,
-                                                     gint                       *y,
-                                                     gint                       *w,
-                                                     gint                       *h);
-
-    gboolean (* get_button_position)                (GWDTheme                   *theme,
-                                                     decor_t                    *decor,
-                                                     gint                        i,
-                                                     gint                        width,
-                                                     gint                        height,
-                                                     gint                       *x,
-                                                     gint                       *y,
-                                                     gint                       *w,
-                                                     gint                       *h);
-
-    void                   (* update_titlebar_font) (GWDTheme                   *theme,
-                                                     const PangoFontDescription *titlebar_font);
-
-    PangoFontDescription * (* get_titlebar_font)    (GWDTheme                   *theme,
-                                                     decor_frame_t              *frame);
+    void     (* style_updated)             (GWDTheme                   *theme);
+
+    void     (* get_shadow)                (GWDTheme                   *theme,
+                                            decor_frame_t              *frame,
+                                            decor_shadow_options_t     *options,
+                                            gboolean                    active);
+
+    void     (* draw_window_decoration)    (GWDTheme                   *theme,
+                                            decor_t                    *decor);
+
+    gboolean (* calc_decoration_size)      (GWDTheme                   *theme,
+                                            decor_t                    *decor,
+                                            gint                        w,
+                                            gint                        h,
+                                            gint                        name_width,
+                                            gint                       *width,
+                                            gint                       *height);
+
+    void     (* update_border_extents)     (GWDTheme                   *theme,
+                                            decor_frame_t              *frame);
+
+    void     (* get_event_window_position) (GWDTheme                   *theme,
+                                            decor_t                    *decor,
+                                            gint                        i,
+                                            gint                        j,
+                                            gint                        width,
+                                            gint                        height,
+                                            gint                       *x,
+                                            gint                       *y,
+                                            gint                       *w,
+                                            gint                       *h);
+
+    gboolean (* get_button_position)       (GWDTheme                   *theme,
+                                            decor_t                    *decor,
+                                            gint                        i,
+                                            gint                        width,
+                                            gint                        height,
+                                            gint                       *x,
+                                            gint                       *y,
+                                            gint                       *w,
+                                            gint                       *h);
+
+    void     (* update_titlebar_font)      (GWDTheme                   *theme,
+                                            const PangoFontDescription *titlebar_font);
 };
 
 typedef enum