ignore .rpmorig files as well, and some cosmetic code changes

Tue May 29 00:38:18 2001  George Lebl <jirka@5z.com>

	* gui/gdmconfig.c, gui/gdmlogin.c: ignore .rpmorig files as well,
	  and some cosmetic code changes

3 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a5734e13..f06e8a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 29 00:38:18 2001  George Lebl <jirka@5z.com>
+
+	* gui/gdmconfig.c, gui/gdmlogin.c: ignore .rpmorig files as well,
+	  and some cosmetic code changes
+
 Mon May 28 02:24:43 2001  George Lebl <jirka@5z.com>
 
 	* daemon/gdm.c: Fixed a stupid mistake cased by a missed warning,
diff --git a/gui/gdmconfig.c b/gui/gdmconfig.c
index 7b2a3e62..3ce212f4 100644
--- a/gui/gdmconfig.c
+++ b/gui/gdmconfig.c
@@ -687,6 +687,7 @@ gdm_config_parse_most (gboolean factory)
 	/* Ignore backups and rpmsave files */
 	if ((strstr (dent->d_name, "~")) ||
 	    (strstr (dent->d_name, ".rpmsave")) ||
+	    (strstr (dent->d_name, ".rpmorig")) ||
 	    (strstr (dent->d_name, ".dpkg-old")) ||
 	    (strstr (dent->d_name, ".deleted")) ||
 	    (strstr (dent->d_name, ".desc")) /* description file */ ||
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 20025f5c..ed0c0909 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -1169,7 +1169,7 @@ gdm_login_session_init (GtkWidget *menu)
     cursess = LAST_SESSION;
     item = gtk_radio_menu_item_new_with_label (NULL, _(LAST_SESSION));
     gtk_object_set_data (GTK_OBJECT (item),
-			 "SessionName",
+			 SESSION_NAME,
 			 LAST_SESSION);
     sessgrp = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
     gtk_menu_append (GTK_MENU (menu), item);
@@ -1211,6 +1211,7 @@ gdm_login_session_init (GtkWidget *menu)
 	/* Ignore backups and rpmsave files */
 	if ((strstr (dent->d_name, "~")) ||
 	    (strstr (dent->d_name, ".rpmsave")) ||
+	    (strstr (dent->d_name, ".rpmorig")) ||
 	    (strstr (dent->d_name, ".dpkg-old")) ||
 	    (strstr (dent->d_name, ".deleted")) ||
 	    (strstr (dent->d_name, ".desc")) /* description file */ ||
@@ -1244,7 +1245,7 @@ gdm_login_session_init (GtkWidget *menu)
 	    {
 		item = gtk_radio_menu_item_new_with_label (sessgrp, _(dent->d_name));
 		gtk_object_set_data_full (GTK_OBJECT (item),
-					  "SessionName",
+					  SESSION_NAME,
 					  g_strdup (dent->d_name),
 					  (GtkDestroyNotify) g_free);
 
@@ -1291,7 +1292,7 @@ gdm_login_session_init (GtkWidget *menu)
 				   "use."),
 				 NULL);
 			gtk_object_set_data (GTK_OBJECT (item),
-					     "SessionName",
+					     SESSION_NAME,
 					     GDM_SESSION_GNOME_CHOOSER);
 
 			sessgrp = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
@@ -1337,7 +1338,7 @@ gdm_login_session_init (GtkWidget *menu)
 			    "session."),
 			  NULL);
     gtk_object_set_data (GTK_OBJECT (item),
-			 "SessionName", GDM_SESSION_FAILSAFE_GNOME);
+			 SESSION_NAME, GDM_SESSION_FAILSAFE_GNOME);
 
     sessgrp = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
     sessions = g_slist_append (sessions,
@@ -1360,7 +1361,7 @@ gdm_login_session_init (GtkWidget *menu)
 			    "type 'exit'."),
 			  NULL);
     gtk_object_set_data (GTK_OBJECT (item),
-			 "SessionName", GDM_SESSION_FAILSAFE_XTERM);
+			 SESSION_NAME, GDM_SESSION_FAILSAFE_XTERM);
 
     sessgrp = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
     sessions = g_slist_append (sessions,
@@ -1816,7 +1817,7 @@ gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 	g_io_channel_read (source, buf, PIPE_SIZE-1, &len);
 	buf[len-1] = '\0';
 
-	/* HAAAAAAACK.  Sometimes pam send many many messages, SO
+	/* HAAAAAAACK.  Sometimes pam sends many many messages, SO
 	 * we try to collect them until the next prompt or reset or
 	 * whatnot */
 	if ( ! replace_msg) {
@@ -1890,6 +1891,7 @@ gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 			usleep (200);
 		}
 	}
+	/* fall thru to reset */
 
     case GDM_RESETOK:
 	g_io_channel_read (source, buf, PIPE_SIZE-1, &len);