Merge lp:~muktupavels/compiz/gwd-metacity-theme-type-setting into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: add new metacity-theme-type setting in GWDSettings.

Add new metacity-theme-type setting. Currently this is unused, but will be used with Metacity 3.20.

Add new metacity-theme-type setting. Currently this is unused, but will be used with Metacity 3.20.

[Alberts Muktupāvels (muktupavels)]

Updated.

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

=== modified file 'gtk/window-decorator/gdk.c'
--- gtk/window-decorator/gdk.c	2016-06-02 03:25:46 +0000
+++ gtk/window-decorator/gdk.c	2016-06-02 03:25:46 +0000
@@ -21,15 +21,6 @@
 
 #include "gtk-window-decorator.h"
 
-GdkWindow *
-create_gdk_window (Window xframe)
-{
-    GdkDisplay  *display = gdk_display_get_default ();
-    GdkWindow   *window  = gdk_x11_window_foreign_new_for_display (display, xframe);
-
-    return window;
-}
-
 cairo_surface_t *
 create_native_surface_and_wrap (int        w,
                                 int        h,
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-06-02 03:25:46 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-06-02 03:25:46 +0000
@@ -147,12 +147,13 @@
 
 static void
 update_metacity_theme_cb (GWDSettings *settings,
-                          const gchar *metacity_theme,
+                          gint         metacity_theme_type,
+                          const gchar *metacity_theme_name,
                           gpointer     user_data)
 {
     GWDThemeType type = GWD_THEME_TYPE_CAIRO;
 
-    if (metacity_theme != NULL)
+    if (metacity_theme_name != NULL)
         type = GWD_THEME_TYPE_METACITY;
 
     g_set_object (&gwd_theme, gwd_theme_new (type, settings));
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-06-02 03:25:46 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-06-02 03:25:46 +0000
@@ -493,9 +493,6 @@
 
 /* gdk.c */
 
-GdkWindow *
-create_gdk_window (Window xframe);
-
 cairo_surface_t *
 create_surface (int	 w,
 	       int	 h,
 
=== modified file 'gtk/window-decorator/gwd-settings-storage.c'
--- gtk/window-decorator/gwd-settings-storage.c	2016-06-02 03:25:46 +0000
+++ gtk/window-decorator/gwd-settings-storage.c	2016-06-02 03:25:46 +0000
@@ -185,25 +185,29 @@
 update_metacity_theme (GWDSettingsStorage *storage)
 {
     gboolean use_metacity_theme;
-    gchar *theme;
+    gint metacity_theme_type;
+    gchar *metacity_theme_name;
 
     if (!storage->gwd)
         return;
 
     use_metacity_theme = g_settings_get_boolean (storage->gwd, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME);
+    metacity_theme_type = METACITY_THEME_TYPE_DEFAULT;
 
     if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
-        theme = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_THEME);
+        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) {
-        theme = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME);
+        metacity_theme_name = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME);
     } else if (storage->desktop) {
-        theme = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME);
+        metacity_theme_name = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME);
     } else {
         return;
     }
 
-    gwd_settings_metacity_theme_changed (storage->settings, use_metacity_theme, theme);
-    g_free (theme);
+    gwd_settings_metacity_theme_changed (storage->settings, use_metacity_theme,
+                                         metacity_theme_type, metacity_theme_name);
+
+    g_free (metacity_theme_name);
 }
 
 void
 
=== modified file 'gtk/window-decorator/gwd-settings.c'
--- gtk/window-decorator/gwd-settings.c	2016-05-21 20:34:55 +0000
+++ gtk/window-decorator/gwd-settings.c	2016-06-02 03:25:46 +0000
@@ -43,7 +43,8 @@
 
 const gint      BLUR_TYPE_DEFAULT = BLUR_TYPE_NONE;
 
