builder-tool: Handle GtkWidget::visible properly

This property has a 'smart' default that depends
on the class of the object we're creating. Take
that into account when deciding whether to omit
properties that are set to their default value.

diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index 4ef7373bd3859e39bc0aabffadfabb397fd56ec8..93c19e0a8c57d49e412d7cad9f3ae1a8103e9dfa 100644 (file)
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -358,8 +358,11 @@ get_property_pspec (MyParserData *data,
   return pspec;
 }
 
+static const char *get_class_name (Element *element);
+
 static gboolean
-value_is_default (MyParserData *data,
+value_is_default (Element      *element,
+                  MyParserData *data,
                   GParamSpec   *pspec,
                   const gchar  *value_string)
 {
@@ -377,7 +380,25 @@ value_is_default (MyParserData *data,
       ret = FALSE;
     }
   else
-    ret = g_param_value_defaults (pspec, &value);
+    {
+      /* GtkWidget::visible has a 'smart' default */
+      if (pspec->owner_type == GTK_TYPE_WIDGET &&
+          g_str_equal (pspec->name, "visible"))
+        {
+          const char *class_name = get_class_name (element);
+          GType type = g_type_from_name (class_name);
+          gboolean default_value;
+
+          if (g_type_is_a (type, GTK_TYPE_NATIVE))
+            default_value = FALSE;
+          else
+            default_value = TRUE;
+
+          ret = g_value_get_boolean (&value) == default_value;
+        }
+      else
+        ret = g_param_value_defaults (pspec, &value);
+    }
 
   g_value_reset (&value);
 
@@ -556,7 +577,7 @@ property_can_be_omitted (Element      *element,
   if (needs_explicit_setting (pspec, kind))
     return FALSE;
 
-  return value_is_default (data, pspec, value_string);
+  return value_is_default (element, data, pspec, value_string);
 }
 
 static gboolean