Merge lp:~muktupavels/compiz/add-gwd-application-v3 into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: add GWDApplication.

gtk-window-decorator: add GWDApplication.

[Sam Spilsbury (smspillaz)]

See diff comments (use after free).

I don't quite understand the purpose of this abstraction either. Could you add a little more detail in the description of the change or the commit message explaining the need to create a GWDApplication? It seems to me like we just moved parts of GWDTheme over to it.

review: Needs Fixing

[Alberts Muktupāvels (muktupavels)]

> See diff comments (use after free).
>
> I don't quite understand the purpose of this abstraction either. Could you add
> a little more detail in the description of the change or the commit message
> explaining the need to create a GWDApplication? It seems to me like we just
> moved parts of GWDTheme over to it.

Will fix use after free and also update description when I will be back to my main pc. GWDSettings moved to GWDApplication is only small part.

It looks like there is no reason to create style window for each frame style - so I will create only one style window and GWDApplication will be good place to store/keep it.

Also GWDTheme probably can be moved to it like other global variables, for example, frame_table... I simply want keep merge proposals more or less simple so it is easier to review.

Unmerged revisions

4051. By Alberts Muktupāvels on 2016-05-27

Remove uneeded include.

4050. By Alberts Muktupāvels on 2016-05-27

Remove get_settings from GWDTheme.

4049. By Alberts Muktupāvels on 2016-05-27

Add GWDApplication.

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2016-05-21 11:06:24 +0000
+++ gtk/window-decorator/CMakeLists.txt	2016-05-27 09:42:08 +0000
@@ -79,6 +79,7 @@
 		    util.c
 		    wnck.c
 		    decorator.c
+		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-application.c
 		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-xproperty-storage.c
 		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-theme.c
 		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-theme-cairo.c

=== modified file 'gtk/window-decorator/blurprops.c'
--- gtk/window-decorator/blurprops.c	2016-05-21 16:08:47 +0000
+++ gtk/window-decorator/blurprops.c	2016-05-27 09:42:08 +0000
@@ -35,7 +35,7 @@
 			    Region  right_region,
 			    int     right_offset)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gint blur_type = gwd_settings_get_blur_type (settings);
     Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
     long    *data = NULL;

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/decorator.c	2016-05-27 09:42:08 +0000
@@ -55,7 +55,7 @@
 static const PangoFontDescription *
 get_titlebar_font (decor_frame_t *frame)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     const gchar *titlebar_font = gwd_settings_get_titlebar_font (settings);
 
     /* Using system font */

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/events.c	2016-05-27 09:42:08 +0000
@@ -109,7 +109,7 @@
 		     int	max,
 		     char	*tooltip)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gboolean use_tooltips = gwd_settings_get_use_tooltips (settings);
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     guint   state = d->button_states[button];
@@ -448,7 +448,7 @@
 handle_mouse_wheel_title_event (WnckWindow   *win,
 				unsigned int button)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gint wheel_action = gwd_settings_get_mouse_wheel_action (settings);
 
     switch (wheel_action) {
@@ -474,7 +474,7 @@
 	     decor_event      *gtkwd_event,
 	     decor_event_type gtkwd_type)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     static Window last_button_xwindow = None;
     static Time	  last_button_time = 0;
     gint	  titlebar_action = 0;
@@ -541,7 +541,7 @@
 		    decor_event      *gtkwd_event,
 		    decor_event_type gtkwd_type)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gint    titlebar_action = 0;
 
     if (gtkwd_type != GButtonPress)

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/frames.c	2016-05-27 09:42:08 +0000
@@ -264,7 +264,7 @@
 void
 decor_frame_refresh (decor_frame_t *frame)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     const gchar *titlebar_font = gwd_settings_get_titlebar_font (settings);
     decor_shadow_options_t active_o, inactive_o;
     decor_shadow_info_t *info;

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-05-27 09:42:08 +0000
@@ -26,6 +26,7 @@
 #include "gtk-window-decorator.h"
 #include "gwd-settings.h"
 
+GWDApplication *application;
 GWDTheme *gwd_theme;
 
 gdouble decoration_alpha = 0.5;
