diff -ru gdm-2.20.7.orig/gui/gdmlanguages.c gdm-2.20.7.patched/gui/gdmlanguages.c
--- gdm-2.20.7.orig/gui/gdmlanguages.c	2008-06-30 21:53:05.000000000 +0400
+++ gdm-2.20.7.patched/gui/gdmlanguages.c	2009-10-07 12:51:26.000000000 +0400
@@ -51,7 +51,7 @@
 static GtkWidget    *dialog                   = NULL;
 static gchar        *current_language         = NULL;
 static gchar        *dialog_selected_language = NULL;
-static gint          savelang                 = GTK_RESPONSE_NO;
+static gint          dont_savelang            = GTK_RESPONSE_YES;
 static gboolean      always_restart           = FALSE;
 
 #include "gdm-common.h"
@@ -727,7 +727,7 @@
 gint
 gdm_lang_get_savelang_setting (void)
 {
-  return savelang;
+  return dont_savelang;
 }
 
 gchar *
@@ -736,7 +736,7 @@
   gchar *retval = NULL;
 
   /* Don't save language unless told otherwise */
-  savelang = GTK_RESPONSE_NO;
+  dont_savelang = GTK_RESPONSE_YES;
 
   if (old_language == NULL)
     old_language = "";
@@ -780,8 +780,8 @@
 	  g_free (current_name);
 	  g_free (saved_name);
 
-	  savelang = gdm_wm_query_dialog (primary_message, secondary_message,
-		_("Make _Default"), _("Just For _This Session"), TRUE);
+	  dont_savelang = gdm_wm_query_dialog (primary_message, secondary_message,
+		_("Just For _This Session"), _("Make _Default"), TRUE);
 	  g_free (primary_message);
 	  g_free (secondary_message);
 	}
@@ -1092,7 +1092,7 @@
 void
 gdm_lang_op_slang (const gchar *args)
 {
-  if (gdm_lang_get_savelang_setting () == GTK_RESPONSE_YES)
+  if (gdm_lang_get_savelang_setting () == GTK_RESPONSE_NO)
     printf ("%cY\n", STX);
   else
     printf ("%c\n", STX);
diff -ru gdm-2.20.7.orig/gui/gdmlogin.c gdm-2.20.7.patched/gui/gdmlogin.c
--- gdm-2.20.7.orig/gui/gdmlogin.c	2008-06-30 21:53:05.000000000 +0400
+++ gdm-2.20.7.patched/gui/gdmlogin.c	2009-10-07 12:50:25.000000000 +0400
@@ -132,7 +132,7 @@
 static gchar *curuser = NULL;
 static gchar *session = NULL;
 
-static gint savelang = GTK_RESPONSE_NO;
+static gint dont_savelang = GTK_RESPONSE_YES;
 
 /* back_prog_timeout_event_id: event of the timer.
  * back_prog_watcher_event_id: event of the background program watcher.
@@ -1329,7 +1329,7 @@
     gint lookup_status = SESSION_LOOKUP_SUCCESS;
     gchar *firstmsg = NULL;
     gchar *secondmsg = NULL;
-    gint save_session = GTK_RESPONSE_NO;
+    gint dont_save_session = GTK_RESPONSE_YES;
     
     /* Parse opcode */
     switch (op_code) {
@@ -1504,11 +1504,11 @@
 			secondmsg = g_strdup_printf (_("Your preferred session type %s is not "
 						       "installed on this computer."),
 						     gdm_session_name (gdm_get_default_session ()));
-			save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
-							    _("Make _Default"), _("Just _Log In"), TRUE);			
+			dont_save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
+							    _("Just _Log In"), _("Make _Default"), TRUE);			
 			g_free (firstmsg);
 			g_free (secondmsg);
-			gdm_set_save_session (save_session);			
+			gdm_set_save_session (dont_save_session);			
 			break;
 			
 		case SESSION_LOOKUP_DEFAULT_MISMATCH:
@@ -1520,12 +1520,12 @@
 						       "setting is %s."),
 						     gdm_session_name (session),
 						     gdm_session_name (tmp));
-			save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
-							    _("Make _Default"), _("Just For _This Session"), TRUE);
+			dont_save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
+							    _("Just For _This Session"), _("Make _Default"), TRUE);
 			
 			g_free (firstmsg);
 			g_free (secondmsg);
