Index: gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== --- gdm-3.2.0.orig/gui/simple-greeter/gdm-greeter-login-window.c +++ gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.c @@ -1637,35 +1637,6 @@ gdm_greeter_login_window_set_default_ses session_name); } -static void -rotate_computer_info (GdmGreeterLoginWindow *login_window) -{ - GtkWidget *notebook; - int current_page; - int n_pages; - - /* switch page */ - notebook = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-notebook")); - current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); - n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)); - - if (current_page + 1 < n_pages) { - gtk_notebook_next_page (GTK_NOTEBOOK (notebook)); - } else { - gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0); - } - -} - -static gboolean -on_computer_info_label_button_press (GtkWidget *widget, - GdkEventButton *event, - GdmGreeterLoginWindow *login_window) -{ - rotate_computer_info (login_window); - return FALSE; -} - static char * file_read_one_line (const char *filename) { @@ -1787,16 +1758,19 @@ create_computer_info (GdmGreeterLoginWin if (strcmp (localhost, "localhost") == 0 || strcmp (localhost, "localhost.localdomain") == 0) { - rotate_computer_info (login_window); + gtk_widget_hide (label); } } label = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-version-label")); if (label != NULL) { char *version; + char *markup; version = get_system_version (); - gtk_label_set_text (GTK_LABEL (label), version); + markup = g_markup_printf_escaped ("%s", version); + gtk_label_set_markup (GTK_LABEL (label), markup); g_free (version); + g_free (markup); } gdm_profile_end (NULL); @@ -1943,9 +1917,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); - box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-event-box")); - g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window); - clear_active_extension (login_window); switch_mode (login_window, MODE_SELECTION); Index: gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui =================================================================== --- gdm-3.2.0.orig/gui/simple-greeter/gdm-greeter-login-window.ui +++ gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui @@ -1,29 +1,33 @@ - + - - + + True + False + 0 + out + + True - 0 - out + False + 24 - + True - 24 + False + 10 - + True - 10 + False + 12 - + True - - - True - 48 - computer - - + False + 0 + 48 + computer False @@ -32,220 +36,111 @@ - + True - False + False + vertical + 6 - + True - False - False - - - True - Computer Name - - - - - True - page 5 - - - False - - - - - True - Version - - - 1 - - - - - True - - - 1 - False - - - - - - - - True - - - 2 - False - - - - - - - - True - - - 3 - False - - - - - - - - True - - - 4 - False - - - - - - - - True - - - 5 - False - - + False + 0 + Version + + + True + True + 0 + + + + + True + False + 0 + Computer Name + + + True + True + 1 + + + + + True + False - - - - + True + False + center + True - - 6 - False - + + False + False + 2 + - False - False + True + True 1 + + + True + True + 0 + + + + + True - - True - center - True - - - 3 - - - - + True + 2 - + True - 2 - - - True - 1.0 - 0.0 - - - False - - - - - False - False - 0 - - + 1.0 + 0.0 - + False - - True - True - 1 - - - - - True - 10 - - - - - - False - False - 2 - - - - - 4 - - - - - True - 6 - end - - - False - 0.0 - 0.0 - 0.0 - 1.0 - - True - True + False + False 0 - True - - Cancel - True - True + + False - False - False + True + True 1 - - Unlock + True - True - True - True + 10 + + + False @@ -253,32 +148,92 @@ 2 - - - Login - True - True - True - False - False - - - False - False - 5 - - + + + + + True + True + 4 + + + + + True + False + 6 + end + + + False + 0.0 + 0.0 + 0.0 + 1.0 True True - end + 0 + True + + + + + Cancel + True + True + False + False + + + False + False + 1 + + + + + Unlock + True + True + True + True + False + + + False + False 2 + + + Login + True + True + True + False + False + False + + + False + False + 5 + + + + True + True + end + 2 + + + Index: gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui.new =================================================================== --- /dev/null +++ gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui.new @@ -0,0 +1,239 @@ + + + + + True + False + 0 + out + + + True + False + 24 + + + True + False + 10 + + + True + False + 12 + + + True + False + 0 + 48 + computer + + + False + False + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + Version + + + True + True + 0 + + + + + True + False + 0 + Computer Name + + + True + True + 1 + + + + + True + False + + + True + False + center + True + + + + + False + False + 2 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + + + True + 2 + + + True + 1.0 + 0.0 + + + False + + + + + False + False + 0 + + + + + False + + + True + True + 1 + + + + + True + 10 + + + + + + False + False + 2 + + + + + + + True + True + 4 + + + + + True + False + 6 + end + + + False + 0.0 + 0.0 + 0.0 + 1.0 + + + True + True + 0 + True + + + + + Cancel + True + True + False + False + + + False + False + 1 + + + + + Unlock + True + True + True + True + False + + + False + False + 2 + + + + + Login + True + True + True + False + False + False + + + False + False + 5 + + + + + True + True + end + 2 + + + + + + + +