diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2012-09-28 19:56:51 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-09-28 20:00:20 -0400 |
| commit | 5479f2542c79873d3f36968bf081274ab9c241fd (patch) | |
| tree | 3d9e5ff1ceb030ab5f1003004444574b4fd76e75 | |
| parent | 1e72815156834468b57f3e5ac1960950c2e9519f (diff) | |
| download | gdm-5479f2542c79873d3f36968bf081274ab9c241fd.tar.gz | |
Fix errors in the setup code for gnome-initial-setup
There is a code path where we forgot to clear an error
before reusing it. And the code that was reusing it
was using a mis-constructed file path, guaranteeing
a pile-on.
| -rw-r--r-- | daemon/gdm-simple-slave.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 91515ad7..b7053ac7 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -1147,12 +1147,14 @@ create_initial_setup_user (GdmSimpleSlave *slave) ret = FALSE; goto out; } + + g_clear_error (&error); } else { g_object_unref (user); } /* Now, make sure the PolicyKit policy is in place */ - src_file = g_file_new_for_path (DATADIR "/gnome-initial-setup" RULES_FILE); + src_file = g_file_new_for_path (DATADIR "/gnome-initial-setup/" RULES_FILE); dest_file = g_file_new_for_path (RULES_DIR RULES_FILE); if (!g_file_copy (src_file, |