Remove the run-only-once implementationsetup

This will be handled differently when we move to gdm.

4 files changed, 2 insertions, 27 deletions

diff --git a/setup/Makefile.am b/setup/Makefile.am
index dac151044..4ed0ab49f 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -23,10 +23,6 @@ AM_CPPFLAGS = \
 	-DUIDIR="\"$(uidir)\"" \
 	-DDATADIR="\"$(pkgdatadir)/ui/datetime\""
 
-gsettings_SCHEMAS = org.gnome.control-center.setup.gschema.xml
-
-@GSETTINGS_RULES@
-
 uidir = $(pkgdatadir)/ui/setup
 ui_DATA = \
 	setup.ui
@@ -37,7 +33,6 @@ sys_DATA = gnome-setup-assistant.desktop
 
 EXTRA_DIST = \
 	$(ui_DATA) \
-	$(sys_DATA) \
-	org.gnome.control-center.setup.gschema.xml
+	$(sys_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/setup/gnome-setup-assistant.c b/setup/gnome-setup-assistant.c
index 982bff8a5..a035e80b9 100644
--- a/setup/gnome-setup-assistant.c
+++ b/setup/gnome-setup-assistant.c
@@ -1359,19 +1359,8 @@ prepare_location_page (SetupData *setup)
 /* --- Other setup --- */
 
 static void
-disable_autostart (void)
-{
-        GSettings *settings;
-
-        settings = g_settings_new ("org.gnome.control-center.setup");
-        g_settings_set_boolean (settings, "need-setup", FALSE);
-}
-
-static void
 close_cb (GtkAssistant *assi, gpointer data)
 {
-        disable_autostart ();
-
         gtk_main_quit ();
 }
 
diff --git a/setup/gnome-setup-assistant.desktop b/setup/gnome-setup-assistant.desktop
index bb0cfe900..dcabe2f71 100644
--- a/setup/gnome-setup-assistant.desktop
+++ b/setup/gnome-setup-assistant.desktop
@@ -7,8 +7,7 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;System;
 OnlyShowIn=GNOME;
-AutostartCondition=GSETTINGS org.gnome.control-center.setup need-setup
 X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Product=gdm
 X-GNOME-Bugzilla-Component=setup
 X-GNOME-Bugzilla-Version=unknown
diff --git a/setup/org.gnome.control-center.setup.gschema.xml b/setup/org.gnome.control-center.setup.gschema.xml
deleted file mode 100644
index 487ae2bb0..000000000
--- a/setup/org.gnome.control-center.setup.gschema.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema id='org.gnome.control-center.setup' path="/org/gnome/control-center/setup/">
-    <key name='need-setup' type='b'>
-      <default>true</default>
-    </key>
-  </schema>
-</schemalist>