[gtk+/wip/baedert/drawing: 54/63] paned: Remove assertion in get_child_property
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 54/63] paned: Remove assertion in get_child_property
- Date: Tue, 27 Jun 2017 16:56:01 +0000 (UTC)
commit 8001e9467f054982653738c1a4ffa5018ede5025
Author: Timm Bäder <mail baedert org>
Date: Mon Jun 26 12:02:17 2017 +0200
paned: Remove assertion in get_child_property
Passing the third child (the pane separator) is possible and shouldn't
cause the process to abort.
gtk/gtkpaned.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index d1551f1..c75d90e 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -965,8 +965,10 @@ gtk_paned_get_child_property (GtkContainer *container,
GtkPaned *paned = GTK_PANED (container);
GtkPanedPrivate *priv = paned->priv;
- g_assert (child == priv->child1 || child == priv->child2);
-
+ if (child != priv->child1 &&
+ child != priv->child2)
+ return;
+
switch (property_id)
{
case CHILD_PROP_RESIZE:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]