Merge lp:~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1 into lp:compiz/0.9.8

[Sam Spilsbury]

Implements some cleanup that was suggested on the merge for the original port to gsettings

1) aligns variables and functions
2) makes functions static where they should be
3) C89 compliance

Fixes (LP: #1042323)

This implements some cleanup that was suggested on the merge for the original port to gsettings

1) aligns variables and functions
2) makes functions static where they should be
3) C89 compliance

Fixes (LP: #1042323)

The FFe is now acked and this branch can be merged

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3416
http://jenkins.qa.ubuntu.com/job/compiz-ci/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/27/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Copyrights changed to 2010?

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I saw at least one C89 conformance issue remaining, but forget that. If and when we tell the compiler to care, it will reveal all such problems for us.

Please just fix the copyright year.

[Sam Spilsbury (smspillaz)]

Thanks, I'll do that when I get home. We also need to merge this one into lp:~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo (for some reason it didn't get pushed up yesterday)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/33/console

review: Approve (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/37/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~compiz-team/compiz/compiz.gtk-window-decorator-gsettings into lp:compiz.

[Sam Spilsbury (smspillaz)]

Already approved, resubmitted without prereq

review: Approve

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2012-08-28 01:26:37 +0000
+++ gtk/window-decorator/CMakeLists.txt	2012-09-10 00:56:22 +0000
@@ -24,98 +24,98 @@
     )
 
     add_library (gtk_window_decorator_settings_interface STATIC
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-interface.c)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-interface.c)
 
     add_library (gtk_window_decorator_settings STATIC
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings.c)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings.c)
 
     add_library (gtk_window_decorator_settings_storage_interface STATIC
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-interface.c)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-interface.c)
 
     add_library (gtk_window_decorator_settings_storage_xproperty_interface STATIC
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-xproperty-interface.c)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-xproperty-interface.c)
 
     add_library (gtk_window_decorator_settings_writable_interface STATIC
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-writable-interface.c)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-writable-interface.c)
 
     add_library (gtk_window_decorator_settings_notified_interface
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-notified-interface.c)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-notified-interface.c)
 
     set (GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
-         gtk_window_decorator_settings_notified_interface
-         gtk_window_decorator_settings_interface
-         gtk_window_decorator_settings_writable_interface
-         gtk_window_decorator_settings
-         gtk_window_decorator_settings_storage_interface
-         gtk_window_decorator_settings_storage_xproperty_interface)
+	 gtk_window_decorator_settings_notified_interface
+	 gtk_window_decorator_settings_interface
+	 gtk_window_decorator_settings_writable_interface
+	 gtk_window_decorator_settings
+	 gtk_window_decorator_settings_storage_interface
+	 gtk_window_decorator_settings_storage_xproperty_interface)
 
     if (USE_GCONF)
-        set (gwd_schema ${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas)
-        compiz_translate_xml (
+	set (gwd_schema ${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas)
+	compiz_translate_xml (
 	    ${CMAKE_CURRENT_SOURCE_DIR}/gwd.schemas.in
 	    ${gwd_schema}
 	)
 	compiz_install_gconf_schema (${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas ${SCHEMADIR})
-        add_library (gtk_window_decorator_settings_storage_gconf STATIC
-                     ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gconf.c)
-        list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
-              gtk_window_decorator_settings_storage_gconf)
+	add_library (gtk_window_decorator_settings_storage_gconf STATIC
+		     ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gconf.c)
+	list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
+	      gtk_window_decorator_settings_storage_gconf)
     endif (USE_GCONF)
 
     if (USE_GSETTINGS)
-        add_definitions (-DUSE_GSETTINGS)
-        add_library (gtk_window_decorator_settings_storage_gsettings STATIC
-                     ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c)
-
-        compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0)
-
-        target_link_libraries (gtk_window_decorator_settings_storage_gsettings
-                               ${GSETTINGS_LIBRARIES})
-
-        list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
-              gtk_window_decorator_settings_storage_gsettings)
-
-        set (_gwd_gschema_name org.compiz.gwd)
-        set (_gwd_gschema_filename ${_gwd_gschema_name}.gschema.xml)
-        set (_gwd_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_gwd_gschema_filename})
-        set (_gwd_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_gwd_gschema_filename})
-        set (_gwd_gschema_dest ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/)
-
-        add_custom_command (OUTPUT ${_gwd_gschema_generated_location}
-                            COMMAND cp -r ${_gwd_gschema_filepath} ${_gwd_gschema_generated_location}
-                            DEPENDS ${_gwd_gschema_filepath}
-                            VERBATIM)
-
-        add_custom_target (compiz_gwd_gsettings_org_compiz_gwd_schema ALL
-                           DEPENDS ${_gwd_gschema_generated_location})
-
-        add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_compiz_gwd_schema)
-
-        compiz_install_gsettings_schema (${_gwd_gschema_generated_location}
-                                         ${_gwd_gschema_dest})
+	add_definitions (-DUSE_GSETTINGS)
+	add_library (gtk_window_decorator_settings_storage_gsettings STATIC
+		     ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c)
+
+	compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0)
+
+	target_link_libraries (gtk_window_decorator_settings_storage_gsettings
+			       ${GSETTINGS_LIBRARIES})
+
+	list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
+	      gtk_window_decorator_settings_storage_gsettings)
+
+	set (_gwd_gschema_name org.compiz.gwd)
+	set (_gwd_gschema_filename ${_gwd_gschema_name}.gschema.xml)
+	set (_gwd_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_gwd_gschema_filename})
+	set (_gwd_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_gwd_gschema_filename})
+	set (_gwd_gschema_dest ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/)
+
+	add_custom_command (OUTPUT ${_gwd_gschema_generated_location}
+			    COMMAND cp -r ${_gwd_gschema_filepath} ${_gwd_gschema_generated_location}
+			    DEPENDS ${_gwd_gschema_filepath}
+			    VERBATIM)
+
+	add_custom_target (compiz_gwd_gsettings_org_compiz_gwd_schema ALL
+			   DEPENDS ${_gwd_gschema_generated_location})
+
+	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_compiz_gwd_schema)
+
+	compiz_install_gsettings_schema (${_gwd_gschema_generated_location}
+					 ${_gwd_gschema_dest})
     endif (USE_GSETTINGS)
 
     add_executable (gtk-window-decorator
-	gtk-window-decorator.c
-	blurprops.c
-	decorprops.c
-	cairo.c
-	frames.c
-	gdk.c
-	switcher.c
-	metacity.c
-	events.c
-	forcequit.c
-	tooltip.c
-	actionmenu.c
-	settings.c
-	util.c
-	style.c
-	wnck.c
-	decorator.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-xproperty-storage.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-notified.c
-	${gwd_schema}
+		    gtk-window-decorator.c
+		    blurprops.c
+		    decorprops.c
+		    cairo.c
+		    frames.c
+		    gdk.c
+		    switcher.c
+		    metacity.c
+		    events.c
+		    forcequit.c
+		    tooltip.c
+		    actionmenu.c
+		    settings.c
+		    util.c
+		    style.c
+		    wnck.c
+		    decorator.c
+		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-xproperty-storage.c
+		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-notified.c
+		    ${gwd_schema}
     )
 
     add_dependencies (gtk-window-decorator decoration)
@@ -127,7 +127,7 @@
 
     target_link_libraries (
 	gtk-window-decorator
-        decoration
+	decoration
 	${GTK_WINDOW_DECORATOR_LIBRARIES}
 	${GCONF_LIBRARIES}
 	${DBUS_GLIB_LIBRARIES}

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2012-08-27 06:39:22 +0000
+++ gtk/window-decorator/frames.c	2012-09-10 00:56:22 +0000
@@ -36,14 +36,13 @@
 {
     decor_shadow_options_t active_o, inactive_o;
     decor_shadow_info_t *info;
+    const gchar *titlebar_font = NULL;
 
     gwd_decor_frame_ref (frame);
 
     update_style (frame->style_window_rgba);
     update_style (frame->style_window_rgb);
 
-    const gchar *titlebar_font = NULL;
-
     g_object_get (settings, "titlebar-font", &titlebar_font, NULL);
 
     set_frame_scale (frame, titlebar_font);

=== modified file 'gtk/window-decorator/gwd-settings-interface.c'
--- gtk/window-decorator/gwd-settings-interface.c	2012-08-27 06:39:22 +0000
+++ gtk/window-decorator/gwd-settings-interface.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include "gwd-settings-interface.h"
 
 const gboolean USE_TOOLTIPS_DEFAULT = FALSE;

=== modified file 'gtk/window-decorator/gwd-settings-interface.h'
--- gtk/window-decorator/gwd-settings-interface.h	2012-08-20 13:27:51 +0000
+++ gtk/window-decorator/gwd-settings-interface.h	2012-09-10 00:56:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010 Canonical Ltd
+ * Copyright © 2012 Canonical Ltd
  *
  * 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
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_INTERFACE_H
 #define _COMPIZ_GWD_SETTINGS_INTERFACE_H
 

=== modified file 'gtk/window-decorator/gwd-settings-notified-interface.c'
--- gtk/window-decorator/gwd-settings-notified-interface.c	2012-08-22 09:55:00 +0000
+++ gtk/window-decorator/gwd-settings-notified-interface.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include "gwd-settings-notified-interface.h"
 
 static void gwd_settings_notified_interface_default_init (GWDSettingsNotifiedInterface *settings_interface);

=== modified file 'gtk/window-decorator/gwd-settings-notified-interface.h'
--- gtk/window-decorator/gwd-settings-notified-interface.h	2012-08-22 11:17:43 +0000
+++ gtk/window-decorator/gwd-settings-notified-interface.h	2012-09-10 00:56:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010 Canonical Ltd
+ * Copyright © 2012 Canonical Ltd
  *
  * 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
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_NOTIFIED_INTERFACE_H
 #define _COMPIZ_GWD_SETTINGS_NOTIFIED_INTERFACE_H
 

=== modified file 'gtk/window-decorator/gwd-settings-notified.c'
--- gtk/window-decorator/gwd-settings-notified.c	2012-08-31 04:33:02 +0000
+++ gtk/window-decorator/gwd-settings-notified.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <glib-object.h>
 
 #include "gwd-settings-notified-interface.h"
@@ -244,21 +263,21 @@
 gwd_settings_notified_impl_new (WnckScreen *screen)
 {
     static const guint gwd_settings_notified_impl_n_construction_properties = 1;
-    GValue wnck_screen_value = G_VALUE_INIT;
+    GValue	       wnck_screen_value = G_VALUE_INIT;
+    GParameter	       params[gwd_settings_notified_impl_n_construction_properties];
+    GWDSettingsNotified *notified = NULL;
 
     g_value_init (&wnck_screen_value, G_TYPE_OBJECT);
     g_value_set_object (&wnck_screen_value, G_OBJECT (screen));
 
-    GParameter params[] =
-    {
-	{ "wnck-screen", wnck_screen_value }
-    };
+    params[0].name = "wnck-screen";
+    params[0].value = wnck_screen_value;
 
-    GWDSettingsNotified *storage = GWD_SETTINGS_NOTIFIED_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_NOTIFIED,
-										   gwd_settings_notified_impl_n_construction_properties,
-										   params));
+    notified = GWD_SETTINGS_NOTIFIED_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_NOTIFIED,
+							       gwd_settings_notified_impl_n_construction_properties,
+							       params));
 
     g_value_unset (&wnck_screen_value);
 
-    return storage;
+    return notified;
 }

=== modified file 'gtk/window-decorator/gwd-settings-notified.h'
--- gtk/window-decorator/gwd-settings-notified.h	2012-08-27 15:40:30 +0000
+++ gtk/window-decorator/gwd-settings-notified.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_NOTIFIED_H
 #define _COMPIZ_GWD_SETTINGS_NOTIFIED_H
 

=== modified file 'gtk/window-decorator/gwd-settings-storage-gconf.c'
--- gtk/window-decorator/gwd-settings-storage-gconf.c	2012-08-27 15:15:29 +0000
+++ gtk/window-decorator/gwd-settings-storage-gconf.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <glib-object.h>
 #include <string.h>
 
@@ -63,11 +82,12 @@
 
 typedef struct _GWDSettingsStorageGConfPrivate
 {
-    GConfClient	        *client;
+    GConfClient         *client;
     GWDSettingsWritable *writable;
 } GWDSettingsStorageGConfPrivate;
 
-gboolean gwd_settings_storage_gconf_update_use_tooltips (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_use_tooltips (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -78,7 +98,8 @@
 									      NULL));
 }
 
-gboolean gwd_settings_storage_gconf_update_draggable_border_width (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_draggable_border_width (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -89,7 +110,8 @@
 										       NULL));
 }
 
-gboolean gwd_settings_storage_gconf_update_attach_modal_dialogs (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_attach_modal_dialogs (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -100,7 +122,8 @@
 										      NULL));
 }
 
-gboolean gwd_settings_storage_gconf_update_blur (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_blur (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -117,7 +140,8 @@
     return ret;
 }
 
-gboolean gwd_settings_storage_gconf_update_metacity_theme (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_metacity_theme (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -138,7 +162,8 @@
     return ret;
 }
 
-gboolean gwd_settings_storage_gconf_update_opacity (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_opacity (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -158,7 +183,8 @@
 									 NULL));
 }
 
-gboolean gwd_settings_storage_gconf_update_button_layout (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_button_layout (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -176,7 +202,8 @@
     return ret;
 }
 
-gboolean gwd_settings_storage_gconf_update_font (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_font (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -197,7 +224,8 @@
     return ret;
 }
 
-gboolean gwd_settings_storage_gconf_update_titlebar_actions (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gconf_update_titlebar_actions (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGConf	   *storage = GWD_SETTINGS_STORAGE_GCONF (settings);
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (storage);
@@ -236,7 +264,8 @@
     return ret;
 }
 
-static void gwd_settings_storage_gconf_interface_init (GWDSettingsStorageInterface *interface)
+static void
+gwd_settings_storage_gconf_interface_init (GWDSettingsStorageInterface *interface)
 {
     interface->update_use_tooltips = gwd_settings_storage_gconf_update_use_tooltips;
     interface->update_draggable_border_width = gwd_settings_storage_gconf_update_draggable_border_width;
@@ -249,7 +278,8 @@
     interface->update_titlebar_actions = gwd_settings_storage_gconf_update_titlebar_actions;
 }
 
-static void gwd_settings_storage_gconf_dispose (GObject *object)
+static void
+gwd_settings_storage_gconf_dispose (GObject *object)
 {
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (object);
 
@@ -262,15 +292,17 @@
 	g_object_unref (priv->writable);
 }
 
-static void gwd_settings_storage_gconf_finalize (GObject *object)
+static void
+gwd_settings_storage_gconf_finalize (GObject *object)
 {
     G_OBJECT_CLASS (gwd_settings_storage_gconf_parent_class)->finalize (object);
 }
 
-static void gwd_settings_storage_gconf_set_property (GObject *object,
-						     guint   property_id,
-						     const GValue *value,
-						     GParamSpec *pspec)
+static void
+gwd_settings_storage_gconf_set_property (GObject *object,
+					 guint   property_id,
+					 const GValue *value,
+					 GParamSpec *pspec)
 {
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (object);
 
@@ -285,7 +317,8 @@
     }
 }
 
-static void gwd_settings_storage_gconf_class_init (GWDSettingsStorageGConfClass *klass)
+static void
+gwd_settings_storage_gconf_class_init (GWDSettingsStorageGConfClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -342,7 +375,8 @@
 	gwd_settings_storage_update_use_tooltips (storage);
 }
 
-void gwd_settings_storage_gconf_init (GWDSettingsStorageGConf *self)
+void
+gwd_settings_storage_gconf_init (GWDSettingsStorageGConf *self)
 {
     GWDSettingsStorageGConfPrivate *priv = GET_PRIVATE (self);
 
@@ -372,16 +406,20 @@
 GWDSettingsStorage *
 gwd_settings_storage_gconf_new (GWDSettingsWritable *writable)
 {
-    GValue writable_value = G_VALUE_INIT;
+    GValue             writable_value = G_VALUE_INIT;
+    static const guint gwd_settings_storage_gconf_n_construction_params = 1;
+    GParameter         param[gwd_settings_storage_gconf_n_construction_params];
+    GWDSettingsStorage *storage = NULL;
+
     g_value_init (&writable_value, G_TYPE_POINTER);
-
     g_value_set_pointer (&writable_value, writable);
 
-    GParameter param[] =
-    {
-	{ "writable-settings", writable_value }
-    };
-
-    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_GCONF, 1, param));
+    param[0].name = "writable-settings";
+    param[0].value = writable_value;
+
+    storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_GCONF, 1, param));
+
+    g_value_unset (&writable_value);
+
     return storage;
 }

