diff options
author | Brian Cameron <brian.cameron@sun.com> | 2006-03-28 01:44:36 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2006-03-28 01:44:36 +0000 |
commit | f86251dc52adc4193ce1eab580ef1e53d9119899 (patch) | |
tree | 29a69188a5d6ea119c97b3cb9feb46c2086685dc /gui/gdmchooser.c | |
parent | 2a0310c3f1e4c688448734b651f31e2df68d8d3c (diff) | |
download | gdm-f86251dc52adc4193ce1eab580ef1e53d9119899.tar.gz |
Now support --with-sysconfsubdir so that GDM can be configured to have the
2006-03-27 Brian Cameron <brian.cameron@sun.com>
* acconfig.h, configure.ac, config/Makefile.am, config/PostLogin,
config/gdm.conf.in, daemon/Makefile.am, daemon/gdm.[ch],
daemon/gdmconfig.c, gui/Makefile.am, gui/greeter/Makeifle.am,
gui/modules/Makefile.am, gui/modules/dwellmouselistener.c,
gui/modules/keymouselistener.c, utils/Makefile.am: Now support
--with-sysconfsubdir so that GDM can be configured to have
the config files in a directory that isn't hardcoded to have "/gdm"
at the end. Fixes bug #335957. Patch provided by Julio M
Merino Vidal <jmmv@NetBSD.org> with minor changes by me to fix
some usage of EXPANDED_GDMCONFDIR that caused breakage on Solaris.
* gui/gdmXnestchooser, gui/gdmchooser.c, gui/gdmcomm.[ch],
gui/gdmdynamic.c, gui/gdmflexiserver.c, gui/gdmlogin.c,
gui/gdmphotosetup.c, gui/greeter/greeter.c: Now use
gdmcomm_comm_bulk_start and gdmcomm_comm_bulk_stop to wrap areas of
the code where we want to keep the sockets connection open for
performance. This makes gdmsetup start faster and better ensures
that sockets are not left open. Now gdmcomm_call_gdm will always
close the socket unless inside such a block, ensuring that if distros
add patches to read new config values at random points in the code,
the socket won't be left open.
* daemon/gdm.c: Fix gdm_debug message.
Diffstat (limited to 'gui/gdmchooser.c')
-rw-r--r-- | gui/gdmchooser.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c index af70291e..24c8ef20 100644 --- a/gui/gdmchooser.c +++ b/gui/gdmchooser.c @@ -1776,6 +1776,9 @@ gdm_chooser_gui_init (void) static gboolean gdm_read_config (void) { + /* Read config data in bulk */ + gdmcomm_comm_bulk_start (); + gdmcomm_set_debug (gdm_config_get_bool (GDM_KEY_DEBUG)); /* @@ -1798,7 +1801,7 @@ gdm_read_config (void) gdm_config_get_bool (GDM_KEY_ALLOW_ADD); gdm_config_get_bool (GDM_KEY_MULTICAST); - gdmcomm_comm_close(); + gdmcomm_comm_bulk_stop (); } static gboolean @@ -1806,6 +1809,9 @@ gdm_reread_config (int sig, gpointer data) { /* reparse config stuff here. At least ones we care about */ + /* Read config data in bulk */ + gdmcomm_comm_bulk_start (); + if (gdm_config_reload_bool (GDM_KEY_DEBUG)) gdmcomm_set_debug (gdm_config_get_bool (GDM_KEY_DEBUG)); @@ -1842,11 +1848,13 @@ gdm_reread_config (int sig, gpointer data) if (gdm_config_reload_string (GDM_KEY_BACKGROUND_COLOR) || gdm_config_reload_int (GDM_KEY_BACKGROUND_TYPE)) { - if (gdm_config_get_int (GDM_KEY_BACKGROUND_TYPE) != GDM_BACKGROUND_NONE) - gdm_common_setup_background_color (gdm_config_get_string (GDM_KEY_BACKGROUND_COLOR)); + if (gdm_config_get_int (GDM_KEY_BACKGROUND_TYPE) != GDM_BACKGROUND_NONE) { + gdm_common_setup_background_color (gdm_config_get_string + (GDM_KEY_BACKGROUND_COLOR)); + } } - gdmcomm_comm_close(); + gdmcomm_comm_bulk_stop (); return TRUE; } |