From c644978b53d2f0ef17c5fcdc3aab4c278e5d45c9 Mon Sep 17 00:00:00 2001 From: George Lebl Date: Mon, 27 May 2002 21:37:05 +0000 Subject: remove some dead code, minor fixes Mon May 27 13:39:52 2002 George Lebl * daemon/auth.c, daemon/slave.c: remove some dead code, minor fixes * gui/gdmchooser.c: remove gnome init, remove dead code * gui/gdmlogin.c: remove hang on browser image getting * gui/gdmphotosetup.c: remove the trusted dir crap. Now we always copy to ~/.gnome/photo. this removes the need for needing to know gnome's pixmap path, and gets rid of some uglieness. We still support a bit of the trusted dir stuff in the daemon for compatibility. * gui/gdmsetup.c: don't create dirs only when running under gdm --- daemon/auth.c | 3 ++- daemon/slave.c | 28 +++------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) (limited to 'daemon') diff --git a/daemon/auth.c b/daemon/auth.c index a2a17c2c..acf4eb7d 100644 --- a/daemon/auth.c +++ b/daemon/auth.c @@ -467,7 +467,8 @@ gdm_auth_user_add (GdmDisplay *d, uid_t user, const char *homedir) while (auths) { if ( ! XauWriteAuth (af, auths->data)) { - gdm_error (_("%s: Could not write cookie")); + gdm_error (_("%s: Could not write cookie"), + "gdm_auth_user_add"); ret = FALSE; break; } diff --git a/daemon/slave.c b/daemon/slave.c index cd5c6ae3..77e017bd 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -1016,37 +1016,15 @@ gdm_slave_wait_for_login (void) } /* If path starts with a "trusted" directory, don't sanity check things */ +/* This is really somewhat "outdated" as we now really want things in + * the picture dir or in ~/.gnome/photo */ static gboolean is_in_trusted_pic_dir (const char *path) { -#if 0 - GSList *locations = NULL, *li; -#endif - /* our own pixmap dir is trusted */ if (strncmp (path, EXPANDED_PIXMAPDIR, sizeof (EXPANDED_PIXMAPDIR)) == 0) return TRUE; - /* FIXME: somehow get gnomes locations and all that */ -#if 0 - /* we have no gnome-program and we don't want one */ - g_free (gnome_program_locate_file (NULL /* program */, - GNOME_FILE_DOMAIN_PIXMAP, - "" /* file_name */, - FALSE /* only_if_exists */, - &locations)); - for (li = locations; li != NULL; li = li->next) { - /* gnome's pixmap dirs are trusted */ - if (strncmp (path, li->data, strlen (li->data)) == 0) { - g_slist_foreach (locations, (GFunc)g_free, NULL); - g_slist_free (locations); - return TRUE; - } - } - g_slist_foreach (locations, (GFunc)g_free, NULL); - g_slist_free (locations); -#endif - return FALSE; } @@ -1074,7 +1052,7 @@ run_pictures (void) g_free (response); return; } - + pwent = getpwnam (response); if (pwent == NULL) { gdm_slave_greeter_ctl_no_ret (GDM_READPIC, ""); -- cgit v1.2.1