=== modified file 'gtk/window-decorator/gwd-settings-storage-gconf.h'
--- gtk/window-decorator/gwd-settings-storage-gconf.h	2012-08-25 14:08:06 +0000
+++ gtk/window-decorator/gwd-settings-storage-gconf.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_STORAGE_GCONF_H
 #define _COMPIZ_GWD_SETTINGS_STORAGE_GCONF_H
 

=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.c'
--- gtk/window-decorator/gwd-settings-storage-gsettings.c	2012-09-03 08:47:34 +0000
+++ gtk/window-decorator/gwd-settings-storage-gsettings.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <glib-object.h>
 
 #include <gio/gio.h>
@@ -72,7 +91,8 @@
     GWDSettingsWritable *writable;
 } GWDSettingsStorageGSettingsPrivate;
 
-gboolean gwd_settings_storage_gsettings_update_use_tooltips (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_use_tooltips (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -85,7 +105,8 @@
 									       ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS));
 }
 
-gboolean gwd_settings_storage_gsettings_update_draggable_border_width (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_draggable_border_width (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -98,7 +119,8 @@
 										     ORG_GNOME_MUTTER_DRAGGABLE_BORDER_WIDTH));
 }
 
-gboolean gwd_settings_storage_gsettings_update_attach_modal_dialogs (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_attach_modal_dialogs (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -111,7 +133,8 @@
 										       ORG_GNOME_MUTTER_ATTACH_MODAL_DIALOGS));
 }
 
-gboolean gwd_settings_storage_gsettings_update_blur (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_blur (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -124,7 +147,8 @@
 								      ORG_COMPIZ_GWD_KEY_BLUR_TYPE));
 }
 
-gboolean gwd_settings_storage_gsettings_update_metacity_theme (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_metacity_theme (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -142,7 +166,8 @@
 										ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME));
 }
 
-gboolean gwd_settings_storage_gsettings_update_opacity (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_opacity (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -161,7 +186,8 @@
 									  ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_SHADE_OPACITY));
 }
 
-gboolean gwd_settings_storage_gsettings_update_button_layout (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_button_layout (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -174,7 +200,8 @@
 									       ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT));
 }
 
-gboolean gwd_settings_storage_gsettings_update_font (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_font (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -189,7 +216,7 @@
 								      ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT));
 }
 
-static gchar *
+static inline gchar *
 translate_dashes_to_underscores (const gchar *original)
 {
     gint i = 0;
@@ -207,7 +234,8 @@
     return copy;
 }
 
-gboolean gwd_settings_storage_gsettings_update_titlebar_actions (GWDSettingsStorage *settings)
+static gboolean
+gwd_settings_storage_gsettings_update_titlebar_actions (GWDSettingsStorage *settings)
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
@@ -242,7 +270,8 @@
 	g_free (right_click_action);
 }
 
-static void gwd_settings_storage_gsettings_interface_init (GWDSettingsStorageInterface *interface)
+static void
+gwd_settings_storage_gsettings_interface_init (GWDSettingsStorageInterface *interface)
 {
     interface->update_use_tooltips = gwd_settings_storage_gsettings_update_use_tooltips;
     interface->update_draggable_border_width = gwd_settings_storage_gsettings_update_draggable_border_width;
@@ -255,10 +284,11 @@
     interface->update_titlebar_actions = gwd_settings_storage_gsettings_update_titlebar_actions;
 }
 
-static void gwd_settings_storage_gsettings_set_property (GObject *object,
-						     guint   property_id,
-						     const GValue  *value,
-						     GParamSpec *pspec)
+static void
+gwd_settings_storage_gsettings_set_property (GObject *object,
+					     guint   property_id,
+					     const GValue  *value,
+					     GParamSpec *pspec)
 {
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (object);
 
@@ -290,7 +320,8 @@
     }
 }
 
-static void gwd_settings_storage_gsettings_dispose (GObject *object)
+static void
+gwd_settings_storage_gsettings_dispose (GObject *object)
 {
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (object);
 
@@ -306,22 +337,17 @@
 	g_object_unref (priv->gwd);
 }
 
-static void gwd_settings_storage_gsettings_finalize (GObject *object)
+static void
+gwd_settings_storage_gsettings_finalize (GObject *object)
 {
     G_OBJECT_CLASS (gwd_settings_storage_gsettings_parent_class)->finalize (object);
 }
 
-static void gwd_settings_storage_gsettings_class_init (GWDSettingsStorageGSettingsClass *klass)
+static void
+gwd_settings_storage_gsettings_class_init (GWDSettingsStorageGSettingsClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-    g_type_class_add_private (klass, sizeof (GWDSettingsStorageGSettingsPrivate));
-
-    object_class->dispose = gwd_settings_storage_gsettings_dispose;
-    object_class->finalize = gwd_settings_storage_gsettings_finalize;
-    object_class->set_property = gwd_settings_storage_gsettings_set_property;
-
-    GParamSpec * properties[] =
+    GParamSpec   *properties[] =
     {
 	NULL,
 	g_param_spec_object ("desktop-gsettings",
@@ -345,6 +371,12 @@
 			      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)
     };
 
+    g_type_class_add_private (klass, sizeof (GWDSettingsStorageGSettingsPrivate));
+
+    object_class->dispose = gwd_settings_storage_gsettings_dispose;
+    object_class->finalize = gwd_settings_storage_gsettings_finalize;
+    object_class->set_property = gwd_settings_storage_gsettings_set_property;
+
     g_object_class_install_properties (object_class,
 				       sizeof (properties) / sizeof (properties[0]),
 				       properties);
@@ -361,12 +393,15 @@
 				    GWDSettingsWritable *writable)
 {
     static const guint gwd_settings_storage_gsettings_n_construction_params = 4;
+    GParameter         param[gwd_settings_storage_gsettings_n_construction_params];
 
     GValue desktop_value = G_VALUE_INIT;
     GValue mutter_value = G_VALUE_INIT;
     GValue gwd_value = G_VALUE_INIT;
     GValue writable_value = G_VALUE_INIT;
 
+    GWDSettingsStorage *storage = NULL;
+
     g_return_val_if_fail (writable != NULL, NULL);
 
     g_value_init (&desktop_value, G_TYPE_OBJECT);
@@ -379,17 +414,18 @@
     g_value_take_object (&gwd_value, gwd);
     g_value_set_pointer (&writable_value, writable);
 
-    GParameter param[] =
-    {
-	{ "desktop-gsettings", desktop_value },
-	{ "mutter-gsettings", mutter_value },
-	{ "gwd-gsettings", gwd_value },
-	{ "writable-settings", writable_value }
-    };
+    param[0].name = "desktop-gsettings";
+    param[0].value = desktop_value;
+    param[1].name = "mutter-gsettings";
+    param[1].value = mutter_value;
+    param[2].name = "gwd-gsettings";
+    param[2].value = gwd_value;
+    param[3].name = "writable-settings";
+    param[3].value = writable_value;
 
-    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_GSETTINGS,
-										 gwd_settings_storage_gsettings_n_construction_params,
-										 param));
+    storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_GSETTINGS,
+							     gwd_settings_storage_gsettings_n_construction_params,
+							     param));
 
     g_value_unset (&desktop_value);
     g_value_unset (&mutter_value);
@@ -410,12 +446,12 @@
 static inline GSettings *
 get_settings_no_abort (const gchar *schema)
 {
-    static GOnce get_settings_once = G_ONCE_INIT;
+    static GOnce	   get_settings_once = G_ONCE_INIT;
+    const  gchar * const * schemas;
+    guint                  i = 0;
 
     g_once (&get_settings_once, list_all_schemas, NULL);
-
-    const gchar * const * schemas = (const gchar * const *) get_settings_once.retval;
-    guint                        i = 0;
+    schemas = (const gchar * const *) get_settings_once.retval;
 
     for (; schemas[i]; i++)
 	if (g_strcmp0 (schema, schemas[i]) == 0)

=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.h'
--- gtk/window-decorator/gwd-settings-storage-gsettings.h	2012-08-31 04:33:02 +0000
+++ gtk/window-decorator/gwd-settings-storage-gsettings.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_STORAGE_GSETTINGS_H
 #define _COMPIZ_GWD_SETTINGS_STORAGE_GSETTINGS_H
 

=== modified file 'gtk/window-decorator/gwd-settings-storage-interface.c'
--- gtk/window-decorator/gwd-settings-storage-interface.c	2012-08-21 13:39:45 +0000
+++ gtk/window-decorator/gwd-settings-storage-interface.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include "gwd-settings-storage-interface.h"
 
 static void gwd_settings_storage_interface_default_init (GWDSettingsStorageInterface *settings_interface);

=== modified file 'gtk/window-decorator/gwd-settings-storage-interface.h'
--- gtk/window-decorator/gwd-settings-storage-interface.h	2012-08-21 13:09:27 +0000
+++ gtk/window-decorator/gwd-settings-storage-interface.h	2012-09-10 00:56:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010 Canonical Ltd
+ * Copyright © 2012 Canonical Ltd
  *
  * 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
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_STORAGE_INTERFACE_H
 #define _COMPIZ_GWD_SETTINGS_STORAGE_INTERFACE_H
 
@@ -26,7 +27,7 @@
 #define GWD_SETTINGS_STORAGE_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
 					     GWD_TYPE_SETTINGS_STORAGE_INTERFACE, \
 					     GWDSettingsStorage))
-#define GWD_SETTINGS_STORAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE(obj, \
+#define GWD_SETTINGS_STORAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE (obj, \
 										GWD_TYPE_SETTINGS_STORAGE_INTERFACE, \
 										GWDSettingsStorageInterface))
 #define GWD_TYPE_SETTINGS_STORAGE_INTERFACE (gwd_settings_storage_interface_get_type ())

=== modified file 'gtk/window-decorator/gwd-settings-writable-interface.c'
--- gtk/window-decorator/gwd-settings-writable-interface.c	2012-08-27 14:38:32 +0000
+++ gtk/window-decorator/gwd-settings-writable-interface.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include "gwd-settings-writable-interface.h"
 
 static void gwd_settings_writable_interface_default_init (GWDSettingsWritableInterface *settings_interface);
@@ -24,16 +43,16 @@
 
 gboolean
 gwd_settings_writable_shadow_property_changed (GWDSettingsWritable *settings,
-					       gdouble     active_shadow_radius,
-					       gdouble     active_shadow_opacity,
-					       gdouble     active_shadow_offset_x,
-					       gdouble     active_shadow_offset_y,
-					       const gchar *active_shadow_color,
-					       gdouble     inactive_shadow_radius,
-					       gdouble     inactive_shadow_opacity,
-					       gdouble     inactive_shadow_offset_x,
-					       gdouble     inactive_shadow_offset_y,
-					       const gchar *inactive_shadow_color)
+					       gdouble             active_shadow_radius,
+					       gdouble             active_shadow_opacity,
+					       gdouble             active_shadow_offset_x,
+					       gdouble             active_shadow_offset_y,
+					       const gchar         *active_shadow_color,
+					       gdouble             inactive_shadow_radius,
+					       gdouble             inactive_shadow_opacity,
+					       gdouble             inactive_shadow_offset_x,
+					       gdouble             inactive_shadow_offset_y,
+					       const gchar         *inactive_shadow_color)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->shadow_property_changed) (settings,
@@ -51,7 +70,7 @@
 
 gboolean
 gwd_settings_writable_use_tooltips_changed (GWDSettingsWritable *settings,
-					    gboolean    use_tooltips)
+					    gboolean            use_tooltips)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->use_tooltips_changed) (settings, use_tooltips);
@@ -59,7 +78,7 @@
 
 gboolean
 gwd_settings_writable_draggable_border_width_changed (GWDSettingsWritable *settings,
-						      gint	 draggable_border_width)
+						      gint	         draggable_border_width)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->draggable_border_width_changed) (settings, draggable_border_width);
@@ -67,7 +86,7 @@
 
 gboolean
 gwd_settings_writable_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
-						    gboolean    attach_modal_dialogs)
+						    gboolean            attach_modal_dialogs)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->attach_modal_dialogs_changed) (settings, attach_modal_dialogs);
@@ -83,8 +102,8 @@
 
 gboolean
 gwd_settings_writable_metacity_theme_changed (GWDSettingsWritable *settings,
-					      gboolean	 use_metacity_theme,
-					      const gchar *metacity_theme)
+					      gboolean	          use_metacity_theme,
+					      const gchar         *metacity_theme)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->metacity_theme_changed) (settings, use_metacity_theme, metacity_theme);
@@ -92,10 +111,10 @@
 
 gboolean
 gwd_settings_writable_opacity_changed (GWDSettingsWritable *settings,
-				       gdouble active_opacity,
-				       gdouble inactive_opacity,
-				       gboolean active_shade_opacity,
-				       gboolean inactive_shade_opacity)
+				       gdouble             active_opacity,
+				       gdouble             inactive_opacity,
+				       gboolean            active_shade_opacity,
+				       gboolean            inactive_shade_opacity)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->opacity_changed) (settings, active_opacity, inactive_opacity, active_shade_opacity, inactive_shade_opacity);
@@ -103,7 +122,7 @@
 
 gboolean
 gwd_settings_writable_button_layout_changed (GWDSettingsWritable *settings,
-					     const gchar *button_layout)
+					     const gchar         *button_layout)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->button_layout_changed) (settings, button_layout);
@@ -120,10 +139,10 @@
 
 gboolean
 gwd_settings_writable_titlebar_actions_changed (GWDSettingsWritable *settings,
-						const gchar	   *action_double_click_titlebar,
-						const gchar	   *action_middle_click_titlebar,
-						const gchar	   *action_right_click_titlebar,
-						const gchar	   *mouse_wheel_action)
+						const gchar	    *action_double_click_titlebar,
+						const gchar	    *action_middle_click_titlebar,
+						const gchar	    *action_right_click_titlebar,
+						const gchar	    *mouse_wheel_action)
 {
     GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
     return (*iface->titlebar_actions_changed) (settings,

=== modified file 'gtk/window-decorator/gwd-settings-writable-interface.h'
--- gtk/window-decorator/gwd-settings-writable-interface.h	2012-08-27 14:38:32 +0000
+++ gtk/window-decorator/gwd-settings-writable-interface.h	2012-09-10 00:56:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010 Canonical Ltd
+ * Copyright © 2012 Canonical Ltd
  *
  * 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
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_WRITABLE_INTERFACE_H
 #define _COMPIZ_GWD_SETTINGS_WRITABLE_INTERFACE_H
 
@@ -26,9 +27,9 @@
 #define GWD_SETTINGS_WRITABLE_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
 					      GWD_TYPE_WRITABLE_SETTINGS_INTERFACE, \
 					      GWDSettingsWritable))
-#define GWD_SETTINGS_WRITABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE(obj, \
-										GWD_TYPE_WRITABLE_SETTINGS_INTERFACE, \
-										GWDSettingsWritableInterface))
+#define GWD_SETTINGS_WRITABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE (obj, \
+										 GWD_TYPE_WRITABLE_SETTINGS_INTERFACE, \
+										 GWDSettingsWritableInterface))
 #define GWD_TYPE_WRITABLE_SETTINGS_INTERFACE (gwd_settings_writable_interface_get_type ())
 
 typedef struct _GWDSettingsWritable GWDSettingsWritable;
