From e17bf4abec88eba9511639e2495d6c1c35ad2311 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 21 Nov 2012 18:45:07 +0000 Subject: [PATCH] Fix overnight build failure last night, by making the new call to gtk_widget_get_allocation conditional on GTK being new enough to have that function. I'm assuming until someone proves otherwise that if it isn't that new, then it also isn't one of the versions of GTK which exhibit the bug which that call was working around (since gtk_widget_get_allocation came in 2.18, and the problem seems to have arisen since 2.20). [originally from svn r9712] --- gtk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gtk.c b/gtk.c index 8452bcd..714d679 100644 --- a/gtk.c +++ b/gtk.c @@ -1672,13 +1672,19 @@ static gboolean not_size_allocated_yet(GtkWidget *w) * size allocation. A null widget is already taking up all the * space it ever will.) */ - GtkAllocation a; - if (!w) return FALSE; /* nonexistent widgets aren't a problem */ - gtk_widget_get_allocation(w, &a); - return a.height == 0 || a.width == 0; +#if GTK_CHECK_VERSION(2,18,0) /* skip if no gtk_widget_get_allocation */ + { + GtkAllocation a; + gtk_widget_get_allocation(w, &a); + if (a.height == 0 || a.width == 0) + return TRUE; /* widget exists but has no size yet */ + } +#endif + + return FALSE; } static void try_shrink_drawing_area(frontend *fe)