@@ -302,10 +303,8 @@
 
     initialize_decorations ();
 
-    settings = gwd_settings_new (option_blur_type, option_meta_theme);
-
-    if (!settings)
-        return 1;
+    application = gwd_application_new (option_blur_type, option_meta_theme);
+    settings = gwd_application_get_settings (application);
 
     g_signal_connect (settings, "update-decorations",
                       G_CALLBACK (update_decorations_cb), NULL);
@@ -334,7 +333,7 @@
 
     if (!create_tooltip_window ())
     {
-	g_object_unref (settings);
+	g_object_unref (application);
 
 	fprintf (stderr, "%s, Couldn't create tooltip window\n", argv[0]);
 	return 1;
@@ -418,7 +417,7 @@
 
     g_clear_object (&gwd_theme);
     fini_settings ();
-    g_clear_object (&settings);
+    g_clear_object (&application);
 
     return 0;
 }

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-05-27 09:42:08 +0000
@@ -63,6 +63,7 @@
 #define _(x)  gettext (x)
 #define N_(x) x
 
+#include "gwd-application.h"
 #include "gwd-theme.h"
 
 extern const unsigned short ICON_SPACE;
@@ -90,6 +91,7 @@
 
 extern gboolean minimal;
 
+extern GWDApplication *application;
 extern GWDTheme *gwd_theme;
 
 extern gdouble decoration_alpha;

