summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-01-05 23:16:10 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-01-05 23:16:10 +0000
commiteb2cc61410efbb7dc945524ca52d9dbb1b34a08b (patch)
tree020b2ace2810e7ccb34d1cb1909bc2d0e026e39b /utils
parentc2189ff604e48f9836790a5553fd4d54d18ecfa6 (diff)
downloadgdm-eb2cc61410efbb7dc945524ca52d9dbb1b34a08b.tar.gz
Fix problem with client not properly counting the number of connections,
2006-01-03 Brian Cameron <brian.cameron@sun.com> * gui/gdmcommon.c: Fix problem with client not properly counting the number of connections, and make logic more robust so when it receives an "ERROR 200 Too many messages" it will close and reopen the connection and try again rather than just fail. * configure.ac, configure/Makefile.am: Add loginpreloadlist * utils/prefetch.c: Now handle comments that start with "#" in the preloadlist file. * daemon/gdm.h, daemon/gdmconfig.c, config/gdm.conf, gui/gdmlogin.c, gui/gdmcommon.[ch], gui/greeter/greeter.c: Now PostDisplayProgram is PreFetchProgram. Fixed some comments in gdm.h. * daemon/gdm.c: Now KEY_PRE_FETCH_PROGRAM is only returned to the first slave that asks for the value, ensuring the prefetch only happens the first time a greeter is displayed. * docs/C/gdm.xml: Rewrote the Introduction section so it is more clear, made improvements to the Accessibility section, and fixed a number of formatting issues. Now a separate Security section. Updated docs to reflect PreFetchProgram change. * gui/gdmflexiserver.c: Clean up the code a little.
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.am10
-rw-r--r--utils/gdmprefetch.c4
2 files changed, 4 insertions, 10 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 24649db0..4517c5db 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -17,10 +17,6 @@ libexec_PROGRAMS = \
@GDMPREFETCH@ \
gdmtranslate
-# This is not useful anymore
-# bin_PROGRAMS = \
-# gdmmktemp
-
if DMX_SUPPORT
bin_PROGRAMS = gdm-dmx-reconnect-proxy
endif
@@ -39,9 +35,6 @@ gdmopen_SOURCES = \
gdmprefetch_SOURCES = \
gdmprefetch.c
-#gdmmktemp_SOURCES = \
-# gdmmktemp.c
-
gdmaskpass_LDADD = \
$(INTLLIBS) \
-lpam \
@@ -53,9 +46,6 @@ gdmopen_LDADD = \
gdmtranslate_LDADD = \
$(INTLLIBS)
-#gdmmktemp_LDADD = \
-# $(INTLLIBS)
-
if DMX_SUPPORT
gdm_dmx_reconnect_proxy_SOURCES = \
gdm-dmx-reconnect-proxy.c
diff --git a/utils/gdmprefetch.c b/utils/gdmprefetch.c
index d37e2a66..155a37d3 100644
--- a/utils/gdmprefetch.c
+++ b/utils/gdmprefetch.c
@@ -113,6 +113,10 @@ main (int argc, char *argv[])
while (fgets (path, sizeof (path), fp) != 0) {
path[strlen(path) -1] = '\0';
+ if (path[0] == '#') {
+ continue;
+ }
+
if (!out) {
doin (path);
} else {