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

8 files changed, 2 insertions, 478 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index 4179061c..8bebda5c 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -17,40 +17,25 @@ noinst_DATA = \
 	gdm.conf		\
 	$(NULL)
 
-DESKTOP_FILES = \
-	default.desktop		\
-	$(NULL)
-
 EXTRA_DIST = 			\
 	gdm.conf.in 		\
 	gdm.conf-custom.in 	\
-	$(DESKTOP_FILES) 	\
-	default.desktop.in 	\
-	ssh.desktop.in.in 	\
 	Xsession.in 		\
 	gdm 			\
 	gdm-autologin 		\
-	locale.alias 		\
 	Init.in 		\
 	PreSession.in 		\
 	PostSession.in 		\
 	PostLogin 		\
-	XKeepsCrashing 		\
-	gettextfoo.h 		\
-	gdmprefetchlist.in 	\
-	extract-shell.sh	\
 	$(NULL)
 
 CLEANFILES = 			\
 	Xsession		\
 	gdm.conf		\
 	gdm.conf-custom		\
-	default.desktop		\
-	ssh.desktop		\
 	Init			\
 	PreSession		\
 	PostSession		\
-	gdmprefetchlist		\
 	$(NULL)
 
 Xsession: $(srcdir)/Xsession.in
@@ -59,8 +44,7 @@ Xsession: $(srcdir)/Xsession.in
 		<$(srcdir)/Xsession.in >Xsession
 
 gdm.conf: $(srcdir)/gdm.conf.in
-	sed	-e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
-		-e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
+	sed     -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
 		-e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
 		-e 's,[@]HALT_COMMAND[@],$(HALT_COMMAND),g' \
 		-e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
@@ -90,32 +74,20 @@ gdm.conf-custom: $(srcdir)/gdm.conf-custom.in
 	sed	-e 's,[@]GDM_DEFAULTS_CONF[@],$(GDM_DEFAULTS_CONF),g' \
 		<$(srcdir)/gdm.conf-custom.in >gdm.conf-custom
 
-gettextfoo.h: XKeepsCrashing Xsession.in
-	cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
-
 @INTLTOOL_DESKTOP_RULE@
 
-clean-local:
-	rm -f $(DESKTOP_FILES)
-
 uninstall-hook:
 	rm -f \
-	$(DESTDIR)$(bisessdir)/default.desktop \
-	$(DESTDIR)$(instsessdir)/default.desktop \
-	$(DESTDIR)$(instsessdir)/ssh.desktop \
 	$(DESTDIR)$(GDM_DEFAULTS_CONF) \
 	$(DESTDIR)$(GDM_CUSTOM_CONF) \
 	`dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)` \
-	$(DESTDIR)$(confdir)/XKeepsCrashing \
 	$(DESTDIR)$(confdir)/Xsession \
-	$(DESTDIR)$(confdir)/gdmprefetchlist \
-	$(DESTDIR)$(gdmlocaledir)/locale.alias \
 	$(DESTDIR)$(initdir)/Default \
 	$(DESTDIR)$(postlogindir)/Default.sample \
 	$(DESTDIR)$(predir)/Default \
 	$(DESTDIR)$(postdir)/Default
 
