[teklib-general] changeset in /hg/teklib/current: merge

[Franciska Schulze]

changeset 46d27330c3d2 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=46d27330c3d2
description:
	merge

diffs (23 lines):

diff -r 237f7ceb9a80 -r 46d27330c3d2 src/display_x11/display_x11_api.c
--- a/src/display_x11/display_x11_api.c	Mon Nov 19 18:31:27 2007 +0100
+++ b/src/display_x11/display_x11_api.c	Mon Nov 19 18:31:39 2007 +0100
@@ -567,11 +567,17 @@ setattrfunc(struct THook *hook, TAPTR ob
 			break;
 		case TVisual_MaxWidth:
 			v->sizehints->max_width = (TINT) item->tti_Value;
-			v->sizehints->flags |= PMaxSize;
+			if (v->sizehints->max_width == -1)
+				v->sizehints->flags &= ~PMaxSize;
+			else
+				v->sizehints->flags |= PMaxSize;
 			break;
 		case TVisual_MaxHeight:
 			v->sizehints->max_height = (TINT) item->tti_Value;
-			v->sizehints->flags |= PMaxSize;
+			if (v->sizehints->max_width == -1)
+				v->sizehints->flags &= ~PMaxSize;
+			else
+				v->sizehints->flags |= PMaxSize;
 			break;
 		case TVisualHost_GrabButton:
 			switch (item->tti_Value)