@@ -41,27 +42,34 @@
     void     (*freeze_updates) (GWDSettingsWritable *settings);
     void     (*thaw_updates)   (GWDSettingsWritable *settings);
     gboolean (*shadow_property_changed) (GWDSettingsWritable *settings,
-					 gdouble     active_shadow_radius,
-					 gdouble     active_shadow_opacity,
-					 gdouble     active_shadow_offset_x,
-					 gdouble     active_shadow_offset_y,
-					 const gchar *active_shadow_color,
-					 gdouble     inactive_shadow_radius,
-					 gdouble     inactive_shadow_opacity,
-					 gdouble     inactive_shadow_offset_x,
-					 gdouble     inactive_shadow_offset_y,
-					 const gchar *inactive_shadow_color);
-    gboolean (*use_tooltips_changed) (GWDSettingsWritable *settings, gboolean new_value);
-    gboolean (*draggable_border_width_changed) (GWDSettingsWritable *settings, gint new_value);
-    gboolean (*attach_modal_dialogs_changed) (GWDSettingsWritable *settings, gboolean new_value);
-    gboolean (*blur_changed) (GWDSettingsWritable *settings, const gchar *type);
-    gboolean (*metacity_theme_changed) (GWDSettingsWritable *settings, gboolean use_metacity_theme, const gchar *metacity_theme);
+					 gdouble             active_shadow_radius,
+					 gdouble             active_shadow_opacity,
+					 gdouble             active_shadow_offset_x,
+					 gdouble             active_shadow_offset_y,
+					 const gchar         *active_shadow_color,
+					 gdouble             inactive_shadow_radius,
+					 gdouble             inactive_shadow_opacity,
+					 gdouble             inactive_shadow_offset_x,
+					 gdouble             inactive_shadow_offset_y,
+					 const gchar         *inactive_shadow_color);
+    gboolean (*use_tooltips_changed) (GWDSettingsWritable *settings,
+				      gboolean            new_value);
+    gboolean (*draggable_border_width_changed) (GWDSettingsWritable *settings,
+						gint                new_value);
+    gboolean (*attach_modal_dialogs_changed) (GWDSettingsWritable *settings,
+					      gboolean            new_value);
+    gboolean (*blur_changed) (GWDSettingsWritable *settings,
+			      const gchar         *type);
+    gboolean (*metacity_theme_changed) (GWDSettingsWritable *settings,
+					gboolean            use_metacity_theme,
+					const gchar         *metacity_theme);
     gboolean (*opacity_changed) (GWDSettingsWritable *settings,
-				 gdouble active_opacity,
-				 gdouble inactive_opacity,
-				 gboolean active_shade_opacity,
-				 gboolean inactive_shade_opacity);
-    gboolean (*button_layout_changed) (GWDSettingsWritable *settings, const gchar *button_layout);
+				 gdouble             active_opacity,
+				 gdouble             inactive_opacity,
+				 gboolean            active_shade_opacity,
+				 gboolean            inactive_shade_opacity);
+    gboolean (*button_layout_changed) (GWDSettingsWritable *settings,
+				       const gchar         *button_layout);
     gboolean (*font_changed) (GWDSettingsWritable *settings,
 			      gboolean		  titlebar_uses_system_font,
 			      const gchar	  *titlebar_font);
@@ -80,48 +88,48 @@
 
 gboolean
 gwd_settings_writable_shadow_property_changed (GWDSettingsWritable *settings,
-					       gdouble     active_shadow_radius,
-					       gdouble     active_shadow_opacity,
-					       gdouble     active_shadow_offset_x,
-					       gdouble     active_shadow_offset_y,
-					       const gchar *active_shadow_color,
-					       gdouble     inactive_shadow_radius,
-					       gdouble     inactive_shadow_opacity,
-					       gdouble     inactive_shadow_offset_x,
-					       gdouble     inactive_shadow_offset_y,
-					       const gchar *inactive_shadow_color);
+					       gdouble             active_shadow_radius,
+					       gdouble             active_shadow_opacity,
+					       gdouble             active_shadow_offset_x,
+					       gdouble             active_shadow_offset_y,
+					       const gchar         *active_shadow_color,
+					       gdouble             inactive_shadow_radius,
+					       gdouble             inactive_shadow_opacity,
+					       gdouble             inactive_shadow_offset_x,
+					       gdouble             inactive_shadow_offset_y,
+					       const gchar         *inactive_shadow_color);
 
 gboolean
 gwd_settings_writable_use_tooltips_changed (GWDSettingsWritable *settings,
-					    gboolean    use_tooltips);
+					    gboolean            use_tooltips);
 
 gboolean
 gwd_settings_writable_draggable_border_width_changed (GWDSettingsWritable *settings,
-						      gint	 draggable_border_width);
+						      gint	          draggable_border_width);
 
 gboolean
 gwd_settings_writable_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
-						    gboolean    attach_modal_dialogs);
+						    gboolean            attach_modal_dialogs);
 
 gboolean
 gwd_settings_writable_blur_changed (GWDSettingsWritable *settings,
-				    const gchar *blur_type);
+				    const gchar         *blur_type);
 
 gboolean
 gwd_settings_writable_metacity_theme_changed (GWDSettingsWritable *settings,
-					      gboolean	 use_metacity_theme,
-					      const gchar *metacity_theme);
+					      gboolean	          use_metacity_theme,
+					      const gchar         *metacity_theme);
 
 gboolean
 gwd_settings_writable_opacity_changed (GWDSettingsWritable *settings,
-				       gdouble active_opacity,
-				       gdouble inactive_opacity,
-				       gboolean active_shade_opacity,
-				       gboolean inactive_shade_opacity);
+				       gdouble             active_opacity,
+				       gdouble             inactive_opacity,
+				       gboolean            active_shade_opacity,
+				       gboolean            inactive_shade_opacity);
 
 gboolean
 gwd_settings_writable_button_layout_changed (GWDSettingsWritable *settings,
-					     const gchar *button_layout);
+					     const gchar         *button_layout);
 
 gboolean
 gwd_settings_writable_font_changed (GWDSettingsWritable *settings,
@@ -130,10 +138,10 @@
 
 gboolean
 gwd_settings_writable_titlebar_actions_changed (GWDSettingsWritable *settings,
-						const gchar	   *action_double_click_titlebar,
-						const gchar	   *action_middle_click_titlebar,
-						const gchar	   *action_right_click_titlebar,
-						const gchar	   *mouse_wheel_action);
+						const gchar	    *action_double_click_titlebar,
+						const gchar	    *action_middle_click_titlebar,
+						const gchar	    *action_right_click_titlebar,
+						const gchar	    *mouse_wheel_action);
 
 GType gwd_settings_writable_interface_get_type (void);
 

=== modified file 'gtk/window-decorator/gwd-settings-xproperty-interface.c'
--- gtk/window-decorator/gwd-settings-xproperty-interface.c	2012-08-28 04:45:17 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-interface.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include "gwd-settings-xproperty-interface.h"
 
 static void gwd_settings_xproperty_storage_interface_default_init (GWDSettingsXPropertyStorageInterface *settings_interface);

=== modified file 'gtk/window-decorator/gwd-settings-xproperty-interface.h'
--- gtk/window-decorator/gwd-settings-xproperty-interface.h	2012-08-28 04:45:17 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-interface.h	2012-09-10 00:56:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010 Canonical Ltd
+ * Copyright © 2012 Canonical Ltd
  *
  * 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
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_XPROPERTY_STORAGE_INTERFACE_H
 #define _COMPIZ_GWD_SETTINGS_XPROPERTY_STORAGE_INTERFACE_H
 

=== modified file 'gtk/window-decorator/gwd-settings-xproperty-storage.c'
--- gtk/window-decorator/gwd-settings-xproperty-storage.c	2012-08-31 04:33:02 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-storage.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <glib-object.h>
 #include <string.h>
 
@@ -40,34 +59,35 @@
 
 typedef struct _GWDSettingsStorageXPropPrivate
 {
-    Display *xdpy;
-    Window  root;
+    Display             *xdpy;
+    Window              root;
     GWDSettingsWritable *writable;
 
 } GWDSettingsStorageXPropPrivate;
 
-static gboolean gwd_settings_storage_xprop_update_all (GWDSettingsXPropertyStorage *storage)
+static gboolean
+gwd_settings_storage_xprop_update_all (GWDSettingsXPropertyStorage *storage)
 {
-    GWDSettingsStorageXProp *xprop = GWD_SETTINGS_STORAGE_XPROP (storage);
+    GWDSettingsStorageXProp        *xprop = GWD_SETTINGS_STORAGE_XPROP (storage);
     GWDSettingsStorageXPropPrivate *priv = GET_PRIVATE (xprop);
 
-    Atom actual;
-    int  result, format;
+    Atom          actual;
+    int           result, format;
     unsigned long n, left;
     unsigned char *prop_data;
     XTextProperty shadow_color_xtp;
 
     gdouble aradius;
     gdouble aopacity;
-    gint ax_off;
-    gint ay_off;
-    char *active_shadow_color = NULL;
+    gint    ax_off;
+    gint    ay_off;
+    char    *active_shadow_color = NULL;
 
     gdouble iradius;
     gdouble iopacity;
-    gint ix_off;
-    gint iy_off;
-    char *inactive_shadow_color = NULL;
+    gint    ix_off;
+    gint    iy_off;
+    char    *inactive_shadow_color = NULL;
 
     result = XGetWindowProperty (priv->xdpy, priv->root, compiz_shadow_info_atom,
 				 0, 32768, 0, XA_INTEGER, &actual,
@@ -143,12 +163,14 @@
 							  inactive_shadow_color);
 }
 