=== added file 'gtk/window-decorator/gwd-application.c'
--- gtk/window-decorator/gwd-application.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/gwd-application.c	2016-05-27 09:42:08 +0000
@@ -0,0 +1,149 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+
+/*
+ * Copyright (C) 2016 Alberts Muktupāvels
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include "gwd-application.h"
+
+struct _GWDApplication
+{
+    GObject      parent;
+
+    gint         blur_type;
+    gchar       *metacity_theme;
+
+    GWDSettings *settings;
+};
+
+enum
+{
+    PROP_0,
+
+    PROP_BLUR_TYPE,
+    PROP_METACITY_THEME,
+
+    LAST_PROP
+};
+
+static GParamSpec *properties[LAST_PROP] = { NULL };
+
+G_DEFINE_TYPE (GWDApplication, gwd_application, G_TYPE_OBJECT)
+
+static void
+gwd_application_constructed (GObject *object)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    G_OBJECT_CLASS (gwd_application_parent_class)->constructed (object);
+
+    application->settings = gwd_settings_new (application->blur_type,
+                                              application->metacity_theme);
+}
+
+static void
+gwd_application_dispose (GObject *object)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    g_clear_object (&application->settings);
+
+    G_OBJECT_CLASS (gwd_application_parent_class)->dispose (object);
+}
+
+static void
+gwd_application_finalize (GObject *object)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    g_clear_pointer (&application->metacity_theme, g_free);
+
+    G_OBJECT_CLASS (gwd_application_parent_class)->finalize (object);
+}
+
+static void
+gwd_application_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    switch (property_id) {
+        case PROP_BLUR_TYPE:
+            application->blur_type = g_value_get_int (value);
+            break;
+
+        case PROP_METACITY_THEME:
+            application->metacity_theme = g_value_dup_string (value);
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+            break;
+    }
+}
+
+static void
+gwd_application_class_init (GWDApplicationClass *application_class)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (application_class);
+
+    object_class->constructed = gwd_application_constructed;
+    object_class->dispose = gwd_application_dispose;
+    object_class->finalize = gwd_application_finalize;
+    object_class->set_property = gwd_application_set_property;
+
+    properties[PROP_BLUR_TYPE] =
+        g_param_spec_int ("blur-type",
+                          "Blur Type",
+                          "Blur type",
+                          BLUR_TYPE_UNSET, BLUR_TYPE_ALL, BLUR_TYPE_UNSET,
+                          G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+                          G_PARAM_STATIC_STRINGS);
+
+    properties[PROP_METACITY_THEME] =
+        g_param_spec_string ("metacity-theme",
+                             "Metacity Theme",
+                             "Metacity Theme",
+                             NULL,
+                             G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+                             G_PARAM_STATIC_STRINGS);
+
+    g_object_class_install_properties (object_class, LAST_PROP, properties);
+}
+
+static void
+gwd_application_init (GWDApplication *application)
+{
+}
+
+GWDApplication *
+gwd_application_new (gint         blur_type,
+                     const gchar *metacity_theme)
+{
+    return g_object_new (GWD_TYPE_APPLICATION,
+                         "blur-type", blur_type,
+                         "metacity-theme", metacity_theme,
+                         NULL);
+}
+
+GWDSettings *
+gwd_application_get_settings (GWDApplication *application)
+{
+    return application->settings;
+}

=== added file 'gtk/window-decorator/gwd-application.h'
--- gtk/window-decorator/gwd-application.h	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/gwd-application.h	2016-05-27 09:42:08 +0000
@@ -0,0 +1,40 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+
+/*
+ * Copyright (C) 2016 Alberts Muktupāvels
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GWD_APPLICATION_H
+#define GWD_APPLICATION_H
+
+#include "gwd-settings.h"
+
+G_BEGIN_DECLS
+
+#define GWD_TYPE_APPLICATION gwd_application_get_type ()
+G_DECLARE_FINAL_TYPE (GWDApplication, gwd_application,
+                      GWD, APPLICATION, GObject)
+
+GWDApplication *
+gwd_application_new          (gint            blur_type,
+                              const gchar    *metacity_theme);
+
+GWDSettings *
+gwd_application_get_settings (GWDApplication *application);
+
+G_END_DECLS
+
+#endif

=== modified file 'gtk/window-decorator/gwd-theme-cairo.c'
--- gtk/window-decorator/gwd-theme-cairo.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/gwd-theme-cairo.c	2016-05-27 09:42:08 +0000
@@ -33,7 +33,18 @@
 
 struct _GWDThemeCairo
 {
-    GObject parent;
+    GObject      parent;
+
+    GWDSettings *settings;
+};
+
+enum
+{
+    PROP_0,
+
+    PROP_SETTINGS,
+
+    LAST_PROP
 };
 
 G_DEFINE_TYPE (GWDThemeCairo, gwd_theme_cairo, GWD_TYPE_THEME)
@@ -230,6 +241,52 @@
 }
 
 static void
+gwd_theme_cairo_dispose (GObject *object)
+{
+    GWDThemeCairo *cairo = GWD_THEME_CAIRO (object);
+
+    g_clear_object (&cairo->settings);
+
+    G_OBJECT_CLASS (gwd_theme_cairo_parent_class)->dispose (object);
+}
+
+static void
+gwd_theme_cairo_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+    GWDThemeCairo *cairo = GWD_THEME_CAIRO (object);
+
+    switch (property_id) {
+        case PROP_SETTINGS:
+            cairo->settings = g_value_dup_object (value);
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+            break;
+    }
+}
+
+static void
+gwd_theme_cairo_get_shadow (GWDTheme               *theme,
+                            decor_frame_t          *frame,
+                            decor_shadow_options_t *options,
+                            gboolean                active)
+{
+    GWDThemeCairo *cairo = GWD_THEME_CAIRO (theme);
+    decor_shadow_options_t shadow;
+
+    if (active)
+        shadow = gwd_settings_get_active_shadow (cairo->settings);
+    else
+        shadow = gwd_settings_get_inactive_shadow (cairo->settings);
+
+    memcpy (options, &shadow, sizeof (decor_shadow_options_t));
+}
+
+static void
 gwd_theme_cairo_draw_window_decoration (GWDTheme *theme,
                                         decor_t  *decor)
 {
@@ -750,16 +807,31 @@
     return TRUE;
 }
 
+static gfloat
+gwd_theme_cairo_get_title_scale (GWDTheme      *theme,
+                                 decor_frame_t *frame)
+{
+    return 1.0;
+}
+
 static void
 gwd_theme_cairo_class_init (GWDThemeCairoClass *cairo_class)
 {
+    GObjectClass *object_class = G_OBJECT_CLASS (cairo_class);
     GWDThemeClass *theme_class = GWD_THEME_CLASS (cairo_class);
 
+    object_class->dispose = gwd_theme_cairo_dispose;
+    object_class->set_property = gwd_theme_cairo_set_property;
+
+    theme_class->get_shadow = gwd_theme_cairo_get_shadow;
     theme_class->draw_window_decoration = gwd_theme_cairo_draw_window_decoration;
     theme_class->calc_decoration_size = gwd_theme_cairo_calc_decoration_size;
     theme_class->update_border_extents = gwd_theme_cairo_update_border_extents;
     theme_class->get_event_window_position = gwd_theme_cairo_get_event_window_position;
     theme_class->get_button_position = gwd_theme_cairo_get_button_position;
+    theme_class->get_title_scale = gwd_theme_cairo_get_title_scale;
+
+    g_object_class_override_property (object_class, PROP_SETTINGS, "settings");
 }
 
 static void

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-05-27 09:42:08 +0000
@@ -37,12 +37,23 @@
 {
     GObject           parent;
 
+    GWDSettings      *settings;
+
     MetaTheme        *theme;
 
     gulong            button_layout_id;
     MetaButtonLayout  button_layout;
 };
 
+enum
+{
+    PROP_0,
+
+    PROP_SETTINGS,
+
+    LAST_PROP
+};
+
 G_DEFINE_TYPE (GWDThemeMetacity, gwd_theme_metacity, GWD_TYPE_THEME)
 
 static void
@@ -857,8 +868,7 @@
 static gboolean
 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 = gwd_settings_get_metacity_theme (metacity->settings);
     MetaTheme *theme;
 
     /* metacity_theme can be NULL only in one case - if user has disabled
@@ -890,14 +900,13 @@
 static void
 setup_button_layout (GWDThemeMetacity *metacity)
 {
-    GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
-    const gchar *button_layout = gwd_settings_get_metacity_button_layout (settings);
+    const gchar *button_layout = gwd_settings_get_metacity_button_layout (metacity->settings);
 
     metacity->button_layout_id =
-        g_signal_connect (settings, "update-metacity-button-layout",
+        g_signal_connect (metacity->settings, "update-metacity-button-layout",
                           G_CALLBACK (update_metacity_button_layout_cb), metacity);
 
-    update_metacity_button_layout_cb (settings, button_layout, metacity);
+    update_metacity_button_layout_cb (metacity->settings, button_layout, metacity);
 }
 
 static void
@@ -918,10 +927,10 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (object);
 
+    g_clear_object (&metacity->settings);
+
     if (metacity->button_layout_id != 0) {
-        GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
-
-        g_signal_handler_disconnect (settings, metacity->button_layout_id);
+        g_signal_handler_disconnect (metacity->settings, metacity->button_layout_id);
         metacity->button_layout_id = 0;
     }
 
@@ -929,11 +938,46 @@
 }
 
 static void
+gwd_theme_metacity_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+    GWDThemeMetacity *metacity = GWD_THEME_METACITY (object);
+
+    switch (property_id) {
+        case PROP_SETTINGS:
+            metacity->settings = g_value_dup_object (value);
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+            break;
+    }
+}
+
+static void
+gwd_theme_metacity_get_shadow (GWDTheme               *theme,
+                               decor_frame_t          *frame,
+                               decor_shadow_options_t *options,
+                               gboolean                active)
+{
+    GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
+    decor_shadow_options_t shadow;
+
+    if (active)
+        shadow = gwd_settings_get_active_shadow (metacity->settings);
+    else
+        shadow = gwd_settings_get_inactive_shadow (metacity->settings);
+
+    memcpy (options, &shadow, sizeof (decor_shadow_options_t));
+}
+
+static void
 gwd_theme_metacity_draw_window_decoration (GWDTheme *theme,
                                            decor_t  *decor)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
     GdkDisplay *display;
     GdkScreen *screen;
     Display *xdisplay;
@@ -969,11 +1013,11 @@
     right_region = NULL;
 
     if (decor->active) {
-        alpha = gwd_settings_get_metacity_active_opacity (settings);
-        shade_alpha = gwd_settings_get_metacity_active_shade_opacity (settings);
+        alpha = gwd_settings_get_metacity_active_opacity (metacity->settings);
+        shade_alpha = gwd_settings_get_metacity_active_shade_opacity (metacity->settings);
     } else {
-        alpha = gwd_settings_get_metacity_inactive_opacity (settings);
-        shade_alpha = gwd_settings_get_metacity_inactive_shade_opacity (settings);
+        alpha = gwd_settings_get_metacity_inactive_opacity (metacity->settings);
+        shade_alpha = gwd_settings_get_metacity_inactive_shade_opacity (metacity->settings);
     }
 
     if (decoration_alpha == 1.0)
@@ -1436,13 +1480,17 @@
 
     object_class->constructed = gwd_theme_metacity_constructed;
     object_class->dispose = gwd_theme_metacity_dispose;
+    object_class->set_property = gwd_theme_metacity_set_property;
 
+    theme_class->get_shadow = gwd_theme_metacity_get_shadow;
     theme_class->draw_window_decoration = gwd_theme_metacity_draw_window_decoration;
     theme_class->calc_decoration_size = gwd_theme_metacity_calc_decoration_size;
     theme_class->update_border_extents = gwd_theme_metacity_update_border_extents;
     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->get_title_scale = gwd_theme_metacity_get_title_scale;
+
+    g_object_class_override_property (object_class, PROP_SETTINGS, "settings");
 }
 
 static void

=== modified file 'gtk/window-decorator/gwd-theme.c'
--- gtk/window-decorator/gwd-theme.c	2016-05-26 13:33:24 +0000
+++ gtk/window-decorator/gwd-theme.c	2016-05-27 09:42:08 +0000
@@ -26,11 +26,6 @@
 #include "gwd-theme-metacity.h"
 #endif
 
-typedef struct
-{
-    GWDSettings *settings;
-} GWDThemePrivate;
-
 enum
 {
     PROP_0,
@@ -42,44 +37,7 @@
 
 static GParamSpec *properties[LAST_PROP] = { NULL };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GWDTheme, gwd_theme, G_TYPE_OBJECT)
-
-static void
-gwd_theme_dispose (GObject *object)
-{
-    GWDTheme *theme;
-    GWDThemePrivate *priv;
-
-    theme = GWD_THEME (object);
-    priv = gwd_theme_get_instance_private (theme);
-
-    g_clear_object (&priv->settings);
-
-    G_OBJECT_CLASS (gwd_theme_parent_class)->dispose (object);
-}
-
-static void
-gwd_theme_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-    GWDTheme *theme;
-    GWDThemePrivate *priv;
-
-    theme = GWD_THEME (object);
-    priv = gwd_theme_get_instance_private (theme);
-
-    switch (property_id) {
-        case PROP_SETTINGS:
-            g_value_set_object (value, priv->settings);
-            break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-            break;
-    }
-}
+G_DEFINE_TYPE (GWDTheme, gwd_theme, G_TYPE_OBJECT)
 
 static void
 gwd_theme_set_property (GObject      *object,
@@ -87,15 +45,8 @@
                         const GValue *value,
                         GParamSpec   *pspec)
 {
-    GWDTheme *theme;
-    GWDThemePrivate *priv;
-
-    theme = GWD_THEME (object);
-    priv = gwd_theme_get_instance_private (theme);
-
     switch (property_id) {
         case PROP_SETTINGS:
-            priv->settings = g_value_dup_object (value);
             break;
 
         default:
@@ -110,23 +61,17 @@
                            decor_shadow_options_t *options,
                            gboolean                active)
 {
-    GWDThemePrivate *priv;
-    decor_shadow_options_t shadow;
-
-    priv = gwd_theme_get_instance_private (theme);
-
-    if (active)
-        shadow = gwd_settings_get_active_shadow (priv->settings);
-    else
-        shadow = gwd_settings_get_inactive_shadow (priv->settings);
-
-    memcpy (options, &shadow, sizeof (decor_shadow_options_t));
+    g_critical ("GWDThemeClass::get_shadow not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
 }
 
 static void
 gwd_theme_real_draw_window_decoration (GWDTheme *theme,
                                        decor_t  *decor)
 {
+    g_critical ("GWDThemeClass::draw_window_decoration not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
+
 }
 
 static gboolean
@@ -138,6 +83,9 @@
                                      gint     *width,
                                      gint     *height)
 {
+    g_critical ("GWDThemeClass::calc_decoration_size not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
+
     return FALSE;
 }
 
@@ -145,6 +93,8 @@
 gwd_theme_real_update_border_extents (GWDTheme      *theme,
                                       decor_frame_t *frame)
 {
+    g_critical ("GWDThemeClass::update_border_extents not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
 }
 
 static void
@@ -159,6 +109,8 @@
                                           gint     *w,
                                           gint     *h)
 {
+    g_critical ("GWDThemeClass::get_event_window_position not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
 }
 
 static gboolean
@@ -172,6 +124,9 @@
                                     gint     *w,
                                     gint     *h)
 {
+    g_critical ("GWDThemeClass::get_button_position not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
+
     return FALSE;
 }
 
@@ -179,6 +134,9 @@
 gwd_theme_real_get_title_scale (GWDTheme      *theme,
                                 decor_frame_t *frame)
 {
+    g_critical ("GWDThemeClass::get_title_scale not implemented for '%s'",
+                g_type_name (G_TYPE_FROM_INSTANCE (theme)));
+
     return 1.0;
 }
 
@@ -189,8 +147,6 @@
 
     object_class = G_OBJECT_CLASS (theme_class);
 
-    object_class->dispose = gwd_theme_dispose;
-    object_class->get_property = gwd_theme_get_property;
     object_class->set_property = gwd_theme_set_property;
 
     theme_class->get_shadow = gwd_theme_real_get_shadow;
@@ -204,7 +160,7 @@
     properties[PROP_SETTINGS] =
         g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
                              GWD_TYPE_SETTINGS,
-                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                             G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
                              G_PARAM_STATIC_STRINGS);
 
     g_object_class_install_properties (object_class, LAST_PROP, properties);
@@ -248,16 +204,6 @@
                          NULL);
 }
 
-GWDSettings *
-gwd_theme_get_settings (GWDTheme *theme)
-{
-    GWDThemePrivate *priv;
-
-    priv = gwd_theme_get_instance_private (theme);
-
-    return priv->settings;
-}
-
 void
 gwd_theme_get_shadow (GWDTheme               *theme,
                       decor_frame_t          *frame,

=== modified file 'gtk/window-decorator/gwd-theme.h'
--- gtk/window-decorator/gwd-theme.h	2016-05-20 11:56:36 +0000
+++ gtk/window-decorator/gwd-theme.h	2016-05-27 09:42:08 +0000
@@ -27,7 +27,6 @@
 
 typedef struct _decor decor_t;
 typedef struct _decor_frame decor_frame_t;
-typedef struct _GWDSettings GWDSettings;
 
 #define GWD_TYPE_THEME gwd_theme_get_type ()
 G_DECLARE_DERIVABLE_TYPE (GWDTheme, gwd_theme, GWD, THEME, GObject)
@@ -90,9 +89,6 @@
 gwd_theme_new                       (GWDThemeType            type,
                                      GWDSettings            *settings);
 
-GWDSettings *
-gwd_theme_get_settings              (GWDTheme               *theme);
-
 void
 gwd_theme_get_shadow                (GWDTheme               *theme,
                                      decor_frame_t          *frame,

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2016-05-27 09:42:08 +0000
+++ gtk/window-decorator/wnck.c	2016-05-27 09:42:08 +0000
@@ -190,7 +190,7 @@
     gdkdisplay = gdk_display_get_default ();
     gdkscreen  = gdk_display_get_default_screen (gdkdisplay);
 
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     const gchar *titlebar_font = gwd_settings_get_titlebar_font (settings);
 
     gwd_frames_foreach (set_frames_scales, (gpointer) titlebar_font);