Gala

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

  1. no-theme-override
  2. Merge into trunk
Proposed by Tom Beckmann
Status: Merged
Approved by: Rico Tzschichholz
Approved revision: 280
Merged at revision: 281
Proposed branch: lp:~gala-dev/gala/no-theme-override
Merge into: lp:gala
Diff against target: 38 lines (+0/-7)
3 files modified
data/org.pantheon.desktop.gala.gschema.xml (+0/-5)
src/Plugin.vala (+0/-1)
src/Settings.vala (+0/-1)
To merge this branch: bzr merge lp:~gala-dev/gala/no-theme-override
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Review via email: mp+144526@code.launchpad.net

Description of the change

Remove the theme key, properly this time.

To post a comment you must log in.
Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/org.pantheon.desktop.gala.gschema.xml'
2--- data/org.pantheon.desktop.gala.gschema.xml 2012-12-24 11:34:41 +0000
3+++ data/org.pantheon.desktop.gala.gschema.xml 2013-01-23 15:56:23 +0000
4@@ -113,11 +113,6 @@
5 <summary>Arrangement of buttons on the titlebar</summary>
6 <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>
7 </key>
8- <key type="s" name="theme">
9- <default>'elementary'</default>
10- <summary></summary>
11- <description></description>
12- </key>
13 <key type="b" name="dim-parents">
14 <default>false</default>
15 <summary>Make parent windows that spawn a modal attached dialog being dimmed</summary>
16
17=== modified file 'src/Plugin.vala'
18--- src/Plugin.vala 2012-12-26 12:31:30 +0000
19+++ src/Plugin.vala 2013-01-23 15:56:23 +0000
20@@ -62,7 +62,6 @@
21 Prefs.override_preference_schema ("button-layout", Config.SCHEMA + ".appearance");
22 Prefs.override_preference_schema ("edge-tiling", Config.SCHEMA + ".behavior");
23 Prefs.override_preference_schema ("enable-animations", Config.SCHEMA + ".animations");
24- Prefs.override_preference_schema ("theme", Config.SCHEMA + ".appearance");
25 }
26
27 public override void start ()
28
29=== modified file 'src/Settings.vala'
30--- src/Settings.vala 2012-10-27 00:16:50 +0000
31+++ src/Settings.vala 2013-01-23 15:56:23 +0000
32@@ -52,7 +52,6 @@
33 public class AppearanceSettings : Granite.Services.Settings
34 {
35 public string button_layout { get; set; }
36- public string theme { get; set; }
37 public bool attach_modal_dialogs { get; set; }
38 public bool dim_parents { get; set; }
39

Subscribers

People subscribed via source and target branches