Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== --- gdm-2.29.1.orig/gui/simple-greeter/gdm-greeter-login-window.c +++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.c @@ -887,35 +887,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 = glade_xml_get_widget (login_window->priv->xml, "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) { @@ -1014,16 +985,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 = glade_xml_get_widget (login_window->priv->xml, "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); @@ -1151,9 +1125,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); - box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box"); - g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window); - switch_mode (login_window, MODE_SELECTION); gdm_profile_end (NULL); Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade =================================================================== --- gdm-2.29.1.orig/gui/simple-greeter/gdm-greeter-login-window.glade +++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade @@ -1,601 +1,250 @@ - - - + - - - 400 - True - Authentication Dialog - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - 0 - 0.5 - GTK_SHADOW_OUT - - - - 24 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 10 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - - True - computer - 64 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - False - False - - - - True - False - False - GTK_POS_TOP - False - False - - - - True - Computer Name - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - False - True - - - - - - True - page 5 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - Version - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - False - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - False - 0 - - - - True - go-home - 16 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Log In - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - 0 - False - False - GTK_PACK_END - - - - - - True - - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 10 - - - - True - 0 - 0 - Tue, 18 Nov 2008 21:55:38 GMT - - - 0 - True - True - - - - - - True - False - 6 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - 0 - - True - True - - - - - - 0 - True - True - - - - - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - 0 - False - False - - - - - - - 0 - True - True - - - - - - - - - - - - - - + + + + 400 + True + Authentication Dialog + dialog + + + 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 + 0 + center + True + + + + + False + False + 2 + + + + + 1 + + + + + 0 + + + + + True + + + True + vertical + 10 + + + True + + + 0 + + + + + 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 + 0 + + + + + True + True + True + True + False + + + True + + + True + 16 + go-home + + + 0 + + + + + True + 0 + Log In + + + 1 + + + + + + + False + False + 1 + + + + + False + False + end + 2 + + + + + + + + + Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade.new =================================================================== --- /dev/null +++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade.new @@ -0,0 +1,250 @@ + + + + + + 400 + True + Authentication Dialog + dialog + + + 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 + 0 + center + True + + + + + False + False + 2 + + + + + 1 + + + + + 0 + + + + + True + + + True + vertical + 10 + + + True + + + 0 + + + + + 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 + 0 + + + + + True + True + True + True + False + + + True + + + True + 16 + go-home + + + 0 + + + + + True + 0 + Log In + + + 1 + + + + + + + False + False + 1 + + + + + False + False + end + 2 + + + + + + + + + +