Merge lp:~gala-dev/gala/no-theme-override into lp:gala

[Tom Beckmann]

Remove the theme key, properly this time.

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'data/org.pantheon.desktop.gala.gschema.xml'
--- data/org.pantheon.desktop.gala.gschema.xml	2012-12-24 11:34:41 +0000
+++ data/org.pantheon.desktop.gala.gschema.xml	2013-01-23 15:56:23 +0000
@@ -113,11 +113,6 @@
 			<summary>Arrangement of buttons on the titlebar</summary>
 			<description>Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.</description>
 		</key>
-		<key type="s" name="theme">
-			<default>'elementary'</default>
-			<summary></summary>
-			<description></description>
-		</key>
 		<key type="b" name="dim-parents">
 			<default>false</default>
 			<summary>Make parent windows that spawn a modal attached dialog being dimmed</summary>
 
=== modified file 'src/Plugin.vala'
--- src/Plugin.vala	2012-12-26 12:31:30 +0000
+++ src/Plugin.vala	2013-01-23 15:56:23 +0000
@@ -62,7 +62,6 @@
 			Prefs.override_preference_schema ("button-layout", Config.SCHEMA + ".appearance");
 			Prefs.override_preference_schema ("edge-tiling", Config.SCHEMA + ".behavior");
 			Prefs.override_preference_schema ("enable-animations", Config.SCHEMA + ".animations");
-			Prefs.override_preference_schema ("theme", Config.SCHEMA + ".appearance");
 		}
 		
 		public override void start ()
 
=== modified file 'src/Settings.vala'
--- src/Settings.vala	2012-10-27 00:16:50 +0000
+++ src/Settings.vala	2013-01-23 15:56:23 +0000
@@ -52,7 +52,6 @@
 	public class AppearanceSettings : Granite.Services.Settings
 	{
 		public string button_layout { get; set; }
-		public string theme { get; set; }
 		public bool attach_modal_dialogs { get; set; }
 		public bool dim_parents { get; set; }