Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== --- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.c +++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c @@ -950,35 +950,6 @@ on_user_unchosen (GdmUserChooserWidget do_cancel (login_window); } -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) { @@ -1077,16 +1048,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); @@ -1190,9 +1164,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); - if (login_window->priv->user_list_disabled) { switch_mode (login_window, MODE_AUTHENTICATION); } else { Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui =================================================================== --- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui +++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui @@ -2,28 +2,29 @@ - + + True + 0 + out + + True - 0 - out + 24 - + True - 24 + vertical + 10 - + True - 10 + 12 - + True - - - True - 64 - computer - - + 0 + 48 + computer False @@ -32,271 +33,203 @@ - + True - False + vertical + 6 - + + True + 0 + Version + + + 0 + + + + + True + 0 + Computer Name + + + 1 + + + + True - False - False - - - True - Computer Name - - - - - True - page 5 - - - False - - - - - True - Version - - - 1 - - - - - True - - - 1 - False - - - - - - + True + center + True - - 2 - False - + + + False + False + 2 + + + + + 1 + + + + + 0 + + + + + True + + + True + vertical + 10 + + + + + + True + 6 - - - - + True + + + - 3 - False + False + False + 0 - - - - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + - 4 - False + 1 - - - True - - - 5 - False - - + + + False + False + 1 + + + + + True - - - - + True - 6 - False + 0 + + False + False + 2 + - - False - False - 1 - + + + 1 + + + + + True + 6 + end - + + gtk-cancel True - center - True + True + False + True - 3 + False + False + 4 - + True + True + True + True + False - + True - 10 - - - - + True - 6 - - - True - - - - - - - False - False - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - - 1 - - - - - + 16 - False - False - 1 + 0 - + True - - - True - - - 0 - - + 0 + Log In - False - False - 2 + 1 - 4 - - - - - True - 6 - end - - - gtk-cancel - True - True - False - True - - - False - False - 4 - - - - - True - True - True - True - False - - - True - - - True - 16 - - - 0 - - - - - True - 0 - Log In - - - 1 - - - - - - - False - False - 5 - - - - False False - end - 2 + 5 + + False + False + end + 2 + + + Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new =================================================================== --- /dev/null +++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new @@ -0,0 +1,235 @@ + + + + + + True + 0 + out + + + True + 24 + + + True + vertical + 10 + + + True + 12 + + + True + 0 + 48 + computer + + + False + False + 0 + + + + + True + vertical + 6 + + + True + 0 + Version + + + 0 + + + + + True + 0 + Computer Name + + + 1 + + + + + True + + + True + center + True + + + + + False + False + 2 + + + + + 1 + + + + + 0 + + + + + True + + + True + vertical + 10 + + + + + + True + 6 + + + True + + + + + + False + False + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + + + + 1 + + + + + + + + False + False + 1 + + + + + True + + + True + + + 0 + + + + + False + False + 2 + + + + + + + 1 + + + + + True + 6 + end + + + gtk-cancel + True + True + False + True + + + False + False + 4 + + + + + True + True + True + True + False + + + True + + + True + 16 + + + 0 + + + + + True + 0 + Log In + + + 1 + + + + + + + False + False + 5 + + + + + False + False + end + 2 + + + + + + + +