-const gchar    *METACITY_THEME_DEFAULT = "Adwaita";
+const gchar    *METACITY_THEME_NAME_DEFAULT = "Adwaita";
+const gint      METACITY_THEME_TYPE_DEFAULT = -1;
 const gdouble   METACITY_ACTIVE_OPACITY_DEFAULT = 1.0;
 const gdouble   METACITY_INACTIVE_OPACITY_DEFAULT = 0.75;
 const gboolean  METACITY_ACTIVE_SHADE_OPACITY_DEFAULT = TRUE;
@@ -71,7 +72,8 @@
     GObject                 parent;
 
     gint                    blur_type;
-    gchar                  *metacity_theme;
+    gchar                  *metacity_theme_name;
+    gint                    metacity_theme_type;
     guint                   cmdline_opts;
 
     decor_shadow_options_t  active_shadow;
@@ -97,7 +99,7 @@
     PROP_0,
 
     PROP_BLUR_TYPE,
-    PROP_METACITY_THEME,
+    PROP_METACITY_THEME_NAME,
     PROP_CMDLINE_OPTIONS,
 
     LAST_PROP
@@ -134,8 +136,8 @@
 static void
 update_metacity_theme (GWDSettings *settings)
 {
-    g_signal_emit (settings, settings_signals[UPDATE_METACITY_THEME],
-                   0, settings->metacity_theme);
+    g_signal_emit (settings, settings_signals[UPDATE_METACITY_THEME], 0,
+                   settings->metacity_theme_type, settings->metacity_theme_name);
 }
 
 static void
@@ -245,7 +247,7 @@
 
     settings = GWD_SETTINGS (object);
 
-    g_clear_pointer (&settings->metacity_theme, g_free);
+    g_clear_pointer (&settings->metacity_theme_name, g_free);
     g_clear_pointer (&settings->metacity_button_layout, g_free);
     g_clear_pointer (&settings->titlebar_font, g_free);
 
@@ -271,9 +273,9 @@
             settings->blur_type = g_value_get_int (value);
             break;
 
-        case PROP_METACITY_THEME:
-            g_free (settings->metacity_theme);
-            settings->metacity_theme = g_value_dup_string (value);
+        case PROP_METACITY_THEME_NAME:
+            g_free (settings->metacity_theme_name);
+            settings->metacity_theme_name = g_value_dup_string (value);
             break;
 
         default:
@@ -299,11 +301,11 @@
                           BLUR_TYPE_NONE,
                           G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
 
-    properties[PROP_METACITY_THEME] =
-        g_param_spec_string ("metacity-theme",
-                             "Metacity Theme",
-                             "Metacity Theme Setting",
-                             METACITY_THEME_DEFAULT,
+    properties[PROP_METACITY_THEME_NAME] =
+        g_param_spec_string ("metacity-theme-name",
+                             "Metacity Theme Name",
+                             "Metacity Theme Name",
+                             METACITY_THEME_NAME_DEFAULT,
                              G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
 
     properties[PROP_CMDLINE_OPTIONS] =
@@ -328,12 +330,14 @@
     settings_signals[UPDATE_METACITY_THEME] =
         g_signal_new ("update-metacity-theme",
                       GWD_TYPE_SETTINGS, G_SIGNAL_RUN_LAST,
-                      0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING);
+                      0, NULL, NULL, NULL, G_TYPE_NONE, 2,
+                      G_TYPE_INT, G_TYPE_STRING);
 
     settings_signals[UPDATE_METACITY_BUTTON_LAYOUT] =
         g_signal_new ("update-metacity-button-layout",
                       GWD_TYPE_SETTINGS, G_SIGNAL_RUN_LAST,
-                      0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING);
+                      0, NULL, NULL, NULL, G_TYPE_NONE, 1,
+                      G_TYPE_STRING);
 }
 
 static void
@@ -355,7 +359,8 @@
     settings->inactive_shadow.shadow_color[1] = 0;
     settings->inactive_shadow.shadow_color[2] = 0;
     settings->blur_type = BLUR_TYPE_DEFAULT;
