diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-10-04 22:25:28 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-04 22:25:28 +0000 |
| commit | e2bf2da75482d853c5da54e4dc6b89d0596e68fa (patch) | |
| tree | 03776231997a2ef2ab8900ae922e1f6422715466 /daemon/main.c | |
| parent | 14333ef1ffc4d2c5b162d2631c52ab71d88a2641 (diff) | |
| download | gdm-e2bf2da75482d853c5da54e4dc6b89d0596e68fa.tar.gz | |
Remove some more obsolete code. Move common code with unknown copyright
2007-10-04 William Jon McCann <mccann@jhu.edu>
* common/Makefile.am:
* common/gdm-common-unknown-origin.c: (gdm_sigchld_block_push),
(gdm_sigchld_block_pop), (gdm_sigterm_block_push),
(gdm_sigterm_block_pop), (gdm_sigusr2_block_push),
(gdm_sigusr2_block_pop), (gdm_safe_fopen_w), (ve_clearenv):
* common/gdm-common-unknown-origin.h:
* common/gdm-common.c:
* common/gdm-common.h:
* config/Makefile.am:
* config/XKeepsCrashing:
* config/default.desktop.in:
* config/extract-shell.sh:
* config/gdmprefetchlist.in:
* config/gettextfoo.h:
* config/locale.alias:
* config/ssh.desktop.in.in:
* configure.ac:
* daemon/Makefile.am:
* daemon/choose.c:
* daemon/choose.h:
* daemon/gdm-xdmcp-display-factory.c:
(gdm_xdmcp_handle_indirect_query), (gdm_xdmcp_handle_manage),
(gdm_xdmcp_handle_managed_forward):
* daemon/main.c: (delete_pid):
* utils/Makefile.am:
* utils/gdm-dmx-reconnect-proxy.c:
Remove some more obsolete code. Move common
code with unknown copyright status into separate file.
Try to identify more copy with unknown copyright status.
svn path=/branches/mccann-gobject/; revision=5340
Diffstat (limited to 'daemon/main.c')
| -rw-r--r-- | daemon/main.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/daemon/main.c b/daemon/main.c index 822d719a..3d2034e2 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -30,18 +30,17 @@ #include <fcntl.h> #include <pwd.h> #include <grp.h> +#include <wait.h> #include <glib.h> #include <glib/gi18n.h> +#include <glib/gstdio.h> #include <glib-object.h> #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -/* Needed for signal handling */ -#include "gdm-common.h" - #include "gdm-manager.h" #include "gdm-log.h" #include "gdm-signal-handler.h" @@ -215,7 +214,7 @@ bus_proxy_destroyed_cb (DBusGProxy *bus_proxy, static void delete_pid (void) { - unlink (GDM_PID_FILE); + g_unlink (GDM_PID_FILE); } static void @@ -256,6 +255,11 @@ gdm_final_cleanup (void) g_object_unref (manager); } +/* + * ------------------------------------- + * BEGIN Copyright status/holder unknown + * ------------------------------------- + */ static void main_saveenv (void) { @@ -446,6 +450,12 @@ gdm_daemon_change_user (uid_t *uidp, g_free (groupname); } +/* + * ------------------------------------- + * END Copyright status/holder unknown + * ------------------------------------- + */ + static gboolean signal_cb (int signo, gpointer data) |