From 4998ebc6c4f9f9ce742193a2ff29645f1fe065af Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 14 Jun 2012 12:27:04 -0500
Subject: a step in merging the two menus: remove the 'should show user menu'
 flag

---
 data/com.canonical.indicator.session.gschema.xml.in | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'data')

diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
index 0ef3d00..c26d8c1 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -25,11 +25,6 @@
       <summary>Determine the visibility of the User's real name on the panel</summary>
       <description>Allow for the Removal of the users name from the panel</description>
     </key>
-    <key type="b" name="user-show-menu">
-      <default>true</default>
-      <summary>Determine the visibility of the User Menu</summary>
-      <description>Allow for the user menu to be hidden by the user.</description>
-    </key>
     <key type="b" name="use-username-in-switch-item">
       <default>false</default>
       <summary>Determine what string to use for the user's name in the switch menuitem.</summary>
-- 
cgit v1.2.3


From 41c4ab35750809c59c60cf3a3e1c3deb8449c9b5 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 14 Jun 2012 14:06:34 -0500
Subject: remove the use-username-in-switch-item property; it's no longer
 spec'ed

---
 data/com.canonical.indicator.session.gschema.xml.in | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'data')

diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
index c26d8c1..ec8e954 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -25,12 +25,6 @@
       <summary>Determine the visibility of the User's real name on the panel</summary>
       <description>Allow for the Removal of the users name from the panel</description>
     </key>
-    <key type="b" name="use-username-in-switch-item">
-      <default>false</default>
-      <summary>Determine what string to use for the user's name in the switch menuitem.</summary>
-      <description>The switch menuitem as part of the user menu should be default have the label 'Switch User Account'.
-      This settings gives the user the potential to have the label read 'Switch from $username'</description>
-    </key>
 
   </schema>
   
-- 
cgit v1.2.3


From 8b2fa414651b049052367735b806840dbf955083 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 19 Jun 2012 12:30:41 -0500
Subject: the default value for show-real-name-on-panel should be 'false'

---
 data/com.canonical.indicator.session.gschema.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
index ec8e954..6010b3f 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -21,7 +21,7 @@
       <_description>Makes it so that the shutdown button doesn’t show in the session menu.</_description>
     </key>
     <key type="b" name="show-real-name-on-panel">
-      <default>true</default>
+      <default>false</default>
       <summary>Determine the visibility of the User's real name on the panel</summary>
       <description>Allow for the Removal of the users name from the panel</description>
     </key>
-- 
cgit v1.2.3