[gnome-initial-setup] Delete code that deals with the trigger file



commit 88f61b7f92c3d31909bc62bc2ce70a6a42140f0e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Apr 4 14:35:30 2013 -0400

    Delete code that deals with the trigger file
    
    gdm doesn't use the trigger file anymore.

 Makefile.am                                        |    3 --
 configure.ac                                       |   12 ----------
 data/20-gnome-initial-setup.rules                  |    1 -
 data/Makefile.am                                   |    7 ------
 data/org.gnome.initial-setup.policy                |   22 --------------------
 .../pages/summary/gis-summary-page.c               |   14 ------------
 6 files changed, 0 insertions(+), 59 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 21d5b39..193daa2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,3 @@ EXTRA_DIST = \
     AUTHORS \
     NEWS \
     gnome-initial-setup.doap
-
-DISTCHECK_CONFIGURE_FLAGS = \
-        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
diff --git a/configure.ac b/configure.ac
index bf20215..eca783b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,18 +94,6 @@ ISO_CODES=iso-codes
 
 LIBGD_INIT([stack static])
 
-# systemd
-AC_ARG_WITH([systemdsystemunitdir],
-        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-        [],
-        [with_systemdsystemunitdir=yes])
-if test "x$with_systemdsystemunitdir" = "xyes"; then
-    with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-fi
-if test "x$with_systemdsystemunitdir" != "xno"; then
-    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-
 GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_30 
'-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'"
 
 INITIAL_SETUP_CFLAGS="$INITIAL_SETUP_CFLAGS $GLIB_VERSION_DEFINES"
diff --git a/data/20-gnome-initial-setup.rules b/data/20-gnome-initial-setup.rules
index 620e719..487fc63 100644
--- a/data/20-gnome-initial-setup.rules
+++ b/data/20-gnome-initial-setup.rules
@@ -10,7 +10,6 @@ polkit.addRule(function(action, subject) {
         return undefined;
 
     var actionMatches = (action.id === 'org.freedesktop.udisks2.filesystem-mount-system' ||
-                         action.id === 'org.gnome.initial-setup.remove-trigger' ||
                          action.id.indexOf('org.freedesktop.accounts.') === 0 ||
                          action.id.indexOf('org.freedesktop.timedate1.') === 0 ||
                          action.id.indexOf('org.freedesktop.RealtimeKit1.') === 0);
diff --git a/data/Makefile.am b/data/Makefile.am
index 313e799..74bb09b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,9 +15,6 @@ edit = $(AM_V_GEN) sed \
 rulesdir = $(datadir)/polkit-1/rules.d
 rules_DATA = 20-gnome-initial-setup.rules
 
-actiondir = $(datadir)/polkit-1/actions
-action_DATA = org.gnome.initial-setup.policy
-
 sessiondir = $(datadir)/gnome-session/sessions
 session_DATA = gnome-initial-setup.session
 
@@ -27,11 +24,8 @@ desktop_DATA =                                               \
        setup-shell.desktop                             \
        $(NULL)
 
-systemdsystemunit_DATA = gnome-initial-setup.service
-
 EXTRA_DIST =                                           \
        20-gnome-initial-setup.rules                    \
-       org.gnome.initial-setup.policy                  \
        gnome-welcome-tour                              \
        setup-shell.desktop                             \
        gnome-welcome-tour.desktop.in.in                \
@@ -39,7 +33,6 @@ EXTRA_DIST =                                          \
        gnome-initial-setup.desktop.in.in               \
        gnome-initial-setup-copy-worker.desktop.in.in   \
        gnome-initial-setup.session                     \
-       gnome-initial-setup.service                     \
        $(NULL)
 
 CLEANFILES =                                           \
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c 
b/gnome-initial-setup/pages/summary/gis-summary-page.c
index fdc3b8c..cdf1e1b 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -194,19 +194,6 @@ log_user_in (GisSummaryPage *page)
   }
 }
 
-#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup"
-
-static void
-remove_trigger_file (GisSummaryPage *page)
-{
-  GError *error = NULL;
-  if (!g_spawn_command_line_sync ("/usr/bin/pkexec /usr/bin/rm " INITIAL_SETUP_TRIGGER_FILE, NULL, NULL, 
NULL, &error))
-    {
-      g_warning ("Failed to remove '" INITIAL_SETUP_TRIGGER_FILE "': %s", error->message);
-      g_error_free (error);
-  }
-}
-
 static void
 add_setup_done_file (void)
 {
@@ -239,7 +226,6 @@ done_cb (GtkButton *button, GisSummaryPage *page)
     {
     case GIS_DRIVER_MODE_NEW_USER:
       log_user_in (page);
-      remove_trigger_file (page);
       break;
     case GIS_DRIVER_MODE_EXISTING_USER:
       add_setup_done_file ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]