Bug#270374: Patch to use x-terminal-emulator instead of xterm

[Jens Peter Secher]

In addition to the patch below, all "xterm" in Xsession should be
replaced by "x-terminal-emulator".

Cheers,
-- 
                                                    Jens Peter Secher
_DD6A 05B0 174E BFB2 D4D9 B52E 0EE5 978A FE63 E8A1 jpsecher gmail com_

--- daemon/slave.c~	2006-04-20 21:52:26.000000000 +0200
+++ daemon/slave.c	2006-04-20 22:16:00.000000000 +0200
@@ -3573,13 +3573,13 @@
 		argv[0] = find_prog ("gnome-session");
 		if G_UNLIKELY (argv[0] == NULL) {
 			/* yaikes */
-			gdm_error (_("%s: gnome-session not found for a failsafe GNOME session; trying xterm"),
+			gdm_error (_("%s: gnome-session not found for a failsafe GNOME session; trying x-terminal-emulator"),
 				   "session_child_run");
 			session = GDM_SESSION_FAILSAFE_XTERM;
 			gdm_error_box
 				(d, GTK_MESSAGE_ERROR,
 				 _("Could not find the GNOME installation.  "
-				   "Running the \"Failsafe xterm\" "
+				   "Running the \"Failsafe x-terminal-emulator\" "
 				   "session instead."));
 		} else {
 			argv[1] = "--failsafe";
@@ -3598,10 +3598,10 @@
 	/* an if and not an else, we could have done a fall-through
 	 * to here in the above code if we can't find gnome-session */
 	if (strcmp (session, GDM_SESSION_FAILSAFE_XTERM) == 0) {
-		argv[0] = find_prog ("xterm");
+		argv[0] = find_prog ("x-terminal-emulator");
 		if (argv[0] == NULL) {
 			gdm_error_box (d, GTK_MESSAGE_ERROR,
-				       _("Cannot find \"xterm\" to start "
+				       _("Cannot find \"x-terminal-emulator\" to start "
 					 "a failsafe session."));
 			/* nyah nyah nyah nyah nyah */
 			/* 66 means no "session crashed" examine .xsession-errors dialog */
@@ -3620,7 +3620,7 @@
 				   "if you cannot log in any other way.  "
 				   "To exit the terminal emulator, type "
 				   "'exit' and an enter into the window."));
-			focus_first_x_window ("xterm");
+			focus_first_x_window ("x-terminal-emulator");
 		}
 		failsafe = TRUE;
 	} 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20060420/9b4f2ec0/attachment.pgp