Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c
===================================================================
--- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.c
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c
@@ -1414,29 +1414,6 @@ on_user_unchosen (GdmUserChooserWidget
do_cancel (login_window);
}
-static gboolean
-on_computer_info_label_button_press (GtkWidget *widget,
- GdkEventButton *event,
- 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);
- }
-
- return FALSE;
-}
-
static char *
file_read_one_line (const char *filename)
{
@@ -1529,9 +1506,12 @@ create_computer_info (GdmGreeterLoginWin
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);
@@ -1667,9 +1647,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.24.0/gui/simple-greeter/gdm-greeter-login-window.glade
===================================================================
--- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade
@@ -1,9 +1,7 @@
-
-
-
+
+
- 400
True
12
Authentication Dialog
@@ -13,100 +11,67 @@
True
10
-
+
True
+ 12
True
- 64
+ 0
+ 48
computer
+
+ False
+ False
+
-
-
- False
- False
-
-
-
-
- False
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
+
True
- False
- False
+ 6
-
+
True
- Computer Name
+ 0
+ Version
+ True
-
+
True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- page 5
+ 0
+ Computer Name
- tab
- False
+ 1
-
+
True
- Version
+ 6
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ GTK_JUSTIFY_CENTER
+ True
+
+
- 1
-
-
-
-
-
- tab
-
-
-
-
-
-
-
-
- tab
-
-
-
-
-
-
-
-
- tab
+ 2
+
+ 1
+
-
- False
- False
- 1
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- GTK_JUSTIFY_CENTER
- True
-
-
- 3
-
@@ -138,7 +103,7 @@
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- •
+ •
True
@@ -189,7 +154,7 @@
- 5
+ 1
Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
===================================================================
--- /dev/null
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
@@ -0,0 +1,334 @@
+
+
+
+
+ True
+ 12
+ Authentication Dialog
+ GDK_WINDOW_TYPE_HINT_DIALOG
+
+
+ True
+ 10
+
+
+ True
+ 12
+
+
+ True
+ 0
+ 48
+ computer
+
+
+ False
+ False
+
+
+
+
+ True
+ 6
+
+
+ True
+ 0
+ Version
+ True
+
+
+
+
+ True
+ 0
+ Computer Name
+
+
+ 1
+
+
+
+
+ True
+ 6
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ GTK_JUSTIFY_CENTER
+ True
+
+
+
+
+ 2
+
+
+
+
+ 1
+
+
+
+
+
+
+ True
+
+
+ True
+ 10
+
+
+ True
+
+
+
+
+ True
+ 6
+
+
+ True
+
+
+ False
+ False
+
+
+
+
+ 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
+
+
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+
+
+ True
+
+
+
+
+ False
+ False
+ 3
+
+
+
+
+
+
+ 1
+
+
+
+
+ True
+ 6
+ GTK_BUTTONBOX_END
+
+
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-disconnect
+ True
+ 0
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+
+ True
+
+
+ True
+ 16
+ media-playback-pause
+
+
+
+
+ True
+ 0
+ Suspend
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+
+ True
+
+
+ True
+ 16
+ view-refresh
+
+
+
+
+ True
+ 0
+ Restart
+
+
+ 1
+
+
+
+
+
+
+ 2
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+
+ True
+
+
+ True
+ 16
+ system-shutdown
+
+
+
+
+ True
+ Shut Down
+
+
+ 1
+
+
+
+
+
+
+ 3
+
+
+
+
+ True
+ True
+ gtk-cancel
+ True
+ 0
+
+
+ 4
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+
+ True
+
+
+ True
+ 16
+ go-home
+
+
+
+
+ True
+ 0
+ Log In
+
+
+ 1
+
+
+
+
+
+
+ 5
+
+
+
+
+ False
+ False
+ GTK_PACK_END
+ 2
+
+
+
+
+
+