[gdm/wip/multi-seat-2-30] On June 21st, I committed a change "Now GDM will reload its configuration settings if you send a HUP

[Brian Cameron <bcameron src gnome org>]

commit 4468525464e738e0d7ab28c95f33af1cd319320c
Author: Brian Cameron <brian cameron oracle com>
Date:   Mon Jun 25 15:51:55 2012 -0500

    On June 21st, I committed a change "Now GDM will reload its configuration
    settings if you send a HUP signal to the gdm-binary process".  This commit
    fixes the change so it matches what went into head.
    https://bugzilla.gnome.org/show_bug.cgi?id=678584

 common/gdm-settings-direct.c |    5 +++--
 common/gdm-settings.c        |    7 -------
 common/gdm-settings.h        |    1 -
 daemon/main.c                |    2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/common/gdm-settings-direct.c b/common/gdm-settings-direct.c
index c4e1fe5..9327afb 100644
--- a/common/gdm-settings-direct.c
+++ b/common/gdm-settings-direct.c
@@ -233,9 +233,10 @@ gdm_settings_direct_init (GdmSettings *settings,
         g_return_val_if_fail (root != NULL, FALSE);
 
         g_debug ("Settings Direct Init");
-        if (schemas != NULL)
+        if (schemas != NULL) {
                 g_hash_table_destroy (schemas);
-        schemas = NULL;
+                schemas = NULL;
+        }
 
         if (! gdm_settings_parse_schemas (file, root, &list)) {
                 g_warning ("Unable to parse schemas");
diff --git a/common/gdm-settings.c b/common/gdm-settings.c
index e4457cf..00fe73e 100644
--- a/common/gdm-settings.c
+++ b/common/gdm-settings.c
@@ -259,10 +259,3 @@ gdm_settings_new (void)
 
         return GDM_SETTINGS (settings_object);
 }
-
-void
-gdm_settings_clear (void)
-{
-        g_object_unref (settings_object);
-        settings_object = NULL;
-}
diff --git a/common/gdm-settings.h b/common/gdm-settings.h
index 94c4b5f..8284e84 100644
--- a/common/gdm-settings.h
+++ b/common/gdm-settings.h
@@ -74,7 +74,6 @@ gboolean            gdm_settings_set_value                      (GdmSettings *se
                                                                  const char  *key,
                                                                  const char  *value,
                                                                  GError     **error);
-void                gdm_settings_clear                          (void);
 
 G_END_DECLS
 
diff --git a/daemon/main.c b/daemon/main.c
index b6d1535..9f2294f 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -492,7 +492,7 @@ signal_cb (int      signo,
                 /* Reread config stuff like system config files, VPN service
                  * files, etc
                  */
-                gdm_settings_clear ();
+                g_object_unref (settings);
                 settings = gdm_settings_new ();
                 if (settings != NULL) {
                         if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {