Revision 94ae02f3a29e8da49d90cf447907e2c07735c9cd

[evands at pidgin.im]

o     -----------------------------------------------------------------
|\    Revision: 94ae02f3a29e8da49d90cf447907e2c07735c9cd
| |   Ancestor: 7172b457b2254aea4fdb335f5cb8b43dcbb127f5
| |   Ancestor: 8977225fd5865020bc47afb7012cf60d2b21e6ae
| |   Author: evands at pidgin.im
| |   Date: 2007-03-27T04:21:53
| |   Branch: im.pidgin.pidgin
| |   
| |   Modified files:
| |           finch/libgnt/gntbox.c finch/libgnt/gntwidget.c
| |           libpurple/network.c
| |   
| |   ChangeLog: 
| |   
| |   merge of '7172b457b2254aea4fdb335f5cb8b43dcbb127f5'
| |        and '8977225fd5865020bc47afb7012cf60d2b21e6ae'
| |   
| |   ============================================================
| |   --- libpurple/network.c	769d07016c6a436271d7ed695e6d43c01206cb45
| |   +++ libpurple/network.c	60335f4bd92f820defa3407a93d944941ae7dc91
| |   @@ -364,7 +364,7 @@ purple_network_do_listen(unsigned short 
| |    #ifdef ENABLE_NAT_PMP
| |    	/* Attempt a NAT-PMP Mapping, which will return immediately */
| |    	if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
| |   -							  actual_port, actual_port, PURPLE_PMP_LIFETIME) != NULL)
| |   +							  actual_port, actual_port, PURPLE_PMP_LIFETIME))
| |    	{
| |    		purple_debug_info("network", "Created NAT-PMP mapping on port %i",actual_port);
| |    		/* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */
| |   ============================================================
| |   --- finch/libgnt/gntbox.c	8d537d98512519f9b3043f2a0cacd240d7e127cb
| |   +++ finch/libgnt/gntbox.c	dc9cc0d4b8f61eafc7517066238e9d5d8e527a4a
| |   @@ -352,11 +352,6 @@ gnt_box_confirm_size(GntWidget *widget, 
| |    	GntBox *box = GNT_BOX(widget);
| |    	int wchange, hchange;
| |    
| |   -	if (widget->priv.width != width && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
| |   -		return FALSE;
| |   -	if (widget->priv.height != height && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
| |   -		return FALSE;
| |   -
| |    	if (!box->list)
| |    		return TRUE;
| |    
| |   @@ -387,13 +382,21 @@ gnt_box_confirm_size(GntWidget *widget, 
| |    				gnt_widget_get_size(GNT_WIDGET(i->data), &tw, &th);
| |    				if (box->vertical)
| |    				{
| |   -					if (!gnt_widget_confirm_size(i->data, tw - wchange, th))
| |   -						return FALSE;
| |   +					if (!gnt_widget_confirm_size(i->data, tw - wchange, th)) {
| |   +						/* If we are decreasing the size and the widget is going
| |   +						 * to be too large to fit into the box, then do not allow
| |   +						 * resizing. */
| |   +						if (wchange > 0 && tw >= widget->priv.width)
| |   +							return FALSE;
| |   +					}
| |    				}
| |    				else
| |    				{
| |   -					if (!gnt_widget_confirm_size(i->data, tw, th - hchange))
| |   +					if (!gnt_widget_confirm_size(i->data, tw, th - hchange)) {
| |   +						if (hchange > 0 && th >= widget->priv.height)
| |   +							return FALSE;
| |    						return FALSE;
| |   +					}
| |    				}
| |    			}
| |    #if 0
| |   @@ -562,17 +565,6 @@ void gnt_box_add_widget(GntBox *b, GntWi
| |    {
| |    	b->list = g_list_append(b->list, widget);
| |    	widget->parent = GNT_WIDGET(b);
| |   -
| |   -	if (b->vertical)
| |   -	{
| |   -		if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
| |   -			GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(b), GNT_WIDGET_GROW_X);
| |   -	}
| |   -	else
| |   -	{
| |   -		if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
| |   -			GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(b), GNT_WIDGET_GROW_Y);
| |   -	}
| |    }
| |    
| |    void gnt_box_set_title(GntBox *b, const char *title)
| |   ============================================================
| |   --- finch/libgnt/gntwidget.c	858cfe29a2cd8af5f1802b83ae7dc32bdc6eefee
| |   +++ finch/libgnt/gntwidget.c	decb2af4f62f04ce59969945c68c9bd9ca1bcf0e
| |   @@ -75,11 +75,13 @@ gnt_widget_dummy_confirm_size(GntWidget 
| |    static gboolean
| |    gnt_widget_dummy_confirm_size(GntWidget *widget, int width, int height)
| |    {
| |   +	gboolean shadow;
| |    	if (width < widget->priv.minw || height < widget->priv.minh)
| |    		return FALSE;
| |   -	if (widget->priv.width != width && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
| |   +	shadow = gnt_widget_has_shadow(widget);
| |   +	if (widget->priv.width + shadow != width && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
| |    		return FALSE;
| |   -	if (widget->priv.height != height && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
| |   +	if (widget->priv.height + shadow != height && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
| |    		return FALSE;
| |    	return TRUE;
| |    }

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 94ae02f3a29e8da49d90cf447907e2c07735c9cd