Remove some more obsolete stuff. Make distcheck happy.

2007-10-04  William Jon McCann  <mccann@jhu.edu>

	* common/gdm-common-unknown-origin.c: (gdm_safe_fopen_w):
	* common/gdm-common-unknown-origin.h:
	* common/gdm-common.c:
	* configure.ac:
	* daemon/gdm-slave.c: (gdm_slave_connect_to_x11_display):
	* daemon/gdm-xdmcp-display-factory.c:
	(gdm_xdmcp_handle_indirect_query),
	(gdm_xdmcp_handle_managed_forward):
	* daemon/main.c: (main_restoreenv), (gdm_restart_now),
	(check_logdir), (check_servauthdir), (set_effective_user_group),
	(gdm_daemon_check_permissions), (gdm_daemon_change_user), (main):
	Remove some more obsolete stuff.  Make distcheck happy.


svn path=/branches/mccann-gobject/; revision=5342

1 files changed, 1 insertions, 126 deletions

diff --git a/common/gdm-common-unknown-origin.c b/common/gdm-common-unknown-origin.c
index cecd3433..3bc8a058 100644
--- a/common/gdm-common-unknown-origin.c
+++ b/common/gdm-common-unknown-origin.c
@@ -27,111 +27,13 @@
 #include <locale.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <setjmp.h>
-#include <dirent.h>
-
-#ifdef HAVE_CRT_EXTERNS_H
-#include <crt_externs.h>
-#endif
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 
 #include "gdm-common.h"
 
-static int sigchld_blocked = 0;
-static sigset_t sigchldblock_mask, sigchldblock_oldmask;
-
-static int sigterm_blocked = 0;
-static sigset_t sigtermblock_mask, sigtermblock_oldmask;
-
-static int sigusr2_blocked = 0;
-static sigset_t sigusr2block_mask, sigusr2block_oldmask;
-
-void
-gdm_sigchld_block_push (void)
-{
-        sigchld_blocked++;
-
-        if (sigchld_blocked == 1) {
-                /* Set signal mask */
-                sigemptyset (&sigchldblock_mask);
-                sigaddset (&sigchldblock_mask, SIGCHLD);
-                sigprocmask (SIG_BLOCK, &sigchldblock_mask, &sigchldblock_oldmask);
-        }
-}
-
-void
-gdm_sigchld_block_pop (void)
-{
-        sigchld_blocked --;
-
-        if (sigchld_blocked == 0) {
-                /* Reset signal mask back */
-                sigprocmask (SIG_SETMASK, &sigchldblock_oldmask, NULL);
-        }
-}
-
-void
-gdm_sigterm_block_push (void)
-{
-        sigterm_blocked++;
-
-        if (sigterm_blocked == 1) {
-                /* Set signal mask */
-                sigemptyset (&sigtermblock_mask);
-                sigaddset (&sigtermblock_mask, SIGTERM);
-                sigaddset (&sigtermblock_mask, SIGINT);
-                sigaddset (&sigtermblock_mask, SIGHUP);
-                sigprocmask (SIG_BLOCK, &sigtermblock_mask, &sigtermblock_oldmask);
-        }
-}
-
-void
-gdm_sigterm_block_pop (void)
-{
-        sigterm_blocked --;
-
-        if (sigterm_blocked == 0) {
-                /* Reset signal mask back */
-                sigprocmask (SIG_SETMASK, &sigtermblock_oldmask, NULL);
-        }
-}
-
-void
-gdm_sigusr2_block_push (void)
-{
-        sigset_t oldmask;
-
-        if (sigusr2_blocked == 0) {
-                /* Set signal mask */
-                sigemptyset (&sigusr2block_mask);
-                sigaddset (&sigusr2block_mask, SIGUSR2);
-                sigprocmask (SIG_BLOCK, &sigusr2block_mask, &oldmask);
-        }
-
-        sigusr2_blocked++;
-
-        sigusr2block_oldmask = oldmask;
-}
-
-void
-gdm_sigusr2_block_pop (void)
-{
-        sigset_t oldmask;
-
-        oldmask = sigusr2block_oldmask;
-
-        sigusr2_blocked--;
-
-        if (sigusr2_blocked == 0) {
-                /* Reset signal mask back */
-                sigprocmask (SIG_SETMASK, &sigusr2block_oldmask, NULL);
-        }
-}
-
 /* Like fopen with "w" */
 FILE *
 gdm_safe_fopen_w (const char *file,
@@ -162,30 +64,3 @@ gdm_safe_fopen_w (const char *file,
         ret = fdopen (fd, "w");
         return ret;
 }
-
-/**
- * ve_clearenv:
- *
- * Description: Clears out the environment completely.
- * In case there is no native implementation of clearenv,
- * this could cause leaks depending on the implementation
- * of environment.
- *
- **/
-void
-ve_clearenv (void)
-{
-#ifdef HAVE_CLEARENV
-        clearenv ();
-#else
-
-#ifdef HAVE__NSGETENVIRON
-#define environ (*_NSGetEnviron())
-#else
-        extern char **environ;
-#endif
-
-        if (environ != NULL)
-                environ[0] = NULL;
-#endif
-}