6 files changed, 1 insertions, 79 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 3b8de1f..27b5ea2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,30 +25,3 @@ EXTRA_DIST =					\
 CLEANFILES =					\
 	$(dbus_services_DATA)			\
 	$(gsettings_SCHEMAS)
-
-if BUILD_GTKLOGOUTHELPER
-@INTLTOOL_DESKTOP_RULE@
-
-%.desktop.in: %.desktop.in.in
-	sed \
-		-e "s|\@libexecdir\@|$(libexecdir)|" \
-		-e "s|\@bindir\@|$(bindir)|" \
-		$< > $@
-
-logout_helper_desktop_in_in_files = \
-	indicator-session-lock-screen.desktop.in.in \
-	indicator-session-logout.desktop.in.in \
-	indicator-session-restart.desktop.in.in \
-	indicator-session-shutdown.desktop.in.in
-
-logout_helperdir = $(datadir)/applications
-logout_helper_desktop_files = \
-	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
-logout_helper_DATA = $(logout_helper_desktop_files)
-
-EXTRA_DIST +=					\
-	$(logout_helper_desktop_in_in_files)
-
-CLEANFILES +=					\
-	$(logout_helper_desktop_files)
-endif
diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
index 0ef3d00..6010b3f 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -21,21 +21,10 @@
       <_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>
-    <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>
-      <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>
   
diff --git a/data/indicator-session-lock-screen.desktop.in.in b/data/indicator-session-lock-screen.desktop.in.in
deleted file mode 100644
index c414402..0000000
--- a/data/indicator-session-lock-screen.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Lock Screen
-TryExec=@bindir@/xdg-screensaver
-Exec=@bindir@/xdg-screensaver lock
-Icon=system-lock-screen
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0
diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in
deleted file mode 100644
index 800324e..0000000
--- a/data/indicator-session-logout.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Log Out
-TryExec=@libexecdir@/gtk-logout-helper
-Exec=@libexecdir@/gtk-logout-helper --logout
-Icon=system-log-out
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0
diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in
deleted file mode 100644
index 51acded..0000000
--- a/data/indicator-session-restart.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Restart
-TryExec=@libexecdir@/gtk-logout-helper
-Exec=@libexecdir@/gtk-logout-helper --restart
-Icon=system-restart
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0
diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in
deleted file mode 100644
index 4603fd1..0000000
--- a/data/indicator-session-shutdown.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Shut Down
-TryExec=@libexecdir@/gtk-logout-helper
-Exec=@libexecdir@/gtk-logout-helper --shutdown
-Icon=system-shutdown
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0