-install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession $(DESKTOP_FILES) $(GDMPREFETCHLIST)
+install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession
 	if test '!' -d $(DESTDIR)$(confdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(confdir); \
 		chmod 755 $(DESTDIR)$(confdir); \
@@ -149,14 +121,8 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession
 	fi
 	$(INSTALL_DATA) gdm.conf `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)`
 
-	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
 	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
 
-	-if test -f $(DESTDIR)$(gdmlocaledir)/locale.alias; then \
-		cp -f $(DESTDIR)$(gdmlocaledir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias.orig; \
-	fi
-	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias
-
 	if test '!' -d $(DESTDIR)$(bisessdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
 		chmod 755 $(DESTDIR)$(bisessdir); \
@@ -167,15 +133,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession
 		chmod 755 $(DESTDIR)$(instsessdir); \
 	fi
 
-	-if test -f $(DESTDIR)$(bisessdir)/Default.desktop; then \
-		mv -f $(DESTDIR)$(bisessdir)/Default.desktop $(DESTDIR)$(bisessdir)/Default.desktop.orig; \
-	fi
-	-if test -f $(DESTDIR)$(bisessdir)/default.desktop; then \
-		cp -f $(DESTDIR)$(bisessdir)/default.desktop $(DESTDIR)$(bisessdir)/default.desktop.orig; \
-	fi
-	$(INSTALL_DATA) default.desktop $(DESTDIR)$(bisessdir)/default.desktop
-	chmod 644 $(DESTDIR)$(bisessdir)/default.desktop
-
 	if test '!' -d $(DESTDIR)$(initdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(initdir); \
 		chmod 755 $(DESTDIR)$(initdir); \
@@ -243,15 +200,3 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession
 	   fi; \
 	fi
 
-	if test "x$(GDMPREFETCHLIST)" != "x"; then \
-	   $(INSTALL_DATA) gdmprefetchlist $(DESTDIR)$(confdir)/gdmprefetchlist; \
-	fi
-
-	if test "x$(SSHDESKTOP)" != "x"; then \
-	   if test -f $(DESTDIR)$(instsessdir)/ssh.desktop; then \
-		cp -f $(DESTDIR)$(instsessdir)/ssh.desktop $(DESTDIR)$(instsessdir)/ssh.desktop.orig; \
-	   fi; \
-	   $(INSTALL_SCRIPT) ssh.desktop $(DESTDIR)$(instsessdir)/ssh.desktop; \
-	   chmod 644 $(DESTDIR)$(instsessdir)/ssh.desktop; \
-	fi
-
diff --git a/config/XKeepsCrashing b/config/XKeepsCrashing
deleted file mode 100755
index 5b7c4a88..00000000
--- a/config/XKeepsCrashing
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh
-
-if test "x$UNSAFE_TO_TRANSLATE" = "xyes" ; then
-  LANG=C
-  unset LC_ALL
-  unset LC_MESSAGES
-fi
-
-if test -x "$LIBEXECDIR/gdmtranslate" ; then
-  GDMTRANSLATE="$LIBEXECDIR/gdmtranslate"
-else
-  GDMTRANSLATE=
-fi
-
-gettextfunc () {
-  if test "x$GDMTRANSLATE" != "x" ; then
-    "$GDMTRANSLATE" "$1"
-  else
-    echo "$1"
-  fi
-}
-
-OLD_IFS=$IFS
-
-gdmwhich () {
-  COMMAND="$1"
-  OUTPUT=
-  IFS=:
-  for dir in $PATH
-  do
-    if test -x "$dir/$COMMAND" ; then
-      if test "x$OUTPUT" = "x" ; then
-        OUTPUT="$dir/$COMMAND"
-      fi
-    fi
-  done
-  IFS=$OLD_IFS
-  echo "$OUTPUT"
-}
-
-MSG3=`gettextfunc "Failed to start the X server (your graphical interface).  It is likely that it is not set up correctly.  You will need to log in on a console and reconfigure the X server.  Then restart GDM."`
-MSG4=`gettextfunc "Would you like to try to configure the X server?  Note that you will need the root password for this."`
-MSG5=`gettextfunc "Please type in the root (privileged user) password."`
-MSG6=`gettextfunc "Trying to restart the X server."`
-MSG7=`gettextfunc "The X server is now disabled.  Restart GDM when it is configured correctly."`
-MSG8=`gettextfunc "Failed to start the X server (your graphical interface).  It is likely that it is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
-MSG9=`gettextfunc "Would you like to view the detailed X server output as well?"`
-
-# there are some env vars defined:
-# XLOG = the log file for the X server
-# BINDIR = location of gdm binaries
-# SBINDIR = location of gdm system binaries
-# LIBEXECDIR = location of gdm libexec binaries (gdmaskpass, gdmopen)
-
-# return values are
-# 0 = try again, runs this server again
-# 1 = abort this display, removes this server from the list
-# 32 = something went very wrong, things will just get logged.
-#      this means this script didnt work so do alternative things
-#      to tell the user if possible
-
-#
-# First see if we can find an X configuration program
-#  (first one in the list will be used)
-#
-XCONFIGURATOR=
-for n in \
-  /usr/bin/system-config-display \
-  /usr/bin/redhat-config-xfree86 \
-  /usr/sbin/XFdrake		 \
-  /usr/bin/X11/XF86Setup	 \
-  /usr/bin/X11/Xconfigurator	 \
-  /usr/bin/X11/xf86cfg		 \
-   ; do
-  # standard shell test has no or and loops have no breaks, eek
-  if test "x$XCONFIGURATOR" = "x" ; then
-    if test -x "$n" ; then
-      XCONFIGURATOR="$n"
-    fi
-  fi
-done
-
-#
-# Now we check for dialog and gdmaskpass
-#
-DIALOG=`gdmwhich dialog`
-if test "x$DIALOG" = "x" ; then
-  DIALOG=`gdmwhich whiptail`
-fi
-if test -x "$LIBEXECDIR/gdmaskpass" ; then
-  ASKPASS="$LIBEXECDIR/gdmaskpass"
-else
-  ASKPASS=
-fi
-
-#
-#  If this is a mouse problem try mouseconfig and modify some
-#  messages
-#
-if grep '^\(Cannot open mouse\|No core pointer\)' "$XLOG" 2> /dev/null ; then
-
-  MSG8=`gettextfunc "Failed to start the X server (your graphical interface).  It seems that the pointer device (your mouse) is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
-
-  if test -x /usr/sbin/mouseconfig ; then
-    XCONFIGURATOR=/usr/sbin/mouseconfig
-    # Note: we know this is a mouse problem and yay we have mouseconfig
-    MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."`
-  fi
-
-  if test -x /usr/bin/system-config-mouse ; then
-    XCONFIGURATOR=/usr/bin/system-config-mouse
-    # Note: we know this is a mouse problem and yay we have system-config-mouse
-    MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."`
-  fi
-
-fi
-
-# we require 'gdmopen', to open a console, because we really dont
-# have one.  Perhaps someone should try to figure out some shell
-# black magic to get this to work on other then linux systems
-if test ! -x "$LIBEXECDIR/gdmopen" ; then
-  exit 32
-fi
-
-# when we run ourselves from the open we will pass a -noopen argument
-if test "x$1" = "x-noopen" ; then
-  shift
-else
-  #
-  # We do a lot of work wastefully over again, but oh well,
-  # perhaps this needs fixing.
-  #
-  "$LIBEXECDIR/gdmopen" -l /bin/sh -c "$0 -noopen $@"
-  exit $?
-fi
-
-clear
-
-# Note, dialog required, though this script could be fixed to not require it
-# I suppose
-if test "x" = "x$DIALOG" ; then
-  echo =======================================================================
-  echo 
-  cat "$XLOG"
-  echo 
-  echo =======================================================================
-  echo
-  if test -x /usr/bin/fmt ; then
-    echo  "$MSG3" | /usr/bin/fmt
-  else
-    echo  "$MSG3"
-  fi
-  echo
-  echo =======================================================================
-  read
-  exit 1
-fi
-
-if "$DIALOG" --yesno "$MSG8" 10 50 ; then 
-  "$DIALOG" --textbox "$XLOG" 22 76
-  # Support XFree86 v4 logfile thingie
-  if grep '^(..) Log file: "' "$XLOG" 2> /dev/null ; then
-    XLOG_DETAIL=`grep '^(..) Log file: "' "$XLOG" | sed 's/^[^"]*"\([^"]*\)".*$/\1/'`
-    if "$DIALOG" --yesno "$MSG9" 10 50 ; then 
-      "$DIALOG" --textbox "$XLOG_DETAIL" 22 76
-    fi
-  fi
-fi
-
-if test "x$XCONFIGURATOR" = "x" ; then
-  "$DIALOG" --msgbox "$MSG7" 8 50
-  exit 1
-fi
-
-if "$DIALOG" --yesno "$MSG4" 10 50 ; then 
-  clear
-  echo
-  echo "$MSG5"
-  if test "x$ASKPASS" = "x" ; then
-    # dirty trick to fool su into asking the root password even if were
-    # root
-    su nobody -c "su -c $XCONFIGURATOR"
-  else
-    if "$ASKPASS" ; then
-      "$XCONFIGURATOR"
-    fi
-  fi
-  clear
-  "$DIALOG" --msgbox "$MSG6" 8 50
-  exit 0
-else
-  "$DIALOG" --msgbox "$MSG7" 8 50
-  exit 1
-fi
diff --git a/config/default.desktop.in b/config/default.desktop.in
deleted file mode 100644
index 8bed5b3d..00000000
--- a/config/default.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-# The names/descriptions should really be better
-_Name=Run Xclient script
-_Comment=This session runs the Xclients script
-Exec=default
-# The "default" Exec is a very special one and is handled specially in
-# the Xsession script, you could also have "custom" which would just run
-# "~/.xsession" directly
-Icon=
-Type=Application
diff --git a/config/extract-shell.sh b/config/extract-shell.sh
deleted file mode 100755
index 59528e0c..00000000
--- a/config/extract-shell.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "/* DO NOT CHANGE HEADER FILE BY HAND! CHANGE THE extract-shell.sh */"
-echo "/* SCRIPT THIS IS GENERATED.  ADD A CHANGELOG ENTRY IF YOU MODIFY */"
-echo "/* THIS SCRIPT.                                                   */"
-echo "/* ALWAYS ADD A CHANGELOG OR I WILL PERSONALLY KICK YOUR ASS! */"
-grep gettextfunc | fgrep -v 'gettextfunc ()' | sed 's/^.*gettextfunc[^"]*\("[^"]*"\).*$/const char *foo = N_(\1);/'
diff --git a/config/gdmprefetchlist.in b/config/gdmprefetchlist.in
deleted file mode 100644
index 45cbbfc6..00000000
--- a/config/gdmprefetchlist.in
+++ /dev/null
@@ -1,43 +0,0 @@
-# If GDM is built with the --with-prefetch option, then this file
-# is installed on the system, and the gdm.conf PreFetchProgram
-# value should be set properly to cause the first login program 
-# managed to preload this list of libraries.  It has been shown that
-# preloading these libraries improves first-time login performance
-# for the GNOME desktop.
-#
-# This list of libraries has been optimized for a GNOME session running
-# on Solaris.  People who want to contribute alternative lists of
-# libraries for other distributions or desktop environments can 
-# contribute them to the "gdm" category in http://bugzilla.gnome.org/,
-# and these can be made available in future releases of GDM.
-#
-/usr/share/icons/hicolor/icon-theme.cache
-/usr/share/icons/blueprint/icon-theme.cache
-/usr/share/icons/gnome/icon-theme.cache
-/usr/bin/nautilus
-/usr/bin/gnome-panel
-/usr/lib/libbonoboui-2.so
-/usr/lib/libwnck-1.so
-/usr/lib/libgnomevfs-2.so
-/usr/bin/metacity
-/usr/lib/libeel-2.so
-/usr/lib/libbonobo-2.so
-/usr/openwin/lib/libXt.so
-/usr/lib/libgnomeui-2.so
-/usr/lib/clock-applet
-/usr/lib/libORBit-2.so
-/usr/X11/lib/libGL.so
-/usr/openwin/lib/X11/fonts/TrueType/VeraMoIt.ttf
-/usr/lib/libgnome-desktop-2.so
-/usr/lib/wnck-applet
-/usr/lib/libgstreamer-0.10.so
-/usr/dt/lib/libXm.so
-/usr/lib/libpoppler.so
-/usr/lib/libgconf-2.so
-/usr/sfw/lib/libcrypto.so
-/usr/lib/nautilus/extensions-1.0/libevince-properties-page.so
-/usr/lib/gnome-vfs-2.0/modules/libmapping.so
-/usr/lib/libpoppler-glib.so
-/usr/lib/libpanel-applet-2.so
-/usr/lib/libstartup-notification-1.so
-/usr/lib/libatk-1.0.so
diff --git a/config/gettextfoo.h b/config/gettextfoo.h
deleted file mode 100644
index 63d4e22f..00000000
--- a/config/gettextfoo.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* DO NOT CHANGE HEADER FILE BY HAND! CHANGE THE extract-shell.sh */
-/* SCRIPT THIS IS GENERATED.  ADD A CHANGELOG ENTRY IF YOU MODIFY */
-/* THIS SCRIPT.                                                   */
-/* ALWAYS ADD A CHANGELOG OR I WILL PERSONALLY KICK YOUR ASS! */
-const char *foo = N_("Failed to start the X server (your graphical interface).  It is likely that it is not set up correctly.  You will need to log in on a console and reconfigure the X server.  Then restart GDM.");
-const char *foo = N_("Would you like to try to configure the X server?  Note that you will need the root password for this.");
-const char *foo = N_("Please type in the root (privileged user) password.");
-const char *foo = N_("Trying to restart the X server.");
-const char *foo = N_("The X server is now disabled.  Restart GDM when it is configured correctly.");
-const char *foo = N_("Failed to start the X server (your graphical interface).  It is likely that it is not set up correctly.  Would you like to view the X server output to diagnose the problem?");
-const char *foo = N_("Would you like to view the detailed X server output as well?");
-const char *foo = N_("Failed to start the X server (your graphical interface).  It seems that the pointer device (your mouse) is not set up correctly.  Would you like to view the X server output to diagnose the problem?");
-const char *foo = N_("Would you like to try to configure the mouse?  Note that you will need the root password for this.");
-const char *foo = N_("Would you like to try to configure the mouse?  Note that you will need the root password for this.");
-const char *foo = N_("This is the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner");
-const char *foo = N_("Failed to start the session, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is above them.  To get out of this mode type 'exit' in the window in the upper left corner");
diff --git a/config/locale.alias b/config/locale.alias
deleted file mode 100644
index 0241e393..00000000
--- a/config/locale.alias
+++ /dev/null
@@ -1,145 +0,0 @@
-# NOTE! This is a broken way to do things.  GDM currently reads languages ONLY
-# from this file.  This is Broken(tm).  This setup will be replaced in some
-# future version to be replaced by some automatic detection of available
-# locales.  This file is not really a locale.alias file and the first word
-# is used as a label in case gdm doesn't know this language personally,
-# else it's ignored.
-#
-# The format of this file is SIMILAR (but not the same to the locale.alias
-# format).  You could however point gdm at a real locale.alias and it would
-# still concievably work.  Note that the first word cannot contain any spaces.
-# The second word can be a comma separated list of locales to try.  GDM will
-# try if each locale exists and only if it does will it show that locale.  The
-# list is tried in order and the first working one is used.
-#
-#		- George
-
-C(POSIX)		C,POSIX
-Afrikaans		af_ZA.UTF-8,af_ZA
-Albanian		sq_AL.UTF-8,sq_AL
-Amharic			am_ET.UTF-8,am_ET
-Arabic(Egypt)		ar_EG.UTF-8,ar_EG
-Arabic(Lebanon)		ar_LB.UTF-8,ar_LB
-Arabic(SaudiArabia)	ar_SA.UTF-8,ar_SA
-Armenian		hy_AM.UTF-8,hy_AM
-Azerbaijani		az_AZ.UTF-8,az_AZ
-Azerbaijani(Iran)	az_IR.UTF-8,az_IR
-Basque			eu_ES.UTF-8,eu_ES
-Belarusian		be_BY.UTF-8,be_BY
-Bengali			bn_BD.UTF-8,bn_BD
-Bengali(India)		bn_IN.UTF-8,bn_IN
-Bosnian			bs_BA.UTF-8,bs_BA
-Breton			br_FR.UTF-8,br_FR
-Bulgarian		bg_BG.UTF-8,bg_BG
-Catalan			ca_ES.UTF-8,ca_ES
-Chinese(ChinaMainland)	zh_CN.UTF-8,zh_CN
-Chinese(GB18030)	zh_CN.GB18030
-Chinese(Hong-Kong)	zh_HK.UTF-8,zh_HK
-Chinese(Singapore)	zh_SG.UTF-8,zh_SG
-Chinese(Taiwan)		zh_TW.UTF-8,zh_TW
-Croatian		hr_HR.UTF-8,hr_HR
-Czech			cs_CZ.UTF-8,cs_CZ
-Danish			da_DK.UTF-8,da_DK
-Dutch			nl_NL.UTF-8,nl_NL
-Dutch(Belgium)		nl_BE.UTF-8,nl_BE
-English(Australia)	en_AU.UTF-8,en_AU
-English(Canada)		en_CA.UTF-8,en_CA
-English(Ireland)	en_IE.UTF-8,en_IE
-English(Malta)		en_MT.UTF-8,en_MT
-English(NewZealand)	en_NZ.UTF-8,en_NZ
-English(SouthAfrica)	en_ZA.UTF-8,en_ZA
-English(UK)		en_GB.UTF-8,en_GB
-English(USA)		en_US.UTF-8,en_US
-Esperanto		eo.UTF-8,eo
-Estonian		et_EE.UTF-8,et_EE
-Finnish			fi_FI.UTF-8,fi_FI
-French			fr_FR.UTF-8,fr_FR
-French(Belgium)		fr_BE.UTF-8,fr_BE
-French(Canada)		fr_CA.UTF-8,fr_CA
-French(Luxembourg)	fr_LU.UTF-8,fr_LU
-French(Switzerland)	fr_CH.UTF-8,fr_CH
-Galician		gl_ES.UTF-8,gl_ES
-German			de_DE.UTF-8,de_DE
-German(Austria)		de_AT.UTF-8,de_AT
-German(Switzerland)	de_CH.UTF-8,de_CH
-German(Luxembourg)	de_LU.UTF-8,de_LU
-Greek			el_GR.UTF-8,el_GR
-Greek(Cyprus)		el_CY.UTF-8,el_CY
-Gujarati		gu_IN.UTF-8,gu_IN
-Hebrew			he_IL.UTF-8,he_IL
-Hindi			hi_IN.UTF-8,hi_IN
-Hungarian		hu_HU.UTF-8,hu_HU
-Icelandic		is_IS.UTF-8,is_IS
-Indonesian		id_ID.UTF-8,id_ID
-Interlingua		ia.UTF-8,ia
-Irish			ga_IE.UTF-8,ga_IE
-Italian			it_IT.UTF-8,it_IT
-Japanese		ja_JP.UTF-8,ja_JP
-Kannada			kn_IN.UTF-8,kn_IN
-Kinyarwanda		rw_RW.UTF-8,rw_RW
-Korean			ko_KR.UTF-8,ko_KR
-Latvian			lv_LV.UTF-8,lv_LV
-Limburgish		li_NL.UTF-8,li_NL
-Limburgish(Belgium)	li_BE.UTF-8,li_BE
-Limburgish(Germany)	li_DE.UTF-8,li_DE
-Lithuanian		lt_LT.UTF-8,lt_LT
-Macedonian		mk_MK.UTF-8,mk_MK
-Malayalam		ml_IN.UTF-8,ml_IN
-Malay			ms_MY.UTF-8,ms_MY
-Maltese			mt_MT.UTF-8,mt_MT
-Maori			mi_NZ.UTF-8,mi_NZ	
-Marathi			mr_IN.UTF-8,mr_IN
-Mongolian		mn_MN.UTF-8,mn_MN
-Nepali			ne_NP.UTF-8,ne_NP
-NorthernSotho		nso_ZA.UTF-8,nso_ZA
-Norwegian(bokmal)	nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
-Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
-Oriya			or_IN.UTF-8,or_IN
-Persian			fa_IR.UTF-8,fa_IR
-Polish			pl_PL.UTF-8,pl_PL
-Portuguese(Brazilian)	pt_BR.UTF-8,pt_BR
-Portuguese		pt_PT.UTF-8,pt_PT
-Punjabi			pa_IN.UTF-8,pa_IN
-Romanian		ro_RO.UTF-8,ro_RO
-Russian			ru_RU.UTF-8,ru_RU
-Serbian			sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
-Serbian(Montenegro)	sr_ME.UTF-8

-Serbian(Serbia)		sr_RS.UTF-8

-Serbian(Bosnia)		sh_BA.UTF-8,sh_BA
-Serbian(Latin)		sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
-Serbian(Jekavian)	sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
-Slovak			sk_SK.UTF-8,sk_SK
-Slovenian		sl_SI.UTF-8,sl_SI
-Spanish			es_ES.UTF-8,es_ES
-Spanish(Argentina)	es_AR.UTF-8,es_AR
-Spanish(Bolivia)	es_BO.UTF-8,es_BO
-Spanish(Chile)		es_CL.UTF-8,es_CL
-Spanish(Colombia)	es_CO.UTF-8,es_CO
-Spanish(CostaRica)	es_CR.UTF-8,es_CR
-Spanish(Ecuador)	es_EC.UTF-8,es_EC
-Spanish(Guatemala)	es_GT.UTF-8,es_GT
-Spanish(Mexico)		es_MX.UTF-8,es_MX
-Spanish(Nicaragua)	es_NI.UTF-8,es_NI
-Spanish(Panama)		es_PA.UTF-8,es_PA
-Spanish(Peru)		es_PE.UTF-8,es_PE
-Spanish(Paraguay)	es_PY.UTF-8,es_PY
-Spanish(ElSalvador)	es_SV.UTF-8,es_SV
-Spanish(Uruguay)	es_UY.UTF-8,es_UY
-Spanish(Venezuela)	es_VE.UTF-8,es_VE
-Swedish(Finland)	sv_FI.UTF-8,sv_FI
-Swedish			sv_SE.UTF-8,sv_SE
-Tagalog			tl_PH.UTF-8,tl_PH
-Tajik			tg_TJ.UTF-8,tg_TJ
-Tamil			ta_IN.UTF-8,ta_IN
-Telugu			te_IN.UTF-8,te_IN
-Thai			th_TH.UTF-8,th_TH
-Turkish			tr_TR.UTF-8,tr_TR
-Ukrainian		uk_UA.UTF-8,uk_UA
-Uzbek			uz_UZ.UTF-8,uz_UZ
-Uzbek(Latin)		uz_UZ.UTF-8@Latn,uz_UZ@Latn
-Vietnamese		vi_VN.UTF-8,vi_VN
-Walloon			wa_BE.UTF-8,wa_BE
-Welsh			cy_GB.UTF-8,cy_GB
-Xhosa			xh_ZA.UTF-8,xh_ZA
-Yiddish			yi.UTF-8,yi
-Zulu			zu_ZA.UTF-8,zu_ZA
diff --git a/config/ssh.desktop.in.in b/config/ssh.desktop.in.in
deleted file mode 100644
index e2a128fa..00000000
--- a/config/ssh.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Secure Remote connection
-_Comment=This session logs you into a remote host using ssh
-Exec=@GDMSSHSESSIONCMD@
-Type=Application