Sophie

Sophie

distrib > Mandriva > 2011.0 > i586 > by-pkgid > 33d4e48f71b0d24d237f3429e1934d27 > files > 29

gdm-2.32.2-2.src.rpm

diff -p -up gdm-2.31.90/gui/simple-greeter/gdm-greeter-panel.c.low-resolution-screen gdm-2.31.90/gui/simple-greeter/gdm-greeter-panel.c
--- gdm-2.31.90/gui/simple-greeter/gdm-greeter-panel.c.low-resolution-screen	2010-08-18 10:34:05.000000000 +0200
+++ gdm-2.31.90/gui/simple-greeter/gdm-greeter-panel.c	2010-08-18 10:35:18.000000000 +0200
@@ -766,6 +766,7 @@ setup_panel (GdmGreeterPanel *panel)
 {
         NaTray    *tray;
         GtkWidget *spacer;
+        GdkScreen *screen;
         int        padding;
 
         gdm_profile_start (NULL);
@@ -886,7 +887,15 @@ setup_panel (GdmGreeterPanel *panel)
         panel->priv->clock = gdm_clock_widget_new ();
         gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
                             GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
-        gtk_widget_show (panel->priv->clock);
+
+        screen = gtk_widget_get_screen (panel->priv->clock);
+        if (!screen)
+                screen = gdk_screen_get_default ();
+
+        /* If resolution is limited, hide clock to conserve horizontal space */
+
+        if (!screen || gdk_screen_get_width (screen) >= 1024)
+                gtk_widget_show (panel->priv->clock);
 
         tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
                                        GTK_ORIENTATION_HORIZONTAL);
diff -p -up gdm-2.31.90/gui/simple-greeter/gdm-option-widget.c.low-resolution-screen gdm-2.31.90/gui/simple-greeter/gdm-option-widget.c
--- gdm-2.31.90/gui/simple-greeter/gdm-option-widget.c.low-resolution-screen	2010-08-12 18:53:40.000000000 +0200
+++ gdm-2.31.90/gui/simple-greeter/gdm-option-widget.c	2010-08-18 10:38:34.000000000 +0200
@@ -633,7 +633,16 @@ gdm_option_widget_check_visibility (GdmO
             (widget->priv->number_of_top_rows > 0 ||
              widget->priv->number_of_middle_rows > 1 ||
              widget->priv->number_of_bottom_rows > 0)) {
+                GdkScreen *screen;
                 gtk_widget_show (widget->priv->items_combo_box);
+                screen = gtk_widget_get_screen (widget->priv->label);
+                if (!screen)
+                        screen = gdk_screen_get_default ();
+
+                /* If resolution is limited, hide labels to conserve horizontal space */
+
+                if (!screen || gdk_screen_get_width (screen) >= 1280)
+                        gtk_widget_show (widget->priv->label);
 
                 if (widget->priv->icon_name != NULL) {
                         gtk_widget_show (widget->priv->image);