[gnome-initial-setup] summary: Remove the trigger file in g-i-s
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] summary: Remove the trigger file in g-i-s
- Date: Wed, 14 Nov 2012 18:14:51 +0000 (UTC)
commit 0473ed4e77a195d345ce789b4c88c6a558725387
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Nov 14 13:14:34 2012 -0500
summary: Remove the trigger file in g-i-s
Doing this in gdm makes it a bit awkward if the user hasn't gone all
the way through setup and completion.
gnome-initial-setup/pages/summary/Makefile.am | 1 +
.../pages/summary/gis-summary-page.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/gnome-initial-setup/pages/summary/Makefile.am b/gnome-initial-setup/pages/summary/Makefile.am
index 39c9fa8..0a3561f 100644
--- a/gnome-initial-setup/pages/summary/Makefile.am
+++ b/gnome-initial-setup/pages/summary/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libgissummary.la
AM_CPPFLAGS = \
$(INITIAL_SETUP_CFLAGS) \
+ -DLOCALSTATEDIR="\"$(localstatedir)\"" \
-DUIDIR="\"$(uidir)\""
libgissummary_la_SOURCES = \
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 68483d4..5d31c9a 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -191,9 +191,21 @@ log_user_in (GisSummaryPage *page)
}
}
+#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup"
+
+static void
+remove_trigger_file (GisSummaryPage *page)
+{
+ if (g_remove (INITIAL_SETUP_TRIGGER_FILE) < 0) {
+ g_warning ("Failed to remove '" INITIAL_SETUP_TRIGGER_FILE "': %s",
+ g_strerror (errno));
+ }
+}
+
static void
byebye (GisSummaryPage *page)
{
+ remove_trigger_file (page);
log_user_in (page);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]