From 28e712df0a5f5c0b9c44a19a12baa7e982dba014 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 18 Jun 2005 04:26:47 +0000 Subject: [PATCH] Fix 308111 --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkpaned.c | 2 ++ 4 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2168c2b07e..9dd3d33a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-06-18 Matthias Clasen + * gtk/gtkpaned.c (gtk_paned_add): Barf if more than + 2 children are added. (#308111, Morten Welinder) + * gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is 1-based. (#163842, Pierre Ossman) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2168c2b07e..9dd3d33a8c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-06-18 Matthias Clasen + * gtk/gtkpaned.c (gtk_paned_add): Barf if more than + 2 children are added. (#308111, Morten Welinder) + * gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is 1-based. (#163842, Pierre Ossman) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2168c2b07e..9dd3d33a8c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-06-18 Matthias Clasen + * gtk/gtkpaned.c (gtk_paned_add): Barf if more than + 2 children are added. (#308111, Morten Welinder) + * gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is 1-based. (#163842, Pierre Ossman) diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index a6b48e9537..dcf838efb1 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -1007,6 +1007,8 @@ gtk_paned_add (GtkContainer *container, gtk_paned_add1 (paned, widget); else if (!paned->child2) gtk_paned_add2 (paned, widget); + else + g_warning ("GtkPaned cannot have more than 2 children\n"); } static void