-static void gwd_settings_storage_xprop_interface_init (GWDSettingsXPropertyStorageInterface *interface)
+static void
+gwd_settings_storage_xprop_interface_init (GWDSettingsXPropertyStorageInterface *interface)
 {
     interface->update_all = gwd_settings_storage_xprop_update_all;
 }
 
-static void gwd_settings_storage_xprop_dispose (GObject *object)
+static void
+gwd_settings_storage_xprop_dispose (GObject *object)
 {
     GWDSettingsStorageXPropPrivate *priv = GET_PRIVATE (object);
 
@@ -158,15 +180,17 @@
 	g_object_unref (priv->writable);
 }
 
-static void gwd_settings_storage_xprop_finalize (GObject *object)
+static void
+gwd_settings_storage_xprop_finalize (GObject *object)
 {
     G_OBJECT_CLASS (gwd_settings_storage_xprop_parent_class)->finalize (object);
 }
 
-static void gwd_settings_storage_xprop_set_property (GObject *object,
-						     guint   property_id,
-						     const GValue *value,
-						     GParamSpec *pspec)
+static void
+gwd_settings_storage_xprop_set_property (GObject *object,
+					 guint   property_id,
+					 const GValue *value,
+					 GParamSpec *pspec)
 {
     GWDSettingsStorageXPropPrivate *priv = GET_PRIVATE (object);
 
@@ -189,7 +213,8 @@
     }
 }
 
-static void gwd_settings_storage_xprop_class_init (GWDSettingsStorageXPropClass *klass)
+static void
+gwd_settings_storage_xprop_class_init (GWDSettingsStorageXPropClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -225,7 +250,8 @@
 						       G_PARAM_CONSTRUCT_ONLY));
 }
 
-void gwd_settings_storage_xprop_init (GWDSettingsStorageXProp *self)
+static void
+gwd_settings_storage_xprop_init (GWDSettingsStorageXProp *self)
 {
 }
 
@@ -234,9 +260,15 @@
 				Window  root,
 				GWDSettingsWritable *writable)
 {
+    static const guint          gwd_settings_xprop_storage_n_construction_params = 3;
+    GParameter                  param[gwd_settings_xprop_storage_n_construction_params];
+    GWDSettingsXPropertyStorage *storage = NULL;
+
     GValue display_value = G_VALUE_INIT;
     GValue root_window_value = G_VALUE_INIT;
     GValue writable_value = G_VALUE_INIT;
+
+
     g_value_init (&display_value, G_TYPE_POINTER);
     g_value_init (&root_window_value, G_TYPE_INT);
     g_value_init (&writable_value, G_TYPE_POINTER);
@@ -245,17 +277,20 @@
     g_value_set_int (&root_window_value, root);
     g_value_set_pointer (&writable_value, writable);
 
-    static const guint gwd_settings_xprop_storage_n_construction_params = 3;
-
-    GParameter param[] =
-    {
-	{ "writable-settings", writable_value },
-	{ "display", display_value },
-	{ "root-window", root_window_value }
-    };
-
-    GWDSettingsXPropertyStorage *storage = GWD_SETTINGS_XPROPERTY_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_XPROP,
-												    gwd_settings_xprop_storage_n_construction_params,
-												    param));
+    param[0].name = "writable-settings";
+    param[0].value = writable_value;
+    param[1].name = "display";
+    param[1].value = display_value;
+    param[2].name = "root-window";
+    param[2].value = root_window_value;
+
+    storage = GWD_SETTINGS_XPROPERTY_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_XPROP,
+								       gwd_settings_xprop_storage_n_construction_params,
+								       param));
+
+    g_value_unset (&display_value);
+    g_value_unset (&root_window_value);
+    g_value_unset (&writable_value);
+
     return storage;
 }

=== modified file 'gtk/window-decorator/gwd-settings-xproperty-storage.h'
--- gtk/window-decorator/gwd-settings-xproperty-storage.h	2012-08-28 04:45:17 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-storage.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_STORAGE_XPROP_H
 #define _COMPIZ_GWD_SETTINGS_STORAGE_XPROP_H
 
@@ -23,6 +24,8 @@
 
 typedef struct _GWDSettingsWritable GWDSettingsWritable;
 typedef struct _GWDSettingsXPropertyStorage GWDSettingsXPropertyStorage;
+typedef struct _XDisplay Display;
+typedef unsigned long Window;
 
 G_BEGIN_DECLS
 

=== modified file 'gtk/window-decorator/gwd-settings.c'
--- gtk/window-decorator/gwd-settings.c	2012-09-03 08:47:34 +0000
+++ gtk/window-decorator/gwd-settings.c	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <glib-object.h>
 
 #include <stdlib.h>
@@ -65,10 +84,6 @@
     CMDLINE_THEME = (1 << 1)
 };
 
-/* Always N command line parameters + 2 for command line
- * options enum & notified */
-const guint GWD_SETTINGS_IMPL_N_CONSTRUCTION_PARAMS = 4;
-
 typedef gboolean (*NotifyFunc) (GWDSettingsNotified *);
 
 typedef struct _GWDSettingsImplPrivate
@@ -147,12 +162,12 @@
 				      gdouble     inactive_shadow_offset_y,
 				      const gchar *inactive_shadow_color)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     decor_shadow_options_t active_shadow, inactive_shadow;
-
-    unsigned int c[4];
+    unsigned int           c[4];
+    gboolean               changed = FALSE;
 
     active_shadow.shadow_radius = active_shadow_radius;
     active_shadow.shadow_opacity = active_shadow_opacity;
@@ -186,8 +201,6 @@
     inactive_shadow.shadow_offset_x = inactive_shadow_offset_x;
     inactive_shadow.shadow_offset_y = inactive_shadow_offset_y;
 
-    gboolean changed = FALSE;
-
     if (decor_shadow_options_cmp (&priv->inactive_shadow,
 				  &inactive_shadow))
     {
@@ -211,11 +224,11 @@
     return changed;
 }
 
-gboolean
+static gboolean
 gwd_settings_use_tooltips_changed (GWDSettingsWritable *settings,
-				   gboolean    use_tooltips)
+				   gboolean            use_tooltips)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (priv->use_tooltips != use_tooltips)
@@ -229,11 +242,11 @@
     return FALSE;
 }
 
-gboolean
+static gboolean
 gwd_settings_draggable_border_width_changed (GWDSettingsWritable *settings,
-					     gint	 draggable_border_width)
+					     gint	         draggable_border_width)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (priv->draggable_border_width != draggable_border_width)
@@ -247,11 +260,11 @@
 	return FALSE;
 }
 
-gboolean
+static gboolean
 gwd_settings_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
-					   gboolean    attach_modal_dialogs)
+					   gboolean            attach_modal_dialogs)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (priv->attach_modal_dialogs != attach_modal_dialogs)
@@ -265,12 +278,12 @@
 	return FALSE;
 }
 
-gboolean
+static gboolean
 gwd_settings_blur_changed (GWDSettingsWritable *settings,
-			   const gchar *type)
+			   const gchar         *type)
 
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
     gint new_type = -1;
 
@@ -302,7 +315,7 @@
 free_and_set_metacity_theme (GWDSettingsWritable *settings,
 			     const gchar	 *metacity_theme)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (priv->metacity_theme)
@@ -311,12 +324,12 @@
     priv->metacity_theme = g_strdup (metacity_theme);
 }
 
-gboolean
+static gboolean
 gwd_settings_metacity_theme_changed (GWDSettingsWritable *settings,
-				     gboolean	 use_metacity_theme,
-				     const gchar *metacity_theme)
+				     gboolean	         use_metacity_theme,
+				     const gchar         *metacity_theme)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (priv->cmdline_opts & CMDLINE_THEME)
@@ -342,14 +355,14 @@
     return TRUE;
 }
 
