gdm r6352 - in branches/gnome-2-20: . gui/greeter

[bcameron svn gnome org]

Author: bcameron
Date: Mon Aug  4 23:05:32 2008
New Revision: 6352
URL: http://svn.gnome.org/viewvc/gdm?rev=6352&view=rev

Log:
2008-07-31 Brian Cameron <brian cameron sun com>

        * gui/greeter/greeter_geometry.c: Prevent a negative value of
          child_allocation.width when item_type is GREETER_ITEM_TYPE_SVG.
          Fixes bug #546214.  Patch provided by Pascal Brochart
          <p brochart libertysurf fr>.


Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/gui/greeter/greeter_geometry.c

Modified: branches/gnome-2-20/gui/greeter/greeter_geometry.c
==============================================================================
--- branches/gnome-2-20/gui/greeter/greeter_geometry.c	(original)
+++ branches/gnome-2-20/gui/greeter/greeter_geometry.c	Mon Aug  4 23:05:32 2008
@@ -346,7 +346,10 @@
 	  if (child->item_type != GREETER_ITEM_TYPE_LABEL)
 	    fixup_from_anchor (&child_allocation, child->anchor);
 	  
-	  if (child_allocation.x + child_allocation.width > allocation->x + allocation->width)
+	  if ((child->item_type != GREETER_ITEM_TYPE_SVG ||
+	    child_allocation.width > (child_allocation.x + child_allocation.width
+					 - allocation->x - allocation->width)) &&
+	    (child_allocation.x + child_allocation.width > allocation->x + allocation->width))
 	      child_allocation.width -= (child_allocation.x + child_allocation.width
 					 - allocation->x - allocation->width);