-    settings->metacity_theme = g_strdup (METACITY_THEME_DEFAULT);
+    settings->metacity_theme_name = g_strdup (METACITY_THEME_NAME_DEFAULT);
+    settings->metacity_theme_type = METACITY_THEME_TYPE_DEFAULT;
     settings->metacity_active_opacity = METACITY_ACTIVE_OPACITY_DEFAULT;
     settings->metacity_inactive_opacity = METACITY_INACTIVE_OPACITY_DEFAULT;
     settings->metacity_active_shade_opacity = METACITY_ACTIVE_SHADE_OPACITY_DEFAULT;
@@ -378,22 +383,24 @@
 }
 
 GWDSettings *
-gwd_settings_new (gint         blur,
-                  const gchar *metacity_theme)
+gwd_settings_new (gint         blur_type,
+                  const gchar *metacity_theme_name)
 {
-    guint cmdline_opts;
-
-    cmdline_opts = 0;
-
-    if (blur != BLUR_TYPE_UNSET)
+    guint cmdline_opts = 0;
+
+    if (blur_type != BLUR_TYPE_UNSET)
         cmdline_opts |= CMDLINE_BLUR;
+    else
+        blur_type = BLUR_TYPE_DEFAULT;
 
-    if (metacity_theme != NULL)
+    if (metacity_theme_name != NULL)
         cmdline_opts |= CMDLINE_THEME;
+    else
+        metacity_theme_name = METACITY_THEME_NAME_DEFAULT;
 
     return g_object_new (GWD_TYPE_SETTINGS,
-                         "blur-type", blur != BLUR_TYPE_UNSET ? blur : BLUR_TYPE_DEFAULT,
-                         "metacity-theme", metacity_theme ? metacity_theme : METACITY_THEME_DEFAULT,
+                         "blur-type", blur_type,
+                         "metacity-theme-name", metacity_theme_name,
                          "cmdline-options", cmdline_opts,
                          NULL);
 }
@@ -411,9 +418,15 @@
 }
 
 const gchar *
