[gnome-menus] libmenu: Unset GMenuTree:menu-basename if GMenuTree:menu-path is set

[Vincent Untz <vuntz src gnome org>]

commit 1cb6fe8f97cc5a12933bd77d278a16827e763c13
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Jul 22 08:55:19 2011 +0200

    libmenu: Unset GMenuTree:menu-basename if GMenuTree:menu-path is set
    
    Since GMenuTree:menu-basename has a non-NULL default value, we really
    want to unset it if the user sets GMenuTree:menu-path, to avoid any
    potential confusion.
    
    We need a constructor to do this magic, as the properties are
    construct-only, and doing this anywhere else would be too late.

 libmenu/gmenu-tree.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 8aa420e..1857f2b 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -496,6 +496,31 @@ gmenu_tree_new_for_path (const char     *menu_path,
                        NULL);
 }
 
+static GObject *
+gmenu_tree_constructor (GType                  type,
+                        guint                  n_construct_properties,
+                        GObjectConstructParam *construct_properties)
+{
+	GObject   *obj;
+	GMenuTree *self;
+
+	obj = G_OBJECT_CLASS (gmenu_tree_parent_class)->constructor (type,
+                                                                     n_construct_properties,
+                                                                     construct_properties);
+
+        /* If GMenuTree:menu-path is set, then we should make sure that
+         * GMenuTree:menu-basename is unset (especially as it has a default
+         * value). This has to be done here, in the constructor, since the
+         * properties are construct-only. */
+
+	self = GMENU_TREE (obj);
+
+        if (self->path != NULL)
+          g_object_set (self, "menu-basename", NULL, NULL);
+
+	return obj;
+}
+
 static void
 gmenu_tree_set_property (GObject         *object,
                          guint            prop_id,
@@ -581,6 +606,7 @@ gmenu_tree_class_init (GMenuTreeClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
+  gobject_class->constructor = gmenu_tree_constructor;
   gobject_class->get_property = gmenu_tree_get_property;
   gobject_class->set_property = gmenu_tree_set_property;
   gobject_class->finalize = gmenu_tree_finalize;