r35441 - in /desktop/unstable/gdm3/debian: changelog gdm3.init patches/04_reload_config.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jun 25 18:26:15 2012
New Revision: 35441

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35441
Log:
* 04_reload_config.patch: patch from upstream git. Get SIGHUP to 
  actually reload the configuration.
* gdm3.init: send SIGHUP to get reload to work.

Added:
    desktop/unstable/gdm3/debian/patches/04_reload_config.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.init
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=35441&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Mon Jun 25 18:26:15 2012
@@ -9,6 +9,9 @@
   * 90_config_comments.patch: more comments with useful options.
   * Add references to patches.
   * 02_xnest_wrapper.patch: disabled.
+  * 04_reload_config.patch: patch from upstream git. Get SIGHUP to 
+    actually reload the configuration.
+  * gdm3.init: send SIGHUP to get reload to work.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 25 Jun 2012 20:18:38 +0200
 

Modified: desktop/unstable/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.init?rev=35441&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.init [utf-8] Mon Jun 25 18:26:15 2012
@@ -93,7 +93,7 @@
         log_daemon_msg "Scheduling reload of GNOME Display Manager configuration" "gdm3"
         set +e
         gen_config
-        start-stop-daemon --stop --signal USR1 --quiet --pidfile \
+        start-stop-daemon --stop --signal HUP --quiet --pidfile \
                 /var/run/gdm3.pid --name gdm3
         start-stop-daemon --stop --signal HUP --quiet --name dconf-service \
                 --user Debian-gdm --oknodo

Added: desktop/unstable/gdm3/debian/patches/04_reload_config.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/04_reload_config.patch?rev=35441&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/04_reload_config.patch (added)
+++ desktop/unstable/gdm3/debian/patches/04_reload_config.patch [utf-8] Mon Jun 25 18:26:15 2012
@@ -1,0 +1,49 @@
+From d4fafda602937fdb13d28a710eab997ff7262251 Mon Sep 17 00:00:00 2001
+From: Brian Cameron <brian.cameron at oracle.com>
+Date: Mon, 25 Jun 2012 16:12:03 +0000
+Subject: daemon: reload config on SIGHUP
+
+---
+diff --git a/common/gdm-settings-direct.c b/common/gdm-settings-direct.c
+index b1b66fb..fb1f1f3 100644
+--- a/common/gdm-settings-direct.c
++++ b/common/gdm-settings-direct.c
+@@ -232,7 +232,11 @@ gdm_settings_direct_init (GdmSettings *settings,
+         g_return_val_if_fail (file != NULL, FALSE);
+         g_return_val_if_fail (root != NULL, FALSE);
+ 
+-        g_assert (schemas == NULL);
++        g_debug ("Settings Direct Init");
++        if (schemas != NULL) {
++                g_hash_table_unref (schemas);
++                schemas = NULL;
++        }
+ 
+         if (! gdm_settings_parse_schemas (file, root, &list)) {
+                 g_warning ("Unable to parse schemas");
+diff --git a/daemon/main.c b/daemon/main.c
+index 2ffb779..cba7cc2 100644
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -471,9 +471,17 @@ signal_cb (int      signo,
+ 
+         case SIGHUP:
+                 g_debug ("Got HUP signal");
+-                /* FIXME:
+-                 * Reread config stuff like system config files, VPN service files, etc
++                /* Reread config stuff like system config files, VPN service
++                 * files, etc
+                  */
++                g_object_unref (settings);
++                settings = gdm_settings_new ();
++                if (settings != NULL) {
++                        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
++                                g_warning ("Unable to initialize settings");
++                        }
++                }
++
+                 ret = TRUE;
+ 
+                 break;
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=35441&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Mon Jun 25 18:26:15 2012
@@ -1,4 +1,5 @@
 #02_xnest-wrapper.patch
+04_reload_config.patch
 05_debug_xserver_core.patch
 06_first_vt.patch
 07_libexec-paths.patch