-gwd_settings_get_metacity_theme (GWDSettings *settings)
-{
-    return settings->metacity_theme;
+gwd_settings_get_metacity_theme_name (GWDSettings *settings)
+{
+    return settings->metacity_theme_name;
+}
+
+gint
+gwd_settings_get_metacity_theme_type (GWDSettings *settings)
+{
+    return settings->metacity_theme_type;
 }
 
 const gchar *
@@ -614,20 +627,23 @@
 gboolean
 gwd_settings_metacity_theme_changed (GWDSettings *settings,
                                      gboolean     use_metacity_theme,
-                                     const gchar *metacity_theme)
+                                     gint         metacity_theme_type,
+                                     const gchar *metacity_theme_name)
 {
     if (settings->cmdline_opts & CMDLINE_THEME)
         return FALSE;
 
     if (use_metacity_theme) {
-        if (g_strcmp0 (metacity_theme, settings->metacity_theme) == 0)
+        if (g_strcmp0 (metacity_theme_name, settings->metacity_theme_name) == 0 &&
+            metacity_theme_type == settings->metacity_theme_type)
             return FALSE;
 
-        g_free (settings->metacity_theme);
-        settings->metacity_theme = g_strdup (metacity_theme);
+        g_free (settings->metacity_theme_name);
+        settings->metacity_theme_name = g_strdup (metacity_theme_name);
+        settings->metacity_theme_type = metacity_theme_type;
     } else {
-        g_free (settings->metacity_theme);
-        settings->metacity_theme = NULL;
+        g_free (settings->metacity_theme_name);
+        settings->metacity_theme_name = NULL;
     }
 
     append_to_notify_funcs (settings, update_metacity_theme);
 
=== modified file 'gtk/window-decorator/gwd-settings.h'
--- gtk/window-decorator/gwd-settings.h	2016-05-21 16:08:47 +0000
+++ gtk/window-decorator/gwd-settings.h	2016-06-02 03:25:46 +0000
@@ -69,7 +69,8 @@
 
 extern const gint      BLUR_TYPE_DEFAULT;
 
-extern const gchar    *METACITY_THEME_DEFAULT;
+extern const gchar    *METACITY_THEME_NAME_DEFAULT;
+extern const gint      METACITY_THEME_TYPE_DEFAULT;
 extern const gdouble   METACITY_ACTIVE_OPACITY_DEFAULT;
 extern const gdouble   METACITY_INACTIVE_OPACITY_DEFAULT;
 extern const gboolean  METACITY_ACTIVE_SHADE_OPACITY_DEFAULT;
@@ -88,8 +89,8 @@
 G_DECLARE_FINAL_TYPE (GWDSettings, gwd_settings, GWD, SETTINGS, GObject)
 
 GWDSettings *
-gwd_settings_new                                 (gint                 blur,
-                                                  const gchar         *metacity_theme);
+gwd_settings_new                                 (gint                 blur_type,
+                                                  const gchar         *metacity_theme_name);
 
 gint
 gwd_settings_get_blur_type                       (GWDSettings         *settings);
@@ -98,7 +99,10 @@
 gwd_settings_get_metacity_button_layout          (GWDSettings         *settings);
 
 const gchar *
-gwd_settings_get_metacity_theme                  (GWDSettings         *settings);
+gwd_settings_get_metacity_theme_name             (GWDSettings         *settings);
+
+gint
+gwd_settings_get_metacity_theme_type             (GWDSettings         *settings);
 
 const gchar *
 gwd_settings_get_titlebar_font                   (GWDSettings         *settings);
@@ -166,7 +170,8 @@
 gboolean
 gwd_settings_metacity_theme_changed              (GWDSettings         *settings,
                                                   gboolean             use_metacity_theme,
-                                                  const gchar         *metacity_theme);
+                                                  gint                 metacity_theme_type,
+                                                  const gchar         *metacity_theme_name);
 
 gboolean
 gwd_settings_opacity_changed                     (GWDSettings         *settings,
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-02 03:25:46 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-06-02 03:25:46 +0000
@@ -27,6 +27,7 @@
 
 #include "config.h"
 
+#include <metacity-private/theme.h>
 #include <metacity-private/theme-parser.h>
 
 #include "gtk-window-decorator.h"
@@ -196,7 +197,7 @@
                                 new_layout.right_buttons[i++] = f;
                         } else {
                             g_warning ("Ignoring unknown or already-used "
-                                   "button name \"%s\"", buttons[b]);
+                                       "button name \"%s\"", buttons[b]);
                         }
                     }
 
@@ -598,13 +599,10 @@
 
     /* Add the invisible grab area padding */
     {
-        GdkScreen *screen;
-        MetaStyleInfo *style_info;
+        GdkScreen *screen = gtk_widget_get_screen (d->frame->style_window_rgba);
+        MetaStyleInfo *style_info = meta_theme_create_style_info (screen, d->gtk_theme_variant);
         MetaFrameBorders borders;
 
-        screen = gtk_widget_get_screen (d->frame->style_window_rgba);
-        style_info = meta_theme_create_style_info (screen, d->gtk_theme_variant);
-
         meta_theme_get_frame_borders (theme, style_info, type,
                                       d->frame->text_height,
                                       flags, &borders);
@@ -686,8 +684,8 @@
                          MetaFrameGeometry *fgeom,
                          MetaFrameType      frame_type)
 {
-    GdkScreen *screen;
-    MetaStyleInfo *style_info;
+    GdkScreen *screen = gtk_widget_get_screen (decor->frame->style_window_rgba);
+    MetaStyleInfo *style_info = meta_theme_create_style_info (screen, decor->gtk_theme_variant);
     gint client_width;
     gint client_height;
 
@@ -750,9 +748,6 @@
     else
         client_height = decor->border_layout.left.y2 - decor->border_layout.left.y1;
 
-    screen = gtk_widget_get_screen (decor->frame->style_window_rgba);
-    style_info = meta_theme_create_style_info (screen, decor->gtk_theme_variant);
-
     meta_theme_calc_geometry (metacity->theme, style_info, frame_type,
                               decor->frame->text_height, *flags, client_width,
                               client_height, &metacity->button_layout, fgeom);
@@ -858,19 +853,19 @@
 setup_theme (GWDThemeMetacity *metacity)
 {
     GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
-    const gchar *metacity_theme = gwd_settings_get_metacity_theme (settings);
+    const gchar *metacity_theme_name = gwd_settings_get_metacity_theme_name (settings);
     MetaTheme *theme;
 
     /* metacity_theme can be NULL only in one case - if user has disabled
      * metacity theme with use-metacity-theme setting. In that case
      * GWDThemeCairo will be created / should be created.
      */
-    g_assert (metacity_theme != NULL);
+    g_assert (metacity_theme_name != NULL);
 
     /* 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, NULL);
+    theme = meta_theme_load (metacity_theme_name, NULL);
     if (theme == NULL)
         return FALSE;
 
@@ -881,7 +876,7 @@
     meta_theme_free (theme);
 
     /* If we are here then we know that this will not fail. */
-    meta_theme_set_current (metacity_theme, TRUE);
+    meta_theme_set_current (metacity_theme_name, TRUE);
     metacity->theme = meta_theme_get_current ();
 
     return TRUE;
@@ -934,17 +929,18 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
     GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
-    GdkDisplay *display;
-    GdkScreen *screen;
-    Display *xdisplay;
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    GdkScreen *screen = gtk_widget_get_screen (decor->frame->style_window_rgba);
+    MetaStyleInfo *style_info = meta_theme_create_style_info (screen, decor->gtk_theme_variant);
+    GtkWidget *style_window = decor->frame->style_window_rgba;
+    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
     cairo_surface_t *surface;
     Picture src;
     MetaButtonState button_states [META_BUTTON_TYPE_LAST];
     MetaFrameGeometry fgeom;
     MetaFrameFlags flags;
     MetaFrameType frame_type;
-    MetaStyleInfo *style_info;
-    GtkStyleContext *context;
     cairo_t *cr;
     gint i;
     Region top_region;
@@ -954,15 +950,11 @@
     double alpha;
     gboolean shade_alpha;
     MetaFrameStyle *frame_style;
-    GtkWidget *style_window;
     GdkRGBA bg_rgba;
 
     if (!decor->surface || !decor->picture)
         return;
 
-    display = gdk_display_get_default ();
-    xdisplay = gdk_x11_display_get_xdisplay (display);
-
     top_region = NULL;
     bottom_region = NULL;
     left_region = NULL;
@@ -979,9 +971,6 @@
     if (decoration_alpha == 1.0)
         alpha = 1.0;
 
-    style_window = decor->frame->style_window_rgba;
-    context = gtk_widget_get_style_context (style_window);
-
     cr = cairo_create (decor->buffer_surface ? decor->buffer_surface : decor->surface);
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
@@ -1023,16 +1012,14 @@
     surface = create_surface (fgeom.width, fgeom.height, decor->frame->style_window_rgba);
 
     cr = cairo_create (surface);
+
     gdk_cairo_set_source_rgba (cr, &bg_rgba);
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+    cairo_paint (cr);
 
     src = XRenderCreatePicture (xdisplay, cairo_xlib_surface_get_drawable (surface),
                                 xformat_rgba, 0, NULL);
 
-    screen = gtk_widget_get_screen (decor->frame->style_window_rgba);
-    style_info = meta_theme_create_style_info (screen, decor->gtk_theme_variant);
-
-    cairo_paint (cr);
     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,
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.h'
--- gtk/window-decorator/gwd-theme-metacity.h	2016-05-26 07:19:33 +0000
+++ gtk/window-decorator/gwd-theme-metacity.h	2016-06-02 03:25:46 +0000
@@ -20,8 +20,6 @@
 #ifndef GWD_THEME_METACITY_H
 #define GWD_THEME_METACITY_H
 
-#include <metacity-private/theme.h>
-
 #include "gwd-settings.h"
 #include "gwd-theme.h"
 
 
=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2016-06-02 03:25:46 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2016-06-02 03:25:46 +0000
@@ -39,8 +39,6 @@
 
 #include <gtest_unspecified_bool_type_matcher.h>
 
-#include "compiz_gwd_tests.h"
-
 #include "gwd-settings.h"
 
 using ::testing::Eq;
@@ -166,7 +164,8 @@
         }
 
         static void updateMetacityThemeCb (GWDSettings                  *settings,
-                                           const gchar                  *metacity_theme,
+                                           gint                          metacity_theme_type,
+                                           const gchar                  *metacity_theme_name,
                                            GWDMockSettingsNotifiedGMock *gmock)
         {
             gmock->updateMetacityTheme ();
@@ -378,9 +377,10 @@
     EXPECT_CALL (*mGMockNotified, updateDecorations ());
     EXPECT_TRUE (gwd_settings_metacity_theme_changed (mSettings.get (),
                                                       testing_values::USE_METACITY_THEME_VALUE,
+                                                      METACITY_THEME_TYPE_DEFAULT,
                                                       testing_values::METACITY_THEME_VALUE.c_str ()));
 
-    EXPECT_THAT (gwd_settings_get_metacity_theme (mSettings.get ()),
+    EXPECT_THAT (gwd_settings_get_metacity_theme_name (mSettings.get ()),
                  IsStringsEqual (testing_values::METACITY_THEME_VALUE.c_str ()));
 }
 
@@ -391,9 +391,10 @@
     EXPECT_CALL (*mGMockNotified, updateMetacityTheme ());
     EXPECT_CALL (*mGMockNotified, updateDecorations ());
     EXPECT_TRUE (gwd_settings_metacity_theme_changed (mSettings.get (), FALSE,
-                                                      METACITY_THEME_DEFAULT));
+                                                      METACITY_THEME_TYPE_DEFAULT,
+                                                      METACITY_THEME_NAME_DEFAULT));
 
