diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | TODO | 9 | ||||
| -rwxr-xr-x | config/Gnome.in | 4 | ||||
| -rw-r--r-- | config/Makefile.am | 8 | ||||
| -rw-r--r-- | daemon/verify-crypt.c | 2 | ||||
| -rw-r--r-- | daemon/verify-pam.c | 2 | ||||
| -rw-r--r-- | daemon/verify-shadow.c | 2 | ||||
| -rw-r--r-- | gui/gdmconfig.c | 4 | ||||
| -rw-r--r-- | gui/gdmlogin.c | 4 |
9 files changed, 33 insertions, 14 deletions
@@ -1,3 +1,15 @@ +Sun Apr 29 23:54:34 2001 George Lebl <jirka@5z.com> + + * config/Gnome.in, config/gnomerc, config/Makefile.am: Revert stupid + changes, now we rely on a new enough gnome-core where gsm + understands GDM_GNOME_SESSION (in a similar way to GDM_LANG) + + * daemon/verify-*.c: Eeeek Forgot to use the GDM_LOGIN prompter + opcode and that made the greeter very unhappy + + * gui/gdmconfig.c, gui/gdmlogin.c: Ignore .orig files as well when + looking at the Sessions dir + Sun Apr 29 22:46:12 2001 George Lebl <jirka@5z.com> * daemon/gdm.[ch], daemon/slave.c, gui/gdmlogin.c: Add running of @@ -6,12 +6,13 @@ Keyboard layout menu. utmp/wtmp handling. -Default login for kiosks machines - DefaultLogin=user - DefaultLoginTimeout=30 - Allow passwordless login for select users on local screens. Think kiosk or public terminal use. Expunge explicit imlib usage from gdmlogin/gdmchooser. (This requires gdk-pixbuf support in GnomeIconList to do properly). + +when installing stuff, overwrite and store old in .orig + +when checking the session file check for number of lines and add a config +options for the max. This is because the filesize might be big. diff --git a/config/Gnome.in b/config/Gnome.in index 3fc46dec..8e357058 100755 --- a/config/Gnome.in +++ b/config/Gnome.in @@ -10,9 +10,7 @@ do fi done -if [ x != x$GDM_GNOME_SESSION ]; then - exec /usr/bin/gnome-session --choose-session "$GDM_GNOME_SESSION" -elif [ -x "$HOME/.gnomerc" ]; then +if [ -x "$HOME/.gnomerc" ]; then exec "$HOME/.gnomerc" else exec "@EXPANDED_SYSCONFDIR@/gdm/gnomerc" diff --git a/config/Makefile.am b/config/Makefile.am index aa87559c..bb994ed4 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -48,7 +48,9 @@ install-data-hook: gdm.conf gnomerc Gnome Failsafe $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ fi - $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; + if test '!' -f $(sessdir)/Gnome; then \ + $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; \ + fi if test '!' -f $(sessdir)/Failsafe; then \ $(INSTALL_SCRIPT) Failsafe $(sessdir)/Failsafe; \ @@ -87,7 +89,9 @@ install-data-hook: gdm.conf gnomerc Gnome Failsafe chmod 755 $(gnomercdir); \ fi - $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; + if test '!' -f $(gnomercdir)/gnomerc; then \ + $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \ + fi if test '!' -d $(authdir); then \ $(mkinstalldirs) $(authdir); \ diff --git a/daemon/verify-crypt.c b/daemon/verify-crypt.c index 8581c448..c591dd8f 100644 --- a/daemon/verify-crypt.c +++ b/daemon/verify-crypt.c @@ -63,7 +63,7 @@ gdm_verify_user (const char *username, /* Ask for the user's login */ if (username == NULL) { - login = gdm_slave_greeter_ctl (GDM_PROMPT, _("Login:")); + login = gdm_slave_greeter_ctl (GDM_LOGIN, _("Login:")); if (login == NULL || gdm_slave_greeter_check_interruption (login)) { if (local) diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c index 3682b397..b0c65202 100644 --- a/daemon/verify-pam.c +++ b/daemon/verify-pam.c @@ -155,7 +155,7 @@ gdm_verify_user (const char *username, if (username == NULL) { /* Ask gdmgreeter for the user's login. Just for good measure */ - login = gdm_slave_greeter_ctl (GDM_PROMPT, _("Login:")); + login = gdm_slave_greeter_ctl (GDM_LOGIN, _("Login:")); if (login == NULL || gdm_slave_greeter_check_interruption (login)) { if (local) diff --git a/daemon/verify-shadow.c b/daemon/verify-shadow.c index 33a9cb38..87f93cb3 100644 --- a/daemon/verify-shadow.c +++ b/daemon/verify-shadow.c @@ -62,7 +62,7 @@ gdm_verify_user (const char *username, const gchar *display, gboolean local) if (username == NULL) { /* Ask for the user's login */ - login = gdm_slave_greeter_ctl (GDM_PROMPT, _("Login:")); + login = gdm_slave_greeter_ctl (GDM_LOGIN, _("Login:")); if (login == NULL || gdm_slave_greeter_check_interruption (login)) { if (local) diff --git a/gui/gdmconfig.c b/gui/gdmconfig.c index 2591eacc..d415de80 100644 --- a/gui/gdmconfig.c +++ b/gui/gdmconfig.c @@ -382,7 +382,9 @@ gdm_config_parse_most (void) gchar *s; /* Ignore backups and rpmsave files */ - if ((strstr (dent->d_name, "~")) || (strstr (dent->d_name, ".rpmsave"))) { + if ((strstr (dent->d_name, "~")) || + (strstr (dent->d_name, ".rpmsave")) || + (strstr (dent->d_name, ".orig"))) { dent = readdir (sessdir); continue; } diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index 0b2ba120..6cb9a543 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -1260,7 +1260,9 @@ gdm_login_session_init (GtkWidget *menu) gchar *s; /* Ignore backups and rpmsave files */ - if ((strstr (dent->d_name, "~")) || (strstr (dent->d_name, ".rpmsave"))) { + if ((strstr (dent->d_name, "~")) || + (strstr (dent->d_name, ".rpmsave")) || + (strstr (dent->d_name, ".orig"))) { dent = readdir (sessdir); continue; } |