diff -ruN gdm-2.30.0.orig/gui/simple-greeter/gdm-first-time-login-helper.c gdm-2.30.0/gui/simple-greeter/gdm-first-time-login-helper.c
--- gdm-2.30.0.orig/gui/simple-greeter/gdm-first-time-login-helper.c	1969-12-31 19:00:00.000000000 -0500
+++ gdm-2.30.0/gui/simple-greeter/gdm-first-time-login-helper.c	2010-04-26 11:49:15.581653924 -0400
@@ -0,0 +1,233 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (c) 2010, Oracle and/or its affiliates.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Written by: Suresh Chandrasekharan <suresh.chandrasekharan@oracle.com>
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <libintl.h>
+#include <locale.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#include <pwd.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include "gdm-session-chooser-dialog.h"
+#include "gdm-layout-chooser-dialog.h"
+#include "gdm-language-chooser-dialog.h"
+
+typedef enum ptypes {MESSAGE=0, SESSION, LAYOUT, LANGUAGE} ptypes;
+
+static GtkWidget *
+firsttime_login_message_popup  (GtkWidget *dialog, 
+				const char *title, 
+				const char *text)
+{
+        GtkWidget *image;
+	gchar *display_text;
+
+	dialog = (GtkWidget *) g_object_new (GTK_TYPE_MESSAGE_DIALOG, 
+                        "modal", TRUE,
+			"icon-name", "user-info", 
+			"buttons", GTK_BUTTONS_OK_CANCEL,
+			NULL);
+        display_text = g_strconcat ("<b>", text, "</b>", NULL);
+	gtk_message_dialog_set_markup ((GtkMessageDialog *)dialog, display_text);
+	g_free(display_text);
+        gtk_window_set_title (GTK_WINDOW (dialog), title);
+        image = gtk_image_new_from_icon_name ("user-info", GTK_ICON_SIZE_DIALOG);
+	gtk_message_dialog_set_image ((GtkMessageDialog *)dialog, image);
+	gtk_widget_show (image);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+	return (GtkWidget *)dialog;
+ }
+
+static void
+run_dialog(int height, int width, ptypes key, char **name) {
+        GtkWidget *dialog;
+	switch (key) {
+		case MESSAGE:
+			dialog = firsttime_login_message_popup(dialog, 
+					_("First Time Login Assistant"), 
+					_("This is the first time you have logged in, please select your preferences:"));
+			break;
+		case SESSION:
+			dialog = gdm_session_chooser_dialog_new();
+			break;
+		case LAYOUT:
+			dialog = gdm_layout_chooser_dialog_new();
+			break;
+		case LANGUAGE:
+			dialog = gdm_language_chooser_dialog_new();
+			break;
+	}
+
+        gtk_widget_set_size_request (dialog, height, width);
+
+        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
+		switch (key) {
+			case MESSAGE:
+				/*dummy value*/
+				*name = strdup("");
+				break;
+			case SESSION:
+				*name = gdm_session_chooser_dialog_get_current_session_name (GDM_SESSION_CHOOSER_DIALOG (dialog));
+				break;
+			case LAYOUT:
+				*name = gdm_layout_chooser_dialog_get_current_layout_name (GDM_LAYOUT_CHOOSER_DIALOG (dialog));
+				break;
+			case LANGUAGE:
+				*name = gdm_language_chooser_dialog_get_current_language_name (GDM_LANGUAGE_CHOOSER_DIALOG (dialog));
+				break;
+		}
+        } else {
+		*name = NULL;
+	}
+        gtk_widget_destroy (dialog);
+}
+
+static gboolean
+session_settings_save (char *session_name, char *language_name, 
+			   char	*layout_name,
+                           char *user_name,
+                           GError **error)
+{
+        GKeyFile *key_file;
+        GError   *file_error;
+        gboolean  is_saved;
+        char     *filename;
+        gsize     length;
+        gchar    *contents;
+	struct passwd *pwent = NULL;
+
+        g_return_val_if_fail (user_name != NULL, FALSE);
+	pwent = getpwnam (user_name);
+	if (pwent != NULL && pwent->pw_dir != NULL &&
+			g_file_test (pwent->pw_dir, G_FILE_TEST_EXISTS))
+        	filename = g_build_filename (pwent->pw_dir, ".dmrc", NULL);
+
+        is_saved = FALSE;
+        key_file = g_key_file_new ();
+
+        file_error = NULL;
+        g_key_file_load_from_file (key_file, filename,
+                                   G_KEY_FILE_KEEP_COMMENTS |
+                                   G_KEY_FILE_KEEP_TRANSLATIONS,
+                                   NULL);
+
+        if (session_name != NULL) {
+                g_key_file_set_string (key_file, "Desktop", "Session",
+                                       session_name);
+        }
+
+        if (language_name != NULL) {
+                g_key_file_set_string (key_file, "Desktop", "Language",
+                                       language_name);
+        }
+
+        if (layout_name != NULL) {
+                g_key_file_set_string (key_file, "Desktop", "Layout",
+                                       layout_name);
+        }
+
+        contents = g_key_file_to_data (key_file, &length, &file_error);
+
+        if (contents == NULL) {
+                g_propagate_error (error, file_error);
+                goto out;
+        }
+
+        if (!g_file_set_contents (filename, contents, length, &file_error)) {
+                g_free (contents);
+                g_propagate_error (error, file_error);
+                goto out;
+        }
+        g_free (contents);
+
+        is_saved = TRUE;
+out:
+        g_key_file_free (key_file);
+        g_free (filename);
+
+        return is_saved;
+}
+
+int
+main (int argc, char *argv[])
+{
+
+	GError *error;
+	char *dialog_feedback = NULL;
+	char *layout_name = NULL;
+	char *lang_name = NULL;
+	char *session_name = NULL;
+
+	if (argc != 2) {
+                g_message ("Usage: %s <user name>", argv[0]);
+		return (-1);
+	}
+
+        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        textdomain (GETTEXT_PACKAGE);
+
+        setlocale (LC_ALL, "");
+
+        gtk_init (&argc, &argv);
+
+	run_dialog(480, 120, MESSAGE, &dialog_feedback);
+	if (!dialog_feedback)
+		return(-1);	
+
+	run_dialog(480, 480, SESSION, &session_name);
+	if (!session_name) {
+		g_free(dialog_feedback);
+		return(-1);	
+	}
+	run_dialog(480, 480, LAYOUT, &layout_name);
+	if (!layout_name) {
+		g_free(dialog_feedback);
+		g_free(session_name);
+		return(-1);	
+	}
+	run_dialog(480, 480, LANGUAGE, &lang_name);
+	if (!lang_name) {
+		g_free(dialog_feedback);
+		g_free(session_name);
+		g_free(layout_name);
+		return(-1);	
+	}
+	error = NULL;
+	if (!session_settings_save (session_name, lang_name, layout_name, argv[1],  &error)) {
+                g_warning (_("could not save session and language settings: %s"),
+                           error->message);
+                g_error_free (error);
+        }
+	g_free(dialog_feedback);
+	g_free(session_name);
+	g_free(layout_name);
+	g_free(lang_name);
+        return 0;
+}
diff -ruN gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-dialog.c gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-dialog.c
--- gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-dialog.c	1969-12-31 19:00:00.000000000 -0500
+++ gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-dialog.c	2010-04-26 14:30:56.467177274 -0400
@@ -0,0 +1,200 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Matthias Clasen <mclasen@redhat.com>
+ * Copyright (c) 2010, Oracle and/or its affiliates.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by suresh.chandrasekharan@oracle.com based on 
+ * gdm-layout-chooser-dialog.c
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <locale.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "gdm-session-chooser-widget.h"
+#include "gdm-session-chooser-dialog.h"
+
+#define GDM_SESSION_CHOOSER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SESSION_CHOOSER_DIALOG, GdmSessionChooserDialogPrivate))
+
+struct GdmSessionChooserDialogPrivate
+{
+        GtkWidget *chooser_widget;
+};
+
+
+static void     gdm_session_chooser_dialog_class_init  (GdmSessionChooserDialogClass *klass);
+static void     gdm_session_chooser_dialog_init        (GdmSessionChooserDialog      *session_chooser_dialog);
+static void     gdm_session_chooser_dialog_finalize    (GObject                       *object);
+
+G_DEFINE_TYPE (GdmSessionChooserDialog, gdm_session_chooser_dialog, GTK_TYPE_DIALOG)
+
+char *
+gdm_session_chooser_dialog_get_current_session_name (GdmSessionChooserDialog *dialog)
+{
+        char *session_name;
+
+        g_return_val_if_fail (GDM_IS_SESSION_CHOOSER_DIALOG (dialog), NULL);
+
+        session_name = gdm_session_chooser_widget_get_current_session_name (GDM_SESSION_CHOOSER_WIDGET (dialog->priv->chooser_widget));
+
+        return session_name;
+}
+
+void
+gdm_session_chooser_dialog_set_current_session_name (GdmSessionChooserDialog *dialog,
+                                                   const char             *session_name)
+{
+
+        g_return_if_fail (GDM_IS_SESSION_CHOOSER_DIALOG (dialog));
+
+        gdm_session_chooser_widget_set_current_session_name (GDM_SESSION_CHOOSER_WIDGET (dialog->priv->chooser_widget), session_name);
+}
+
+static void
+gdm_session_chooser_dialog_size_request (GtkWidget      *widget,
+                                        GtkRequisition *requisition)
+{
+        int            screen_w;
+        int            screen_h;
+        GtkRequisition child_requisition;
+
+        if (GTK_WIDGET_CLASS (gdm_session_chooser_dialog_parent_class)->size_request) {
+                GTK_WIDGET_CLASS (gdm_session_chooser_dialog_parent_class)->size_request (widget, requisition);
+        }
+
+        screen_w = gdk_screen_get_width (gtk_widget_get_screen (widget));
+        screen_h = gdk_screen_get_height (gtk_widget_get_screen (widget));
+
+        gtk_widget_get_child_requisition (GTK_BIN (widget)->child, &child_requisition);
+        *requisition = child_requisition;
+
+        requisition->width += 2 * GTK_CONTAINER (widget)->border_width;
+        requisition->height += 2 * GTK_CONTAINER (widget)->border_width;
+
+        requisition->width = MIN (requisition->width, .50 * screen_w);
+        requisition->height = MIN (requisition->height, .80 * screen_h);
+}
+
+static void
+gdm_session_chooser_dialog_realize (GtkWidget *widget)
+{
+        GdmSessionChooserDialog *chooser_dialog;
+
+        chooser_dialog = GDM_SESSION_CHOOSER_DIALOG (widget);
+
+        gtk_widget_show (chooser_dialog->priv->chooser_widget);
+
+        GTK_WIDGET_CLASS (gdm_session_chooser_dialog_parent_class)->realize (widget);
+}
+
+static void
+gdm_session_chooser_dialog_class_init (GdmSessionChooserDialogClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        object_class->finalize = gdm_session_chooser_dialog_finalize;
+        widget_class->size_request = gdm_session_chooser_dialog_size_request;
+        widget_class->realize = gdm_session_chooser_dialog_realize;
+
+        g_type_class_add_private (klass, sizeof (GdmSessionChooserDialogPrivate));
+}
+
+static gboolean
+respond (GdmSessionChooserDialog *dialog)
+{
+        gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+        return FALSE;
+}
+
+static void
+queue_response (GdmSessionChooserDialog *dialog)
+{
+        g_idle_add ((GSourceFunc) respond, dialog);
+}
+
+static void
+gdm_session_chooser_dialog_init (GdmSessionChooserDialog *dialog)
+{
+
+        dialog->priv = GDM_SESSION_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+
+        dialog->priv->chooser_widget = gdm_session_chooser_widget_new ();
+        gdm_chooser_widget_set_hide_inactive_items (GDM_CHOOSER_WIDGET (dialog->priv->chooser_widget),
+                                                    FALSE);
+
+        gdm_session_chooser_widget_set_current_session_name (GDM_SESSION_CHOOSER_WIDGET (dialog->priv->chooser_widget),
+                                                               setlocale (LC_MESSAGES, NULL));
+        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->priv->chooser_widget);
+
+        g_signal_connect_swapped (G_OBJECT (dialog->priv->chooser_widget),
+                                  "activated", G_CALLBACK (queue_response),
+                                  dialog);
+
+        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                NULL);
+
+        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+        gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
+        gtk_container_set_border_width (GTK_CONTAINER (dialog->priv->chooser_widget), 5);
+        gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
+        gtk_window_set_default_size (GTK_WINDOW (dialog), 512, 440);
+        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+}
+
+static void
+gdm_session_chooser_dialog_finalize (GObject *object)
+{
+        GdmSessionChooserDialog *session_chooser_dialog;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GDM_IS_SESSION_CHOOSER_DIALOG (object));
+
+        session_chooser_dialog = GDM_SESSION_CHOOSER_DIALOG (object);
+
+        g_return_if_fail (session_chooser_dialog->priv != NULL);
+
+        G_OBJECT_CLASS (gdm_session_chooser_dialog_parent_class)->finalize (object);
+}
+
+GtkWidget *
+gdm_session_chooser_dialog_new (void)
+{
+        GObject *object;
+
+        object = g_object_new (GDM_TYPE_SESSION_CHOOSER_DIALOG,
+                               "icon-name", "session-properties",
+                               "title", _("Login sessions"),
+                               "border-width", 8,
+                               "modal", TRUE,
+                               NULL);
+
+        return GTK_WIDGET (object);
+}
diff -ruN gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-dialog.h gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-dialog.h
--- gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-dialog.h	1969-12-31 19:00:00.000000000 -0500
+++ gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-dialog.h	2010-04-26 14:31:44.385405406 -0400
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Matthias Clasen <mclasen@redhat.com>
+ * Copyright (c) 2010, Oracle and/or its affiliates.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by suresh.chandrasekharan@oracle.com based on 
+ * gdm-layout-chooser-dialog.h
+ */
+
+#ifndef __GDM_SESSION_CHOOSER_DIALOG_H
+#define __GDM_SESSION_CHOOSER_DIALOG_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GDM_TYPE_SESSION_CHOOSER_DIALOG         (gdm_session_chooser_dialog_get_type ())
+#define GDM_SESSION_CHOOSER_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_SESSION_CHOOSER_DIALOG, GdmSessionChooserDialog))
+#define GDM_SESSION_CHOOSER_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_SESSION_CHOOSER_DIALOG, GdmSessionChooserDialogClass))
+#define GDM_IS_SESSION_CHOOSER_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_SESSION_CHOOSER_DIALOG))
+#define GDM_IS_SESSION_CHOOSER_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_SESSION_CHOOSER_DIALOG))
+#define GDM_SESSION_CHOOSER_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_SESSION_CHOOSER_DIALOG, GdmSessionChooserDialogClass))
+
+typedef struct GdmSessionChooserDialogPrivate GdmSessionChooserDialogPrivate;
+
+typedef struct
+{
+        GtkDialog                        parent;
+        GdmSessionChooserDialogPrivate *priv;
+} GdmSessionChooserDialog;
+
+typedef struct
+{
+        GtkDialogClass   parent_class;
+} GdmSessionChooserDialogClass;
+
+GType                  gdm_session_chooser_dialog_get_type                       (void);
+
+GtkWidget            * gdm_session_chooser_dialog_new                            (void);
+
+char *                 gdm_session_chooser_dialog_get_current_session_name      (GdmSessionChooserDialog *dialog);
+void                   gdm_session_chooser_dialog_set_current_session_name      (GdmSessionChooserDialog *dialog,
+     const char               *session_name);
+
+G_END_DECLS
+
+#endif /* __GDM_SESSION_CHOOSER_DIALOG_H */
diff -ruN gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-widget.c gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-widget.c
--- gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-widget.c	1969-12-31 19:00:00.000000000 -0500
+++ gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-widget.c	2010-04-26 14:49:17.828691937 -0400
@@ -0,0 +1,204 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Matthias Clasen <mclasen@redhat.com>
+ * Copyright (c) 2010, Oracle and/or its affiliates.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by suresh.chandrasekharan@oracle.com based on 
+ * gdm-layout-chooser-widget.c
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <dirent.h>
+#include <locale.h>
+#include <sys/stat.h>
+
+#include <fontconfig/fontconfig.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+
+#include "gdm-session-chooser-widget.h"
+#include "gdm-chooser-widget.h"
+#include "gdm-sessions.h"
+
+#define GDM_SESSION_CHOOSER_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SESSION_CHOOSER_WIDGET, GdmSessionChooserWidgetPrivate))
+
+struct GdmSessionChooserWidgetPrivate
+{
+        guint               sessions_added : 1;
+};
+
+static void     gdm_session_chooser_widget_class_init  (GdmSessionChooserWidgetClass *klass);
+static void     gdm_session_chooser_widget_init        (GdmSessionChooserWidget      *session_chooser_widget);
+static void     gdm_session_chooser_widget_finalize    (GObject                     *object);
+
+G_DEFINE_TYPE (GdmSessionChooserWidget, gdm_session_chooser_widget, GDM_TYPE_CHOOSER_WIDGET)
+
+enum {
+        CHOOSER_LIST_TITLE_COLUMN = 0,
+        CHOOSER_LIST_TRANSLATED_COLUMN,
+        CHOOSER_LIST_LOCALE_COLUMN
+};
+
+char *
+gdm_session_chooser_widget_get_current_session_name (GdmSessionChooserWidget *widget)
+{
+        char *id;
+
+        g_return_val_if_fail (GDM_IS_SESSION_CHOOSER_WIDGET (widget), NULL);
+
+        id = gdm_chooser_widget_get_selected_item (GDM_CHOOSER_WIDGET (widget));
+
+        if (id == NULL) {
+                id = g_strdup ("gnome");
+        }
+
+        return id;
+}
+
+void
+gdm_session_chooser_widget_set_current_session_name (GdmSessionChooserWidget *widget,
+                                                   const char             *id)
+{
+        g_return_if_fail (GDM_IS_SESSION_CHOOSER_WIDGET (widget));
+
+        if (id == NULL) {
+                gdm_chooser_widget_set_selected_item (GDM_CHOOSER_WIDGET (widget),
+                                                      NULL);
+                return;
+        }
+
+        gdm_chooser_widget_set_selected_item (GDM_CHOOSER_WIDGET (widget), id);
+}
+
+static void
+gdm_session_chooser_widget_add_session (GdmSessionChooserWidget *widget,
+                                          const char         *name)
+{
+        char *escaped;
+
+        if (name != NULL) {
+                escaped = g_markup_escape_text (name, -1);
+                gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),
+                                             name,
+                                             NULL,
+                                             escaped,
+                                             NULL,
+                                             0,
+                                             FALSE,
+                                             FALSE);
+                g_free (escaped);
+        }
+}
+
+static void
+add_available_sessions (GdmSessionChooserWidget *widget)
+{
+        char **session_names;
+        int    i;
+
+        session_names = gdm_get_all_sessions ();
+
+        if (session_names == NULL)
+           return;
+
+        for (i = 0; session_names[i] != NULL; i++) {
+                gdm_session_chooser_widget_add_session (widget,
+                                                      session_names[i]);
+        }
+
+        g_strfreev (session_names);
+}
+
+static void
+gdm_session_chooser_widget_dispose (GObject *object)
+{
+        G_OBJECT_CLASS (gdm_session_chooser_widget_parent_class)->dispose (object);
+}
+
+static void
+gdm_session_chooser_widget_realize (GtkWidget *widget)
+{
+        GdmSessionChooserWidget *chooser;
+
+        chooser = GDM_SESSION_CHOOSER_WIDGET (widget);
+
+        GTK_WIDGET_CLASS (gdm_session_chooser_widget_parent_class)->realize (widget);
+
+        if (!chooser->priv->sessions_added) {
+                add_available_sessions (chooser);
+                chooser->priv->sessions_added = TRUE;
+        }
+}
+
+static void
+gdm_session_chooser_widget_class_init (GdmSessionChooserWidgetClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        object_class->dispose = gdm_session_chooser_widget_dispose;
+        object_class->finalize = gdm_session_chooser_widget_finalize;
+        widget_class->realize = gdm_session_chooser_widget_realize;
+
+        g_type_class_add_private (klass, sizeof (GdmSessionChooserWidgetPrivate));
+}
+
+static void
+gdm_session_chooser_widget_init (GdmSessionChooserWidget *widget)
+{
+        widget->priv = GDM_SESSION_CHOOSER_WIDGET_GET_PRIVATE (widget);
+
+        gdm_chooser_widget_set_separator_position (GDM_CHOOSER_WIDGET (widget),
+                                                   GDM_CHOOSER_WIDGET_POSITION_TOP);
+}
+
+static void
+gdm_session_chooser_widget_finalize (GObject *object)
+{
+        GdmSessionChooserWidget *session_chooser_widget;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GDM_IS_SESSION_CHOOSER_WIDGET (object));
+
+        session_chooser_widget = GDM_SESSION_CHOOSER_WIDGET (object);
+
+        g_return_if_fail (session_chooser_widget->priv != NULL);
+
+        G_OBJECT_CLASS (gdm_session_chooser_widget_parent_class)->finalize (object);
+}
+
+GtkWidget *
+gdm_session_chooser_widget_new (void)
+{
+        GObject *object;
+
+        object = g_object_new (GDM_TYPE_SESSION_CHOOSER_WIDGET,
+                               "inactive-text", _("_Session:"),
+                               "active-text", _("_Session:"),
+                               NULL);
+
+        return GTK_WIDGET (object);
+}
diff -ruN gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-widget.h gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-widget.h
--- gdm-2.30.0.orig/gui/simple-greeter/gdm-session-chooser-widget.h	1969-12-31 19:00:00.000000000 -0500
+++ gdm-2.30.0/gui/simple-greeter/gdm-session-chooser-widget.h	2010-04-26 14:51:18.111928991 -0400
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Matthias Clasen <mclasen@redhat.com>
+ * Copyright (c) 2010, Oracle and/or its affiliates.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by suresh.chandrasekharan@oracle.com based on 
+ * gdm-layout-chooser-widget.h
+ */
+
+#ifndef __GDM_SESSION_CHOOSER_WIDGET_H
+#define __GDM_SESSION_CHOOSER_WIDGET_H
+
+#include <glib-object.h>
+#include "gdm-chooser-widget.h"
+
+G_BEGIN_DECLS
+
+#define GDM_TYPE_SESSION_CHOOSER_WIDGET         (gdm_session_chooser_widget_get_type ())
+#define GDM_SESSION_CHOOSER_WIDGET(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_SESSION_CHOOSER_WIDGET, GdmSessionChooserWidget))
+#define GDM_SESSION_CHOOSER_WIDGET_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_SESSION_CHOOSER_WIDGET, GdmSessionChooserWidgetClass))
+#define GDM_IS_SESSION_CHOOSER_WIDGET(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_SESSION_CHOOSER_WIDGET))
+#define GDM_IS_SESSION_CHOOSER_WIDGET_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_SESSION_CHOOSER_WIDGET))
+#define GDM_SESSION_CHOOSER_WIDGET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_SESSION_CHOOSER_WIDGET, GdmSessionChooserWidgetClass))
+
+typedef struct GdmSessionChooserWidgetPrivate GdmSessionChooserWidgetPrivate;
+
+typedef struct
+{
+        GdmChooserWidget                 parent;
+        GdmSessionChooserWidgetPrivate *priv;
+} GdmSessionChooserWidget;
+
+typedef struct
+{
+        GdmChooserWidgetClass   parent_class;
+} GdmSessionChooserWidgetClass;
+
+GType                  gdm_session_chooser_widget_get_type                       (void);
+GtkWidget *            gdm_session_chooser_widget_new                            (void);
+
+char *                 gdm_session_chooser_widget_get_current_session_name      (GdmSessionChooserWidget *widget);
+void                   gdm_session_chooser_widget_set_current_session_name      (GdmSessionChooserWidget *widget,
+                                                                                   const char               *name);
+
+G_END_DECLS
+
+#endif /* __GDM_SESSION_CHOOSER_WIDGET_H */
diff -ruN gdm-2.30.0.orig/gui/simple-greeter/Makefile.am gdm-2.30.0/gui/simple-greeter/Makefile.am
--- gdm-2.30.0.orig/gui/simple-greeter/Makefile.am	2010-04-26 10:16:04.140985608 -0400
+++ gdm-2.30.0/gui/simple-greeter/Makefile.am	2010-04-26 12:27:34.938749324 -0400
@@ -280,7 +280,8 @@
 	$(NULL)
 
 libexec_PROGRAMS =			\