-gboolean
+static gboolean
 gwd_settings_opacity_changed (GWDSettingsWritable *settings,
-			      gdouble inactive_opacity,
-			      gdouble active_opacity,
-			      gboolean inactive_shade_opacity,
-			      gboolean active_shade_opacity)
+			      gdouble             inactive_opacity,
+			      gdouble             active_opacity,
+			      gboolean            inactive_shade_opacity,
+			      gboolean            active_shade_opacity)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (priv->metacity_active_opacity == active_opacity &&
@@ -369,11 +382,11 @@
     return TRUE;
 }
 
-gboolean
+static gboolean
 gwd_settings_button_layout_changed (GWDSettingsWritable *settings,
-				    const gchar *button_layout)
+				    const gchar         *button_layout)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     if (!button_layout)
@@ -394,20 +407,20 @@
     return TRUE;
 }
 
-gboolean
+static gboolean
 gwd_settings_font_changed (GWDSettingsWritable *settings,
-			   gboolean		titlebar_uses_system_font,
-			   const gchar		*titlebar_font)
+			   gboolean            titlebar_uses_system_font,
+			   const gchar         *titlebar_font)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
-    if (!titlebar_font)
-	return FALSE;
-
     const gchar *no_font = NULL;
     const gchar *use_font = NULL;
 
+    if (!titlebar_font)
+	return FALSE;
+
     if (titlebar_uses_system_font)
 	use_font = no_font;
     else
@@ -489,14 +502,14 @@
     return TRUE;
 }
 
-gboolean
+static gboolean
 gwd_settings_actions_changed (GWDSettingsWritable *settings,
-			      const gchar	   *action_double_click_titlebar,
-			      const gchar	   *action_middle_click_titlebar,
-			      const gchar	   *action_right_click_titlebar,
-			      const gchar	   *mouse_wheel_action)
+			      const gchar	  *action_double_click_titlebar,
+			      const gchar	  *action_middle_click_titlebar,
+			      const gchar	  *action_right_click_titlebar,
+			      const gchar	  *mouse_wheel_action)
 {
-    GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
+    GWDSettingsImpl        *settings_impl = GWD_SETTINGS_IMPL (settings);
     GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
 
     gboolean ret = FALSE;
@@ -517,13 +530,15 @@
     return ret;
 }
 
-static void gwd_settings_freeze_updates (GWDSettingsWritable *writable)
+static void
+gwd_settings_freeze_updates (GWDSettingsWritable *writable)
 {
     GWDSettingsImplPrivate *priv = GET_PRIVATE (writable);
     priv->freeze_count++;
 }
 
-static void gwd_settings_thaw_updates (GWDSettingsWritable *writable)
+static void
+gwd_settings_thaw_updates (GWDSettingsWritable *writable)
 {
     GWDSettingsImplPrivate *priv = GET_PRIVATE (writable);
 
@@ -533,7 +548,8 @@
     release_notify_funcs (GWD_SETTINGS_IMPL (writable));
 }
 
-static void gwd_settings_writable_interface_init (GWDSettingsWritableInterface *interface)
+static void
+gwd_settings_writable_interface_init (GWDSettingsWritableInterface *interface)
 {
     interface->shadow_property_changed = gwd_settings_shadow_property_changed;
     interface->use_tooltips_changed = gwd_settings_use_tooltips_changed;
@@ -549,16 +565,19 @@
     interface->thaw_updates = gwd_settings_thaw_updates;
 }
 
-static void gwd_settings_interface_init (GWDSettingsInterface *interface)
+static void
+gwd_settings_interface_init (GWDSettingsInterface *interface)
 {
 }
 
-static void gwd_settings_dispose (GObject *object)
+static void
+gwd_settings_dispose (GObject *object)
 {
     G_OBJECT_CLASS (gwd_settings_impl_parent_class)->dispose (object);
 }
 
-static void gwd_settings_finalize (GObject *object)
+static void
+gwd_settings_finalize (GObject *object)
 {
     GWDSettingsImplPrivate *priv = GET_PRIVATE (object);
     G_OBJECT_CLASS (gwd_settings_impl_parent_class)->finalize (object);
@@ -588,10 +607,11 @@
     }
 }
 
-static void gwd_settings_set_property (GObject *object,
-					guint   property_id,
-					const GValue  *value,
-					GParamSpec *pspec)
+static void
+gwd_settings_set_property (GObject      *object,
+			   guint        property_id,
+			   const GValue *value,
+			   GParamSpec   *pspec)
 {
     GWDSettingsImplPrivate *priv = GET_PRIVATE (object);
 
@@ -617,10 +637,11 @@
     }
 }
 
-static void gwd_settings_get_property (GObject *object,
-					guint   property_id,
-					GValue  *value,
-					GParamSpec *pspec)
+static void
+gwd_settings_get_property (GObject    *object,
+			   guint      property_id,
+			   GValue     *value,
+			   GParamSpec *pspec)
 {
     GWDSettingsImplPrivate *priv = GET_PRIVATE (object);
 
@@ -683,7 +704,8 @@
     }
 }
 
-static void gwd_settings_impl_class_init (GWDSettingsImplClass *klass)
+static void
+gwd_settings_impl_class_init (GWDSettingsImplClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -804,7 +826,6 @@
 
     /* Append all notify funcs so that external state can be updated in case
      * the settings backend can't do it itself */
-
     append_to_notify_funcs (self, gwd_settings_notified_update_metacity_theme);
     append_to_notify_funcs (self, gwd_settings_notified_metacity_button_layout);
     append_to_notify_funcs (self, gwd_settings_notified_update_frames);
@@ -831,8 +852,8 @@
 
 static gboolean
 set_metacity_theme_construction_value (const gchar **metacity_theme,
-				       GParameter *params,
-				       GValue	  *metacity_theme_value)
+				       GParameter  *params,
+				       GValue	   *metacity_theme_value)
 {
     if (metacity_theme)
     {
@@ -848,7 +869,9 @@
 }
 
 static guint
-set_flag_and_increment (guint n_param, guint *flags, guint flag)
+set_flag_and_increment (guint n_param,
+			guint *flags,
+			guint flag)
 {
     if (!flags)
 	return n_param;
@@ -858,13 +881,18 @@
 }
 
 GWDSettings *
-gwd_settings_impl_new (gint *blur,
-		       const gchar **metacity_theme,
+gwd_settings_impl_new (gint                *blur,
+		       const gchar         **metacity_theme,
 		       GWDSettingsNotified *notified)
 {
-    int    n_param = 0;
+    /* Always N command line parameters + 2 for command line
+     * options enum & notified */
+    const guint     gwd_settings_impl_n_construction_params = 4;
+    GParameter      param[gwd_settings_impl_n_construction_params];
+    GWDSettings     *settings = NULL;
+
+    int      n_param = 0;
     guint    cmdline_opts = 0;
-    GParameter param[GWD_SETTINGS_IMPL_N_CONSTRUCTION_PARAMS];
 
     GValue blur_value = G_VALUE_INIT;
     GValue metacity_theme_value = G_VALUE_INIT;
@@ -896,16 +924,11 @@
 
     n_param++;
 
-    GWDSettingsImpl *settings = GWD_SETTINGS_IMPL (g_object_newv (GWD_TYPE_SETTINGS_IMPL, n_param, param));
+    settings = GWD_SETTINGS_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_IMPL, n_param, param));
 
     g_value_unset (&blur_value);
     g_value_unset (&metacity_theme_value);
     g_value_unset (&cmdline_opts_value);
 
-    return GWD_SETTINGS_INTERFACE (settings);
+    return settings;
 }
-
-
-
-
-

=== modified file 'gtk/window-decorator/gwd-settings.h'
--- gtk/window-decorator/gwd-settings.h	2012-08-27 06:39:22 +0000
+++ gtk/window-decorator/gwd-settings.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_SETTINGS_H
 #define _COMPIZ_GWD_SETTINGS_H
 
@@ -30,12 +31,10 @@
 GType gwd_settings_impl_get_type ();
 
 GWDSettings *
