13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsyncdiff -Npur gdm-old/daemon/gdm-session-worker.c gdm-new/daemon/gdm-session-worker.c
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync--- gdm-old/daemon/gdm-session-worker.c 2009-08-20 16:28:09.000000000 +0800
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+++ gdm-new/daemon/gdm-session-worker.c 2009-08-20 16:31:11.000000000 +0800
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync@@ -955,7 +955,7 @@ gdm_session_worker_process_pam_message (
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync res = gdm_session_worker_ask_for_secret (worker, utf8_msg, &user_answer);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync break;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync case PAM_TEXT_INFO:
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync- res = gdm_session_worker_report_info (worker, utf8_msg);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ res = gdm_session_worker_report_problem (worker, utf8_msg);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync break;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync case PAM_ERROR_MSG:
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync res = gdm_session_worker_report_problem (worker, utf8_msg);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsyncdiff -Npur gdm-old/gui/simple-greeter/gdm-greeter-login-window.c gdm-new/gui/simple-greeter/gdm-greeter-login-window.c
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync--- gdm-old/gui/simple-greeter/gdm-greeter-login-window.c 2009-08-20 16:28:26.000000000 +0800
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+++ gdm-new/gui/simple-greeter/gdm-greeter-login-window.c 2009-08-20 16:31:36.000000000 +0800
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync@@ -862,9 +862,68 @@ gdm_greeter_login_window_problem (GdmGre
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync g_debug ("GdmGreeterLoginWindow: problem: %s", text);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync- set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ _gdm_greeter_login_window_set_interactive (login_window, FALSE);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *dialog;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *dialog_vbox;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *dialog_action_area;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *hbox;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *vbox;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *label;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *button;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GtkWidget *image;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gchar *title;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gchar *msg;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ dialog = gtk_dialog_new ();
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_window_set_title (GTK_WINDOW (dialog), "");
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ dialog_vbox = GTK_DIALOG (dialog)->vbox;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_box_set_spacing (GTK_BOX (dialog_vbox), 12);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ hbox = gtk_hbox_new (FALSE, 12);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 0);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_widget_show (hbox);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ image = gtk_image_new_from_stock ("gtk-dialog-warning", GTK_ICON_SIZE_DIALOG);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_widget_show (image);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ vbox = gtk_vbox_new (FALSE, 6);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_widget_show (vbox);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ title = g_strconcat ("<b>", text, "</b>", NULL);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ label = gtk_label_new (title);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_widget_show (label);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ g_free (title);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ button = gtk_button_new_from_stock (GTK_STOCK_OK);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_widget_show (button);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (login_window));
cd2274c977e1b722b535e4f601a324e8029b5e43vboxsync+
cd2274c977e1b722b535e4f601a324e8029b5e43vboxsync+ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
cd2274c977e1b722b535e4f601a324e8029b5e43vboxsync+ GTK_RESPONSE_OK);
cd2274c977e1b722b535e4f601a324e8029b5e43vboxsync+ gtk_dialog_run (GTK_DIALOG (dialog));
cd2274c977e1b722b535e4f601a324e8029b5e43vboxsync+ gtk_widget_destroy (dialog);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync gdk_window_beep (GTK_WIDGET (login_window)->window);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+ _gdm_greeter_login_window_set_interactive (login_window, TRUE);
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync+
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync return TRUE;
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync }
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync
13493ab7596e827b8d0caab2c89e635dd65f78f9vboxsync