-			gdm_set_save_session (save_session);			
+			gdm_set_save_session (dont_save_session);			
 			break;
 		case SESSION_LOOKUP_USE_SWITCHDESK:
 			firstmsg = g_strdup_printf (_("You have chosen %s for this "
@@ -1562,7 +1562,7 @@
 	break;
 
     case GDM_SSESS:
-	if (gdm_get_save_session () == GTK_RESPONSE_YES)
+	if (gdm_get_save_session () == GTK_RESPONSE_NO)
 	    printf ("%cY\n", STX);
 	else
 	    printf ("%c\n", STX);
diff -ru gdm-2.20.7.orig/gui/gdmsession.c gdm-2.20.7.patched/gui/gdmsession.c
--- gdm-2.20.7.orig/gui/gdmsession.c	2008-06-30 21:53:05.000000000 +0400
+++ gdm-2.20.7.patched/gui/gdmsession.c	2009-10-07 12:45:04.000000000 +0400
@@ -42,7 +42,7 @@
 gchar *default_session       = NULL;
 const gchar *current_session = NULL;
 GList *sessions              = NULL;
-static gint save_session     = GTK_RESPONSE_NO;
+static gint dont_save_session     = GTK_RESPONSE_YES;
 
 
 /* This is true if session dir doesn't exist or is whacked out
@@ -404,7 +404,7 @@
   *lookup_status = SESSION_LOOKUP_SUCCESS;
 
   /* Don't save session unless told otherwise */
-  save_session = GTK_RESPONSE_NO;
+  dont_save_session = GTK_RESPONSE_YES;
 
   /* Previously saved session not found in ~/.dmrc */
   if ( ! (saved_session != NULL &&
@@ -417,7 +417,7 @@
     else
       session = g_strdup (current_session);
     
-    save_session = GTK_RESPONSE_YES;
+    dont_save_session = GTK_RESPONSE_NO;
     return session;
   }
 
@@ -451,7 +451,7 @@
            * These are intended to be used for debugging or temporary 
            * purposes.
            */
-	  save_session = GTK_RESPONSE_NO;
+	  dont_save_session = GTK_RESPONSE_YES;
 	}
       else if (strcmp (saved_session, session) != 0)
 	{	 	  
@@ -472,7 +472,7 @@
 	        {
 			*lookup_status = SESSION_LOOKUP_USE_SWITCHDESK;
 		}
-	      save_session = GTK_RESPONSE_NO;
+	      dont_save_session = GTK_RESPONSE_YES;
 	    }
 	}
     }
@@ -483,13 +483,13 @@
 gint
 gdm_get_save_session (void)
 {
-  return save_session;
+  return dont_save_session;
 }
 
 void
 gdm_set_save_session (const gint session)
 {
-	save_session = session;
+	dont_save_session = session;
 }
 
 const char*
diff -ru gdm-2.20.7.orig/gui/greeter/greeter.c gdm-2.20.7.patched/gui/greeter/greeter.c
--- gdm-2.20.7.orig/gui/greeter/greeter.c	2008-06-30 21:53:05.000000000 +0400
+++ gdm-2.20.7.patched/gui/greeter/greeter.c	2009-10-07 12:49:16.000000000 +0400
@@ -229,7 +229,7 @@
     gint lookup_status = SESSION_LOOKUP_SUCCESS;
     gchar *firstmsg = NULL;
     gchar *secondmsg = NULL;
-    gint save_session = GTK_RESPONSE_NO;
+    gint dont_save_session = GTK_RESPONSE_YES;
 
     /* Parse opcode */
     switch (op_code) {
@@ -336,12 +336,12 @@
 			secondmsg = g_strdup_printf (_("Your preferred session type %s is not "
 						       "installed on this computer."),
 						     gdm_session_name (gdm_get_default_session ()));
-			save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
-							    _("Make _Default"), _("Just _Log In"), TRUE);
+			dont_save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
+							    _("Just _Log In"), _("Make _Default"), TRUE);
 			
 			g_free (firstmsg);
 			g_free (secondmsg);
-			gdm_set_save_session (save_session);
+			gdm_set_save_session (dont_save_session);
 			break;
 			
 		case SESSION_LOOKUP_DEFAULT_MISMATCH:
@@ -353,12 +353,12 @@
 						       "setting is %s."),
 						     gdm_session_name (session),
 						     gdm_session_name (tmp));
-			save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
-							    _("Make _Default"), _("Just For _This Session"), TRUE);
+			dont_save_session = gdm_wm_query_dialog (firstmsg, secondmsg,
+							    _("Just For _This Session"), _("Make _Default"), TRUE);
 			
 			g_free (firstmsg);
 			g_free (secondmsg);
-			gdm_set_save_session (save_session);
+			gdm_set_save_session (dont_save_session);
 			break;
 		case SESSION_LOOKUP_USE_SWITCHDESK:
 			firstmsg = g_strdup_printf (_("You have chosen %s for this "
@@ -396,7 +396,7 @@
 	break;
 
     case GDM_SSESS:
-	if (gdm_get_save_session () == GTK_RESPONSE_YES)
+	if (gdm_get_save_session () == GTK_RESPONSE_NO)
 	  printf ("%cY\n", STX);
 	else
 	  printf ("%c\n", STX);
