From: Timm Bäder <mail@baedert.org>
Date: Wed, 20 Jun 2018 18:42:01 +0000 (+0200)
Subject: container: Remove SPECIAL_CONTAINER hack
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e8fefd92c5270a993580d2606605694fd66d313d;p=gtk4.git

container: Remove SPECIAL_CONTAINER hack

As discussed in !129

Closes !129
---

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 731bdb1da0..9f11262a7c 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -50,15 +50,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* A handful of containers inside GTK+ are cheating and widgets
- * inside internal structure as direct children for the purpose
- * of forall().
- */
-#define SPECIAL_CONTAINER(x) (GTK_IS_ASSISTANT (x) || \
-                              GTK_IS_POPOVER_MENU (x) || \
-                              GTK_IS_SHORTCUTS_SECTION (x) || \
-                              GTK_IS_SHORTCUTS_WINDOW (x))
-
 /**
  * SECTION:gtkcontainer
  * @Short_description: Base class for widgets which contain other widgets
@@ -458,15 +449,6 @@ gtk_container_buildable_set_child_property (GtkContainer *container,
   GError *error = NULL;
   GObjectNotifyQueue *nqueue;
 
-  if (SPECIAL_CONTAINER (container))
-    {
-      /* This can happen with internal children of complex widgets.
-       * Silently ignore the child properties in this case. We explicitly
-       * allow it for GtkAssistant, since that is how it works.
-       */
-      return;
-    }
-
   pspec = gtk_container_class_find_child_property (G_OBJECT_GET_CLASS (container), name);
   if (!pspec)
     {