-gwd_settings_impl_new (gint *blur,
-		       const gchar **metacity_theme,
+gwd_settings_impl_new (gint                *blur,
+		       const gchar         **metacity_theme,
 		       GWDSettingsNotified *notified);
 
-extern const guint GWD_SETTINGS_IMPL_N_CONSTRUCTION_PARAMS;
-
 G_END_DECLS
 
 #endif

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2012-08-27 06:39:22 +0000
+++ gtk/window-decorator/metacity.c	2012-09-10 00:56:22 +0000
@@ -52,11 +52,11 @@
     gint	    bottom_stretch_offset;
     gint	    left_stretch_offset;
     gint	    right_stretch_offset;
+    gint	    mutter_draggable_border_width = 0;
+
     win_extents = frame_win_extents = d->frame->win_extents;
     max_win_extents = frame_max_win_extents = d->frame->max_win_extents;
 
-    gint	    mutter_draggable_border_width = 0;
-
     g_object_get (settings, "draggable-border-width", &mutter_draggable_border_width, NULL);
 
     /* Add the invisible grab area padding, but only for

=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2012-09-05 15:28:59 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2012-09-10 00:56:22 +0000
@@ -1,15 +1,15 @@
 include (CompizGSettings)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}/../
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../
 		     ${CMAKE_CURRENT_BINARY_DIR})
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_tests.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/compiz_gwd_tests.h)
+		${CMAKE_CURRENT_BINARY_DIR}/compiz_gwd_tests.h)
 
 pkg_check_modules (COMPIZ_TEST_GTK_WINDOW_DECORATOR
 		   glib-2.0>=2.28
-                   gio-2.0>=2.25.0)
+		   gio-2.0>=2.25.0)
 
 if (COMPIZ_TEST_GTK_WINDOW_DECORATOR_FOUND)
 
@@ -23,16 +23,16 @@
 			   gtk_window_decorator_settings_storage_interface)
 
     add_library (gtk_window_decorator_mock_settings STATIC
-	         ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings.cpp)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings.cpp)
 
     target_link_libraries (gtk_window_decorator_mock_settings
-		           gtk_window_decorator_settings_interface)
+			   gtk_window_decorator_settings_interface)
 
     add_library (gtk_window_decorator_mock_settings_writable STATIC
-	         ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings_writable.cpp)
+		 ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings_writable.cpp)
 
     target_link_libraries (gtk_window_decorator_mock_settings_writable
-		           gtk_window_decorator_settings_writable_interface)
+			   gtk_window_decorator_settings_writable_interface)
 
     add_library (gtk_window_decorator_mock_settings_notified STATIC
 		 ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings_notified.cpp)
@@ -44,71 +44,71 @@
 		    ${CMAKE_CURRENT_SOURCE_DIR}/test_gwd_settings.cpp)
 
     set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
-         gtk_window_decorator_settings
-         gtk_window_decorator_mock_settings
-         gtk_window_decorator_mock_settings_writable
-         gtk_window_decorator_mock_settings_storage
-         gtk_window_decorator_mock_settings_notified)
+	 gtk_window_decorator_settings
+	 gtk_window_decorator_mock_settings
+	 gtk_window_decorator_mock_settings_writable
+	 gtk_window_decorator_mock_settings_storage
+	 gtk_window_decorator_mock_settings_notified)
 
     set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
-         gtk_window_decorator_settings
-         gtk_window_decorator_settings_interface
-         gtk_window_decorator_settings_storage_interface
-         gtk_window_decorator_settings_notified_interface)
+	 gtk_window_decorator_settings
+	 gtk_window_decorator_settings_interface
+	 gtk_window_decorator_settings_storage_interface
+	 gtk_window_decorator_settings_notified_interface)
 
     if (USE_GSETTINGS)
-        add_definitions (-DUSE_GSETTINGS)
-        set (_desktop_gschema_name org.gnome.desktop.wm.preferences)
-        set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml)
-        set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename})
-        set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename})
-
-        add_custom_command (OUTPUT ${_desktop_gschema_generated_location}
-                            COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location}
-                            DEPENDS ${_desktop_gschema_filepath}
-                            VERBATIM)
-
-        add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL
-                           DEPENDS ${_desktop_gschema_generated_location})
-
-        add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema)
-
-        set (_mutter_gschema_name org.gnome.mutter)
-        set (_mutter_gschema_filename ${_mutter_gschema_name}.gschema.xml)
-        set (_mutter_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_mutter_gschema_filename})
-        set (_mutter_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_mutter_gschema_filename})
-
-        add_custom_command (OUTPUT ${_mutter_gschema_generated_location}
-                            COMMAND cp -r ${_mutter_gschema_filepath} ${_mutter_gschema_generated_location}
-                            DEPENDS ${_mutter_gschema_filepath}
-                            VERBATIM)
-
-        add_custom_target (compiz_gwd_gsettings_org_gnome_mutter_schema ALL
-                           DEPENDS ${_mutter_gschema_generated_location})
-
-        add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_mutter_schema)
-
-        set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
-             ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
-             gtk_window_decorator_settings_storage_gsettings)
-
-        set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
-             ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS}
-            gtk_window_decorator_settings_storage_gsettings)
+	add_definitions (-DUSE_GSETTINGS)
+	set (_desktop_gschema_name org.gnome.desktop.wm.preferences)
+	set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml)
+	set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename})
+	set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename})
+
+	add_custom_command (OUTPUT ${_desktop_gschema_generated_location}
+			    COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location}
+			    DEPENDS ${_desktop_gschema_filepath}
+			    VERBATIM)
+
+	add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL
+			   DEPENDS ${_desktop_gschema_generated_location})
+
+	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema)
+
+	set (_mutter_gschema_name org.gnome.mutter)
+	set (_mutter_gschema_filename ${_mutter_gschema_name}.gschema.xml)
+	set (_mutter_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_mutter_gschema_filename})
+	set (_mutter_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_mutter_gschema_filename})
+
+	add_custom_command (OUTPUT ${_mutter_gschema_generated_location}
+			    COMMAND cp -r ${_mutter_gschema_filepath} ${_mutter_gschema_generated_location}
+			    DEPENDS ${_mutter_gschema_filepath}
+			    VERBATIM)
+
+	add_custom_target (compiz_gwd_gsettings_org_gnome_mutter_schema ALL
+			   DEPENDS ${_mutter_gschema_generated_location})
+
+	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_mutter_schema)
+
+	set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
+	     ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
+	     gtk_window_decorator_settings_storage_gsettings)
+
+	set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
+	     ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS}
+	    gtk_window_decorator_settings_storage_gsettings)
     endif (USE_GSETTINGS)
 
 
     target_link_libraries (compiz_test_gwd_settings
-                           ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
+			   ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
 			   decoration
-		           ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
+			   ${COMPIZ_TEST_GTK_WINDOW_DECORATOR_LIBRARIES}
 			   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-		           ${GTEST_BOTH_LIBRARIES}
+			   ${GTEST_BOTH_LIBRARIES}
 			   ${GMOCK_LIBRARY}
 		       	   ${GMOCK_MAIN_LIBRARY})
 
     compiz_discover_tests (compiz_test_gwd_settings
 			   COVERAGE
-                           ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS})
+			   ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS})
 
 endif (COMPIZ_TEST_GTK_WINDOW_DECORATOR_FOUND)

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings.cpp'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings.cpp	2012-08-21 05:37:34 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings.cpp	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.cpp'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.cpp	2012-08-22 11:17:43 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.cpp	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.h'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.h	2012-08-22 11:17:43 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_MOCK_SETTINGS_NOTIFIED_H
 #define _COMPIZ_GWD_MOCK_SETTINGS_NOTIFIED_H
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp	2012-08-21 13:09:27 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h	2012-08-21 13:09:27 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_MOCK_SETTINGS_STORAGE_H
 #define _COMPIZ_GWD_MOCK_SETTINGS_STORAGE_H
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp	2012-08-27 14:38:32 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h	2012-08-27 14:38:32 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h	2012-09-10 00:56:22 +0000
@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
  */
-
 #ifndef _COMPIZ_GWD_MOCK_SETTINGS_WRITABLE_H
 #define _COMPIZ_GWD_MOCK_SETTINGS_WRITABLE_H
 

=== modified file 'gtk/window-decorator/tests/compiz_gwd_tests.h.in'
--- gtk/window-decorator/tests/compiz_gwd_tests.h.in	2012-08-22 11:17:43 +0000
+++ gtk/window-decorator/tests/compiz_gwd_tests.h.in	2012-09-10 00:56:22 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #ifndef _COMPIZ_GWD_TESTS_CONFIG_H
 #define _COMPIZ_GWD_TESTS_CONFIG_H
 

=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2012-09-03 11:38:26 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2012-09-10 00:56:22 +0000
@@ -1,5 +1,23 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
 #include <cstring>
-#include <cstdio>
 
 #include <tr1/tuple>