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/gdm-xdmcp-display-factory.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/gdm-xdmcp-display-factory.c')
| -rw-r--r-- | daemon/gdm-xdmcp-display-factory.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c index 75766689..a46112bc 100644 --- a/daemon/gdm-xdmcp-display-factory.c +++ b/daemon/gdm-xdmcp-display-factory.c @@ -57,7 +57,6 @@ #include "gdm-display-store.h" #include "auth.h" -#include "choose.h" /* * On Sun, we need to define allow_severity and deny_severity to link @@ -1088,6 +1087,9 @@ gdm_xdmcp_handle_indirect_query (GdmXdmcpDisplayFactory *factory, } +#if 0 + /* FIXME: Add chooser support */ + id = gdm_choose_indirect_lookup (address); if (id != NULL && id->chosen_host != NULL) { @@ -1133,6 +1135,7 @@ gdm_xdmcp_handle_indirect_query (GdmXdmcpDisplayFactory *factory, } else { gdm_xdmcp_send_willing (factory, address); } +#endif out: XdmcpDisposeARRAYofARRAY8 (&clnt_authlist); @@ -2309,7 +2312,8 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory, g_debug ("gdm_xdmcp_handle_manage: Looked up %s", name); g_free (name); -#if 0 /* FIXME: */ +#if 0 + /* FIXME: Add chooser support */ if (factory->priv->honor_indirect) { GdmIndirectDisplay *id; @@ -2401,10 +2405,13 @@ gdm_xdmcp_handle_managed_forward (GdmXdmcpDisplayFactory *factory, return; } +#if 0 + /* FIXME: Add chooser support */ id = gdm_choose_indirect_lookup_by_chosen (address, disp_address); if (id != NULL) { gdm_choose_indirect_dispose (id); } +#endif /* Note: we send GOT even on not found, just in case our previous * didn't get through and this was a second managed forward */ |