-    EXPECT_THAT (gwd_settings_get_metacity_theme (mSettings.get ()),
+    EXPECT_THAT (gwd_settings_get_metacity_theme_name (mSettings.get ()),
                  IsStringsEqual (metacityTheme));
 }
 
@@ -401,7 +402,8 @@
 {
     EXPECT_FALSE (gwd_settings_metacity_theme_changed (mSettings.get (),
                                                        testing_values::USE_METACITY_THEME_VALUE,
-                                                       METACITY_THEME_DEFAULT));
+                                                       METACITY_THEME_TYPE_DEFAULT,
+                                                       METACITY_THEME_NAME_DEFAULT));
 }
 
 TEST_F(GWDSettingsTest, TestMetacityThemeSetCommandLine)
@@ -413,9 +415,10 @@
 
     EXPECT_FALSE (gwd_settings_metacity_theme_changed (mSettings.get (),
                                                        testing_values::USE_METACITY_THEME_VALUE,
+                                                       METACITY_THEME_TYPE_DEFAULT,
                                                        testing_values::METACITY_THEME_VALUE.c_str ()));
 
-    EXPECT_THAT (gwd_settings_get_metacity_theme (mSettings.get ()),
+    EXPECT_THAT (gwd_settings_get_metacity_theme_name (mSettings.get ()),
                  IsStringsEqual (metacityTheme));
 }