gdm r6661 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Wed Jan 14 22:59:34 2009
New Revision: 6661
URL: http://svn.gnome.org/viewvc/gdm?rev=6661&view=rev

Log:
Don't truncate long pam messages

At some point I made the greeter login window set it's size
requisition to it's size allocation to prevent it from shrinking
horizontally as the window hierarchy changed.

That change actually prevents the window from growing horizontally also.

This commit reworks things from within the size-request handler so
it can always grow but never shrink.

Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Wed Jan 14 22:59:34 2009
@@ -543,7 +543,6 @@
 
         switch (number) {
         case MODE_SELECTION:
-                gtk_widget_set_size_request (GTK_WIDGET (login_window), -1, -1);
                 set_log_in_button_mode (login_window, LOGIN_BUTTON_HIDDEN);
 
                 show_widget (login_window, "cancel-button", FALSE);
@@ -568,9 +567,6 @@
                 default_name = NULL;
                 break;
         case MODE_AUTHENTICATION:
-                gtk_widget_set_size_request (GTK_WIDGET (login_window),
-                                             GTK_WIDGET (login_window)->allocation.width,
-                                             -1);
                 show_widget (login_window, "cancel-button", TRUE);
                 show_widget (login_window, "shutdown-button", FALSE);
                 show_widget (login_window, "restart-button", FALSE);
@@ -1678,6 +1674,10 @@
          */
         requisition->width = MAX (requisition->width, .33 * screen_w);
         requisition->height = MIN (requisition->height, .80 * screen_h);
+
+       /* Don't ever shrink window width
+        */
+       requisition->width = MAX (requisition->width, widget->allocation.width);
 }
 
 static void