-	gdm-simple-greeter
+	gdm-simple-greeter		\
+	gdm-first-time-login-helper
 
 gdm_simple_greeter_SOURCES =  		\
 	greeter-main.c 			\
@@ -347,6 +348,62 @@
 	$(DEVKIT_POWER_LIBS)		\
 	$(NULL)
 
+gdm_first_time_login_helper_SOURCES =   \
+	gdm-first-time-login-helper.c	\
+	gdm-timer.h			\
+	gdm-timer.c			\
+	gdm-greeter-panel.h		\
+	gdm-greeter-panel.c		\
+	gdm-clock-widget.h		\
+	gdm-clock-widget.c		\
+	gdm-option-widget.h     	\
+	gdm-option-widget.c     	\
+	gdm-recent-option-widget.h	\
+	gdm-recent-option-widget.c	\
+	gdm-languages.h			\
+	gdm-languages.c			\
+	gdm-cell-renderer-timer.h	\
+	gdm-cell-renderer-timer.c	\
+	gdm-scrollable-widget.h		\
+	gdm-scrollable-widget.c		\
+	gdm-chooser-widget.h		\
+	gdm-chooser-widget.c		\
+	gdm-language-chooser-widget.h	\
+	gdm-language-chooser-widget.c	\
+	locarchive.h			\
+	gdm-language-chooser-dialog.h	\
+	gdm-language-chooser-dialog.c	\
+	gdm-language-option-widget.h	\
+	gdm-language-option-widget.c	\
+	gdm-layout-chooser-widget.h	\
+	gdm-layout-chooser-widget.c	\
+	gdm-layout-chooser-dialog.h	\
+	gdm-layout-chooser-dialog.c	\
+	gdm-layout-option-widget.h	\
+	gdm-layout-option-widget.c	\
+	gdm-layouts.h			\
+	gdm-layouts.c			\
+	gdm-sessions.h			\
+	gdm-sessions.c			\
+	gdm-session-chooser-widget.h	\
+	gdm-session-chooser-widget.c	\
+	gdm-session-chooser-dialog.h	\
+	gdm-session-chooser-dialog.c	\
+	gdm-session-option-widget.h	\
+	gdm-session-option-widget.c	\
+	branding.h			\
+	branding.c			\
+	$(NULL)
+
+gdm_first_time_login_helper_LDADD =     \
+	$(top_builddir)/common/libgdmcommon.la	\
+	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
+	$(SIMPLE_GREETER_LIBS)		\
+	$(GTK_LIBS)			\
+	$(GCONF_LIBS)		\
+	$(LIBXKLAVIER_LIBS)		\
+	$(NULL)
+
 uidir = $(pkgdatadir)
 ui_DATA = 					\
 	gdm-greeter-login-window.ui		\
