From e9e03b2d8a92adf458dc7b0dd849d99c36e77492 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 15:34:51 -0600
Subject: Adding in a defaults object

---
 libdbusmenu-glib/Makefile.am |  2 ++
 libdbusmenu-glib/defaults.c  | 49 ++++++++++++++++++++++++++++++++++++++++++++
 libdbusmenu-glib/defaults.h  | 31 ++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 libdbusmenu-glib/defaults.c
 create mode 100644 libdbusmenu-glib/defaults.h

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 92de502..5ddbeb8 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -24,6 +24,8 @@ libdbusmenu_glibinclude_HEADERS = \
 libdbusmenu_glib_la_SOURCES = \
 	dbus-menu-clean.xml.h \
 	dbus-menu-clean.xml.c \
+	defaults.h \
+	defaults.c \
 	menuitem.h \
 	menuitem.c \
 	menuitem-marshal.h \
diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
new file mode 100644
index 0000000..cbd9bfa
--- /dev/null
+++ b/libdbusmenu-glib/defaults.c
@@ -0,0 +1,49 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "defaults.h"
+
+typedef struct _DbusmenuDefaultsPrivate DbusmenuDefaultsPrivate;
+
+struct _DbusmenuDefaultsPrivate
+{
+};
+
+#define DBUSMENU_DEFAULTS_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_DEFAULTS_TYPE, DbusmenuDefaultsPrivate))
+
+static void dbusmenu_defaults_class_init (DbusmenuDefaultsClass *klass);
+static void dbusmenu_defaults_init       (DbusmenuDefaults *self);
+static void dbusmenu_defaults_dispose    (GObject *object);
+static void dbusmenu_defaults_finalize   (GObject *object);
+
+G_DEFINE_TYPE (DbusmenuDefaults, dbusmenu_defaults, G_TYPE_OBJECT);
+
+static void
+dbusmenu_defaults_class_init (DbusmenuDefaultsClass *klass)
+{
+GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+g_type_class_add_private (klass, sizeof (DbusmenuDefaultsPrivate));
+
+object_class->dispose = dbusmenu_defaults_dispose;
+object_class->finalize = dbusmenu_defaults_finalize;
+}
+
+static void
+dbusmenu_defaults_init (DbusmenuDefaults *self)
+{
+}
+
+static void
+dbusmenu_defaults_dispose (GObject *object)
+{
+G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->dispose (object);
+}
+
+static void
+dbusmenu_defaults_finalize (GObject *object)
+{
+G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->finalize (object);
+}
diff --git a/libdbusmenu-glib/defaults.h b/libdbusmenu-glib/defaults.h
new file mode 100644
index 0000000..a440371
--- /dev/null
+++ b/libdbusmenu-glib/defaults.h
@@ -0,0 +1,31 @@
+#ifndef __DBUSMENU_DEFAULTS_H__
+#define __DBUSMENU_DEFAULTS_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define DBUSMENU_TYPE_DEFAULTS            (dbusmenu_defaults_get_type ())
+#define DBUSMENU_DEFAULTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaults))
+#define DBUSMENU_DEFAULTS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaultsClass))
+#define IS_DBUSMENU_DEFAULTS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_DEFAULTS))
+#define IS_DBUSMENU_DEFAULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_DEFAULTS))
+#define DBUSMENU_DEFAULTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaultsClass))
+
+typedef struct _DbusmenuDefaults      DbusmenuDefaults;
+typedef struct _DbusmenuDefaultsClass DbusmenuDefaultsClass;
+
+struct _DbusmenuDefaultsClass {
+	GObjectClass parent_class;
+};
+
+struct _DbusmenuDefaults {
+	GObject parent;
+};
+
+GType dbusmenu_defaults_get_type (void);
+
+G_END_DECLS
+
+#endif
-- 
cgit v1.2.3


From cb9011e136912751fb01d2107435e3422863cbdc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 15:42:08 -0600
Subject: Setting up the private and some base documentation

---
 libdbusmenu-glib/defaults.h | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.h b/libdbusmenu-glib/defaults.h
index a440371..9cd03fa 100644
--- a/libdbusmenu-glib/defaults.h
+++ b/libdbusmenu-glib/defaults.h
@@ -13,18 +13,34 @@ G_BEGIN_DECLS
 #define IS_DBUSMENU_DEFAULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_DEFAULTS))
 #define DBUSMENU_DEFAULTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaultsClass))
 
-typedef struct _DbusmenuDefaults      DbusmenuDefaults;
-typedef struct _DbusmenuDefaultsClass DbusmenuDefaultsClass;
-
+typedef struct _DbusmenuDefaults        DbusmenuDefaults;
+typedef struct _DbusmenuDefaultsClass   DbusmenuDefaultsClass;
+typedef struct _DbusmenuDefaultsPrivate DbusmenuDefaultsPrivate;
+
+/**
+ * DbusmenuDefaultsClass:
+ *
+ * All of the signals and functions for #DbusmenuDefaults
+ */
 struct _DbusmenuDefaultsClass {
 	GObjectClass parent_class;
 };
 
+/**
+ * DbusmenuDefaults:
+ *
+ * A singleton to hold all of the defaults for the menuitems
+ * so they can use those easily.
+ */
 struct _DbusmenuDefaults {
 	GObject parent;
+
+	/*< Private >*/
+	DbusmenuDefaultsPrivate * priv;
 };
 
-GType dbusmenu_defaults_get_type (void);
+GType                 dbusmenu_defaults_get_type             (void);
+DbusmenuDefaults *    dbusmenu_defaults_ref_default          (void);
 
 G_END_DECLS
 
-- 
cgit v1.2.3


From 4f8113b14cbba9ef88b46be5545f3bb235060b10 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 15:42:18 -0600
Subject: License headers

---
 libdbusmenu-glib/defaults.c | 28 ++++++++++++++++++++++++++++
 libdbusmenu-glib/defaults.h | 28 ++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index cbd9bfa..450707f 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -1,3 +1,31 @@
+/*
+A library to communicate a menu object set accross DBus and
+track updates and maintain consistency.
+
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of either or both of the following licenses:
+
+1) the GNU Lesser General Public License version 3, as published by the 
+Free Software Foundation; and/or
+2) the GNU Lesser General Public License version 2.1, as published by 
+the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the applicable version of the GNU Lesser General Public 
+License for more details.
+
+You should have received a copy of both the GNU Lesser General Public 
+License version 3 and version 2.1 along with this program.  If not, see 
+<http://www.gnu.org/licenses/>
+*/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/libdbusmenu-glib/defaults.h b/libdbusmenu-glib/defaults.h
index 9cd03fa..842b58b 100644
--- a/libdbusmenu-glib/defaults.h
+++ b/libdbusmenu-glib/defaults.h
@@ -1,3 +1,31 @@
+/*
+A library to communicate a menu object set accross DBus and
+track updates and maintain consistency.
+
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of either or both of the following licenses:
+
+1) the GNU Lesser General Public License version 3, as published by the 
+Free Software Foundation; and/or
+2) the GNU Lesser General Public License version 2.1, as published by 
+the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the applicable version of the GNU Lesser General Public 
+License for more details.
+
+You should have received a copy of both the GNU Lesser General Public 
+License version 3 and version 2.1 along with this program.  If not, see 
+<http://www.gnu.org/licenses/>
+*/
+
 #ifndef __DBUSMENU_DEFAULTS_H__
 #define __DBUSMENU_DEFAULTS_H__
 
-- 
cgit v1.2.3


From 0d6f893deda7eebefab68be2b7566e8033f2be48 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 15:43:11 -0600
Subject: Format sanely

---
 libdbusmenu-glib/defaults.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index 450707f..af86a90 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -34,8 +34,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 
 typedef struct _DbusmenuDefaultsPrivate DbusmenuDefaultsPrivate;
 
-struct _DbusmenuDefaultsPrivate
-{
+struct _DbusmenuDefaultsPrivate {
+	GHashTable * types;
 };
 
 #define DBUSMENU_DEFAULTS_GET_PRIVATE(o) \
@@ -51,27 +51,34 @@ G_DEFINE_TYPE (DbusmenuDefaults, dbusmenu_defaults, G_TYPE_OBJECT);
 static void
 dbusmenu_defaults_class_init (DbusmenuDefaultsClass *klass)
 {
-GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-g_type_class_add_private (klass, sizeof (DbusmenuDefaultsPrivate));
+	g_type_class_add_private (klass, sizeof (DbusmenuDefaultsPrivate));
 
-object_class->dispose = dbusmenu_defaults_dispose;
-object_class->finalize = dbusmenu_defaults_finalize;
+	object_class->dispose = dbusmenu_defaults_dispose;
+	object_class->finalize = dbusmenu_defaults_finalize;
+	return;
 }
 
 static void
 dbusmenu_defaults_init (DbusmenuDefaults *self)
 {
+
+	return;
 }
 
 static void
 dbusmenu_defaults_dispose (GObject *object)
 {
-G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->dispose (object);
+
+	G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->dispose (object);
+	return;
 }
 
 static void
 dbusmenu_defaults_finalize (GObject *object)
 {
-G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->finalize (object);
+
+	G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->finalize (object);
+	return;
 }
-- 
cgit v1.2.3


From 1c1171f7a84e37dd96385cea1600465350217ae0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 15:47:40 -0600
Subject: Fleshing out the ref_default

---
 libdbusmenu-glib/defaults.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index af86a90..a6dd4a2 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -32,8 +32,6 @@ License version 3 and version 2.1 along with this program.  If not, see
 
 #include "defaults.h"
 
-typedef struct _DbusmenuDefaultsPrivate DbusmenuDefaultsPrivate;
-
 struct _DbusmenuDefaultsPrivate {
 	GHashTable * types;
 };
@@ -82,3 +80,23 @@ dbusmenu_defaults_finalize (GObject *object)
 	G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->finalize (object);
 	return;
 }
+
+static DbusmenuDefaults * default_defaults = NULL;
+
+/**
+ * dbusmenu_defaults_ref_default:
+ *
+ * Get a reference to the default instance.  If it doesn't exist this
+ * function will create it.
+ *
+ * Return value: (transfer full): A reference to the defaults
+ */
+DbusmenuDefaults *
+dbusmenu_defaults_ref_default (void)
+{
+	if (default_defaults == NULL) {
+		default_defaults = DBUSMENU_DEFAULTS(g_object_new(DBUSMENU_TYPE_DEFAULTS, NULL));
+	}
+
+	return default_defaults;
+}
-- 
cgit v1.2.3


From a4a9e45e12ebfc45306f986953b04e2409f9cc7e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 16:13:44 -0600
Subject: Putting in stubs for our get/set functions

---
 libdbusmenu-glib/defaults.c | 57 +++++++++++++++++++++++++++++++++++++++++++++
 libdbusmenu-glib/defaults.h | 11 +++++++++
 2 files changed, 68 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index a6dd4a2..ec70ce1 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -100,3 +100,60 @@ dbusmenu_defaults_ref_default (void)
 
 	return default_defaults;
 }
+
+/**
+ * dbusmenu_defaults_default_set:
+ * @default: The #DbusmenuDefaults object to add to
+ * @type: (allow-none): The #DbusmenuMenuitem type for this default if #NULL will default to #DBUSMENU_CLIENT_TYPE_DEFAULT
+ * @property: Property name for the default
+ * @prop_type: (allow-none): Type of the property for runtime checking.  To disable checking set to #NULL.
+ * @value: (allow-none): Default value for @property.  #NULL if by default it is unset, but you want type checking from @prop_type.
+ *
+ * Sets up an entry in the defaults database for a given @property
+ * and menuitem type @type.  @prop_type and @value can both be #NULL
+ * but both of them can not.
+ */
+void
+dbusmenu_defaults_default_set (DbusmenuDefaults * defaults, const gchar * type, const gchar * property, const GVariantType * prop_type, GVariant * value)
+{
+
+	return;
+}
+
+/**
+ * dbusmenu_defaults_default_get:
+ * @defaults: The default database to use
+ * @type: (allow-none): The #DbusmenuMenuitem type for this default if #NULL will default to #DBUSMENU_CLIENT_TYPE_DEFAULT
+ * @property: Property name to lookup
+ *
+ * Gets an entry in the database for a give @property and @type.
+ *
+ * Return value: (transfer none): Returns a variant that does not
+ * have it's ref count increased.  If you want to keep it, you should
+ * do that.
+ */
+GVariant *
+dbusmenu_defaults_default_get (DbusmenuDefaults * defaults, const gchar * type, const gchar * property)
+{
+
+	return NULL;
+}
+
+/**
+ * dbusmenu_defaults_default_get_type:
+ * @defaults: The default database to use
+ * @type: (allow-none): The #DbusmenuMenuitem type for this default if #NULL will default to #DBUSMENU_CLIENT_TYPE_DEFAULT
+ * @property: Property name to lookup
+ *
+ * Gets the type for an entry in the database for a give @property and @type.
+ *
+ * Return value: (transfer none): Returns a type for the given
+ * @property value.
+ */
+GVariantType *
+dbusmenu_defaults_default_get_type (DbusmenuDefaults * defaults, const gchar * type, const gchar * property)
+{
+
+	return NULL;
+}
+
diff --git a/libdbusmenu-glib/defaults.h b/libdbusmenu-glib/defaults.h
index 842b58b..9668206 100644
--- a/libdbusmenu-glib/defaults.h
+++ b/libdbusmenu-glib/defaults.h
@@ -69,6 +69,17 @@ struct _DbusmenuDefaults {
 
 GType                 dbusmenu_defaults_get_type             (void);
 DbusmenuDefaults *    dbusmenu_defaults_ref_default          (void);
+void                  dbusmenu_defaults_default_set          (DbusmenuDefaults * defaults,
+                                                              const gchar * type,
+                                                              const gchar * property,
+                                                              const GVariantType * prop_type,
+                                                              GVariant * value);
+GVariant *            dbusmenu_defaults_default_get          (DbusmenuDefaults * defaults,
+                                                              const gchar * type,
+                                                              const gchar * property);
+GVariantType *        dbusmenu_defaults_default_get_type     (DbusmenuDefaults * defaults,
+                                                              const gchar * type,
+                                                              const gchar * property);
 
 G_END_DECLS
 
-- 
cgit v1.2.3


From 69951e51941d1122b58119f52b072aa9863fc3c2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:01:02 -0600
Subject: Setting the core defaults up in a handy table.

---
 libdbusmenu-glib/defaults.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index ec70ce1..c225612 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -30,7 +30,11 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "config.h"
 #endif
 
+#include <glib/gi18n.h>
+
 #include "defaults.h"
+#include "menuitem.h"
+#include "client.h"
 
 struct _DbusmenuDefaultsPrivate {
 	GHashTable * types;
@@ -62,6 +66,19 @@ static void
 dbusmenu_defaults_init (DbusmenuDefaults *self)
 {
 
+	/* Standard defaults */
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_VISIBLE,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_ENABLED,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_LABEL,          G_VARIANT_TYPE_STRING,    g_variant_new_string(_("Label Empty"))); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_ICON_NAME,      G_VARIANT_TYPE_STRING,    NULL); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,    G_VARIANT_TYPE_STRING,    NULL); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,   G_VARIANT_TYPE_INT32,     NULL); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_SHORTCUT,       G_VARIANT_TYPE_ARRAY,     NULL); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY,  G_VARIANT_TYPE_STRING,    NULL); 
+
+	/* Separator defaults */
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_SEPARATOR,  DBUSMENU_MENUITEM_PROP_VISIBLE,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
+
 	return;
 }
 
@@ -103,7 +120,7 @@ dbusmenu_defaults_ref_default (void)
 
 /**
  * dbusmenu_defaults_default_set:
- * @default: The #DbusmenuDefaults object to add to
+ * @defaults: The #DbusmenuDefaults object to add to
  * @type: (allow-none): The #DbusmenuMenuitem type for this default if #NULL will default to #DBUSMENU_CLIENT_TYPE_DEFAULT
  * @property: Property name for the default
  * @prop_type: (allow-none): Type of the property for runtime checking.  To disable checking set to #NULL.
-- 
cgit v1.2.3


From 6d298a977a906aa9029b8f82b19fae71562db5fe Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:15:14 -0600
Subject: Create an entry structure and functions for creating and destroying
 it

---
 libdbusmenu-glib/defaults.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index c225612..3a98923 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -40,6 +40,12 @@ struct _DbusmenuDefaultsPrivate {
 	GHashTable * types;
 };
 
+typedef struct _DefaultEntry DefaultEntry;
+struct _DefaultEntry {
+	GVariantType * type;
+	GVariant * value;
+};
+
 #define DBUSMENU_DEFAULTS_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_DEFAULTS_TYPE, DbusmenuDefaultsPrivate))
 
@@ -48,6 +54,9 @@ static void dbusmenu_defaults_init       (DbusmenuDefaults *self);
 static void dbusmenu_defaults_dispose    (GObject *object);
 static void dbusmenu_defaults_finalize   (GObject *object);
 
+static DefaultEntry * entry_create (GVariantType * type, GVariant * variant);
+static void entry_destroy (gpointer entry);
+
 G_DEFINE_TYPE (DbusmenuDefaults, dbusmenu_defaults, G_TYPE_OBJECT);
 
 static void
@@ -98,6 +107,44 @@ dbusmenu_defaults_finalize (GObject *object)
 	return;
 }
 
+/* Create a new entry based on the info provided */
+static DefaultEntry *
+entry_create (GVariantType * type, GVariant * variant)
+{
+	DefaultEntry * defentry = g_new0(DefaultEntry, 1);
+
+	if (type != NULL) {
+		defentry->type = g_variant_type_copy(type);
+	}
+
+	if (variant != NULL) {
+		defentry->value = variant;
+		g_variant_ref_sink(variant);
+	}
+
+	return defentry;
+}
+
+/* Destroy an entry */
+static void
+entry_destroy (gpointer entry)
+{
+	DefaultEntry * defentry = (DefaultEntry *)entry;
+
+	if (defentry->type != NULL) {
+		g_variant_type_free(defentry->type);
+		defentry->type = NULL;
+	}
+
+	if (defentry->value != NULL) {
+		g_variant_unref(defentry->value);
+		defentry->value = NULL;
+	}
+
+	g_free(defentry);
+	return;
+}
+
 static DbusmenuDefaults * default_defaults = NULL;
 
 /**
-- 
cgit v1.2.3


From 6c544a4f41d713878667418cd14411e5fc6c1f3f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:18:58 -0600
Subject: Building our hash table and making sure it gets cleaned up

---
 libdbusmenu-glib/defaults.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index 3a98923..53ef09d 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -47,7 +47,7 @@ struct _DefaultEntry {
 };
 
 #define DBUSMENU_DEFAULTS_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_DEFAULTS_TYPE, DbusmenuDefaultsPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaultsPrivate))
 
 static void dbusmenu_defaults_class_init (DbusmenuDefaultsClass *klass);
 static void dbusmenu_defaults_init       (DbusmenuDefaults *self);
@@ -74,6 +74,9 @@ dbusmenu_defaults_class_init (DbusmenuDefaultsClass *klass)
 static void
 dbusmenu_defaults_init (DbusmenuDefaults *self)
 {
+	self->priv = DBUSMENU_DEFAULTS_GET_PRIVATE(self); 
+
+	self->priv->types = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, entry_destroy);
 
 	/* Standard defaults */
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_VISIBLE,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
@@ -94,6 +97,12 @@ dbusmenu_defaults_init (DbusmenuDefaults *self)
 static void
 dbusmenu_defaults_dispose (GObject *object)
 {
+	DbusmenuDefaults * self = DBUSMENU_DEFAULTS(object);
+
+	if (self->priv->types != NULL) {
+		g_hash_table_destroy(self->priv->types);
+		self->priv->types = NULL;
+	}
 
 	G_OBJECT_CLASS (dbusmenu_defaults_parent_class)->dispose (object);
 	return;
-- 
cgit v1.2.3


From c89e30d70bcd342837af4633f393a26c7fb3bdc9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:29:13 -0600
Subject: Create a basic setter function and fix our hashtables so they work
 with it.

---
 libdbusmenu-glib/defaults.c | 26 +++++++++++++++++++++++---
 libdbusmenu-glib/defaults.h |  4 ++--
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index 53ef09d..9fde682 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -54,7 +54,7 @@ static void dbusmenu_defaults_init       (DbusmenuDefaults *self);
 static void dbusmenu_defaults_dispose    (GObject *object);
 static void dbusmenu_defaults_finalize   (GObject *object);
 
-static DefaultEntry * entry_create (GVariantType * type, GVariant * variant);
+static DefaultEntry * entry_create (const GVariantType * type, GVariant * variant);
 static void entry_destroy (gpointer entry);
 
 G_DEFINE_TYPE (DbusmenuDefaults, dbusmenu_defaults, G_TYPE_OBJECT);
@@ -76,7 +76,7 @@ dbusmenu_defaults_init (DbusmenuDefaults *self)
 {
 	self->priv = DBUSMENU_DEFAULTS_GET_PRIVATE(self); 
 
-	self->priv->types = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, entry_destroy);
+	self->priv->types = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_hash_table_destroy);
 
 	/* Standard defaults */
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_VISIBLE,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
@@ -118,7 +118,7 @@ dbusmenu_defaults_finalize (GObject *object)
 
 /* Create a new entry based on the info provided */
 static DefaultEntry *
-entry_create (GVariantType * type, GVariant * variant)
+entry_create (const GVariantType * type, GVariant * variant)
 {
 	DefaultEntry * defentry = g_new0(DefaultEntry, 1);
 
@@ -189,6 +189,26 @@ dbusmenu_defaults_ref_default (void)
 void
 dbusmenu_defaults_default_set (DbusmenuDefaults * defaults, const gchar * type, const gchar * property, const GVariantType * prop_type, GVariant * value)
 {
+	g_return_if_fail(DBUSMENU_IS_DEFAULTS(defaults));
+	g_return_if_fail(property != NULL);
+	g_return_if_fail(prop_type != NULL || value != NULL);
+
+	if (type == NULL) {
+		type = DBUSMENU_CLIENT_TYPES_DEFAULT;
+	}
+
+	GHashTable * prop_table = (GHashTable *)g_hash_table_lookup(defaults->priv->types, type);
+
+	/* We've never had a default for this type, so we need
+	   to create a table for it. */
+	if (prop_table == NULL) {
+		prop_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, entry_destroy);
+
+		g_hash_table_insert(prop_table, g_strdup(property), entry_create(prop_type, value));
+		g_hash_table_insert(defaults->priv->types, g_strdup(type), prop_table);
+	} else {
+		g_hash_table_replace(prop_table, g_strdup(property), entry_create(prop_type, value));
+	}
 
 	return;
 }
diff --git a/libdbusmenu-glib/defaults.h b/libdbusmenu-glib/defaults.h
index 9668206..ab377f7 100644
--- a/libdbusmenu-glib/defaults.h
+++ b/libdbusmenu-glib/defaults.h
@@ -37,8 +37,8 @@ G_BEGIN_DECLS
 #define DBUSMENU_TYPE_DEFAULTS            (dbusmenu_defaults_get_type ())
 #define DBUSMENU_DEFAULTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaults))
 #define DBUSMENU_DEFAULTS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaultsClass))
-#define IS_DBUSMENU_DEFAULTS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_DEFAULTS))
-#define IS_DBUSMENU_DEFAULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_DEFAULTS))
+#define DBUSMENU_IS_DEFAULTS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_DEFAULTS))
+#define DBUSMENU_IS_DEFAULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_DEFAULTS))
 #define DBUSMENU_DEFAULTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_DEFAULTS, DbusmenuDefaultsClass))
 
 typedef struct _DbusmenuDefaults        DbusmenuDefaults;
-- 
cgit v1.2.3


From 543691a8c404735cc6f5bfbe24dc8bbe57908ff0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:32:53 -0600
Subject: Flesh out the getters as well

---
 libdbusmenu-glib/defaults.c | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index 9fde682..e8cdea0 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -228,8 +228,26 @@ dbusmenu_defaults_default_set (DbusmenuDefaults * defaults, const gchar * type,
 GVariant *
 dbusmenu_defaults_default_get (DbusmenuDefaults * defaults, const gchar * type, const gchar * property)
 {
+	g_return_val_if_fail(DBUSMENU_IS_DEFAULTS(defaults), NULL);
+	g_return_val_if_fail(property != NULL, NULL);
 
-	return NULL;
+	if (type == NULL) {
+		type = DBUSMENU_CLIENT_TYPES_DEFAULT;
+	}
+
+	GHashTable * prop_table = (GHashTable *)g_hash_table_lookup(defaults->priv->types, type);
+
+	if (prop_table == NULL) {
+		return NULL;
+	}
+
+	DefaultEntry * entry = (DefaultEntry *)g_hash_table_lookup(prop_table, property);
+
+	if (entry == NULL) {
+		return NULL;
+	}
+
+	return entry->value;
 }
 
 /**
@@ -246,7 +264,25 @@ dbusmenu_defaults_default_get (DbusmenuDefaults * defaults, const gchar * type,
 GVariantType *
 dbusmenu_defaults_default_get_type (DbusmenuDefaults * defaults, const gchar * type, const gchar * property)
 {
+	g_return_val_if_fail(DBUSMENU_IS_DEFAULTS(defaults), NULL);
+	g_return_val_if_fail(property != NULL, NULL);
+
+	if (type == NULL) {
+		type = DBUSMENU_CLIENT_TYPES_DEFAULT;
+	}
+
+	GHashTable * prop_table = (GHashTable *)g_hash_table_lookup(defaults->priv->types, type);
+
+	if (prop_table == NULL) {
+		return NULL;
+	}
+
+	DefaultEntry * entry = (DefaultEntry *)g_hash_table_lookup(prop_table, property);
+
+	if (entry == NULL) {
+		return NULL;
+	}
 
-	return NULL;
+	return entry->type;
 }
 
-- 
cgit v1.2.3


From 8dd5384336a88c076429c621f8080bad947a9d23 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:35:19 -0600
Subject: Finally getting our very own reference for the defaults

---
 libdbusmenu-glib/menuitem.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index c994130..b6c5712 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -33,6 +33,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "menuitem.h"
 #include "menuitem-marshal.h"
 #include "menuitem-private.h"
+#include "defaults.h"
 
 #ifdef MASSIVEDEBUGGING
 #define LABEL(x)  dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(x), DBUSMENU_MENUITEM_PROP_LABEL)
@@ -59,6 +60,7 @@ struct _DbusmenuMenuitemPrivate
 	GHashTable * properties;
 	gboolean root;
 	gboolean realized;
+	DbusmenuDefaults * defaults;
 };
 
 /* Signals */
@@ -312,6 +314,8 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 
 	priv->root = FALSE;
 	priv->realized = FALSE;
+
+	priv->defaults = dbusmenu_defaults_ref_default();
 	
 	return;
 }
@@ -328,6 +332,11 @@ dbusmenu_menuitem_dispose (GObject *object)
 	g_list_free(priv->children);
 	priv->children = NULL;
 
+	if (priv->defaults != NULL) {
+		g_object_unref(priv->defaults);
+		priv->defaults = NULL;
+	}
+
 	G_OBJECT_CLASS (dbusmenu_menuitem_parent_class)->dispose (object);
 	return;
 }
-- 
cgit v1.2.3


From c704e7e82e57f2ac6ca9e058459d600c0bbed6ab Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:37:45 -0600
Subject: Making sure to have weak pointer support incase we do drop all the
 refs

---
 libdbusmenu-glib/defaults.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index e8cdea0..9031d20 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -169,6 +169,7 @@ dbusmenu_defaults_ref_default (void)
 {
 	if (default_defaults == NULL) {
 		default_defaults = DBUSMENU_DEFAULTS(g_object_new(DBUSMENU_TYPE_DEFAULTS, NULL));
+		g_object_add_weak_pointer(G_OBJECT(default_defaults), (gpointer *)&default_defaults);
 	}
 
 	return default_defaults;
-- 
cgit v1.2.3


From 494adf9835825c711fd9f05b44143d6331bcab63 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:06:41 -0600
Subject: When we're setting a value check to see if it's the same as the
 default and clear it if so.

---
 libdbusmenu-glib/menuitem.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index b6c5712..c744435 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -434,6 +434,14 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 	return;
 }
 
+/* A helper function to get the type of the menuitem, this might
+   be a candidate for optimization in the future. */
+static const gchar *
+menuitem_get_type (DbusmenuMenuitem * mi)
+{
+	return dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE);
+}
+
 /* Public interface */
 
 /**
@@ -1013,6 +1021,35 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
+	const gchar * type = menuitem_get_type(mi);
+	if (type != NULL) {
+		/* Check the defaults database to see if we have a default
+		   for this property. */
+		GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+		if (default_value != NULL) {
+			/* If we have a default we might also have an expected type */
+			GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+
+			if (default_type != NULL) {
+				/* If we have an expected type we should check to see if
+				   the value we've been given is of the same type and generate
+				   a warning if it isn't */
+				if (!g_variant_is_of_type(value, default_type)) {
+					g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+				}
+			}
+
+			/* Now see if we're setting this to the same value as the
+			   default.  If we are then we just want to swallow this variant
+			   and make the function behave like we're clearing it. */
+			if (g_variant_equal(default_value, value)) {
+				g_variant_ref_sink(value);
+				g_variant_unref(value);
+				value = NULL;
+			}
+		}
+	}
+
 	gboolean replaced = FALSE;
 	gpointer currentval = g_hash_table_lookup(priv->properties, property);
 
-- 
cgit v1.2.3


From 507b6ec86e0e6c4eacd41863f8900a90c023f915 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:09:31 -0600
Subject: Allow for signaling the default value if it makes sense

---
 libdbusmenu-glib/menuitem.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index c744435..d25e80d 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1022,10 +1022,11 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
 	const gchar * type = menuitem_get_type(mi);
+	GVariant * default_value = NULL;
 	if (type != NULL) {
 		/* Check the defaults database to see if we have a default
 		   for this property. */
-		GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
 		if (default_value != NULL) {
 			/* If we have a default we might also have an expected type */
 			GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
@@ -1073,7 +1074,15 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	   table.  But the fact that there was a value is
 	   the imporant part. */
 	if (currentval == NULL || replaced) {
-		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE);
+		GVariant * signalval = value;
+
+		if (signalval == NULL) {
+			/* Might also be NULL, but if it is we're definitely
+			   clearing this thing. */
+			signalval = default_value;
+		}
+
+		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, signalval, TRUE);
 	}
 
 	return TRUE;
-- 
cgit v1.2.3


From 32f2fccc8b40dc5ccea70acff83a5b6f0302ffea Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:11:48 -0600
Subject: Always check the type even if we don't have a value.

---
 libdbusmenu-glib/menuitem.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index d25e80d..a773755 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1024,22 +1024,21 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	const gchar * type = menuitem_get_type(mi);
 	GVariant * default_value = NULL;
 	if (type != NULL) {
+		/* Check the expected type to see if we want to have a warning */
+		GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+		if (default_type != NULL) {
+			/* If we have an expected type we should check to see if
+			   the value we've been given is of the same type and generate
+			   a warning if it isn't */
+			if (!g_variant_is_of_type(value, default_type)) {
+				g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+			}
+		}
+
 		/* Check the defaults database to see if we have a default
 		   for this property. */
 		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
 		if (default_value != NULL) {
-			/* If we have a default we might also have an expected type */
-			GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
-
-			if (default_type != NULL) {
-				/* If we have an expected type we should check to see if
-				   the value we've been given is of the same type and generate
-				   a warning if it isn't */
-				if (!g_variant_is_of_type(value, default_type)) {
-					g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
-				}
-			}
-
 			/* Now see if we're setting this to the same value as the
 			   default.  If we are then we just want to swallow this variant
 			   and make the function behave like we're clearing it. */
-- 
cgit v1.2.3


From db5438c7f8721ca3b32df9be5b3cd980aebc6784 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:17:29 -0600
Subject: Always replace to ensure we don't leak references.

---
 libdbusmenu-glib/menuitem.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index a773755..2e3b8f0 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1054,13 +1054,18 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	gpointer currentval = g_hash_table_lookup(priv->properties, property);
 
 	if (value != NULL) {
-		gchar * lprop = g_strdup(property);
-		g_variant_ref_sink(value);
-
+		/* NOTE: We're only marking this as replaced if this is true
+		   but we're actually replacing it no matter.  This is so that
+		   the variant passed in sticks around which the caller may
+		   expect.  They shouldn't, but it's low cost to remove bugs. */
 		if (currentval == NULL || !g_variant_equal((GVariant*)currentval, value)) {
-			g_hash_table_replace(priv->properties, lprop, value);
 			replaced = TRUE;
 		}
+
+		gchar * lprop = g_strdup(property);
+		g_variant_ref_sink(value);
+
+		g_hash_table_replace(priv->properties, lprop, value);
 	} else {
 		if (currentval != NULL) {
 			g_hash_table_remove(priv->properties, property);
-- 
cgit v1.2.3


From f1fb82edb2ebcd07af0efbbf7ed98509ae297576 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:19:48 -0600
Subject: If we can't get the value from our database, let's check the
 defaults.

---
 libdbusmenu-glib/menuitem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 2e3b8f0..a3369af 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1133,7 +1133,13 @@ dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * pro
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
-	return (GVariant *)g_hash_table_lookup(priv->properties, property);
+	GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, property);
+
+	if (currentval == NULL) {
+		currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property);
+	}
+
+	return currentval;
 }
 
 /**
-- 
cgit v1.2.3


From 5192d305b96683f10567f961913e74bbe23f6e37 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:22:37 -0600
Subject: The defaults database can, and should, handle NULL types with
 fallbacks.

---
 libdbusmenu-glib/menuitem.c | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index a3369af..862cf63 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1022,31 +1022,29 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
 	const gchar * type = menuitem_get_type(mi);
-	GVariant * default_value = NULL;
-	if (type != NULL) {
-		/* Check the expected type to see if we want to have a warning */
-		GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
-		if (default_type != NULL) {
-			/* If we have an expected type we should check to see if
-			   the value we've been given is of the same type and generate
-			   a warning if it isn't */
-			if (!g_variant_is_of_type(value, default_type)) {
-				g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
-			}
+
+	/* Check the expected type to see if we want to have a warning */
+	GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+	if (default_type != NULL) {
+		/* If we have an expected type we should check to see if
+		   the value we've been given is of the same type and generate
+		   a warning if it isn't */
+		if (!g_variant_is_of_type(value, default_type)) {
+			g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
 		}
+	}
 
-		/* Check the defaults database to see if we have a default
-		   for this property. */
-		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
-		if (default_value != NULL) {
-			/* Now see if we're setting this to the same value as the
-			   default.  If we are then we just want to swallow this variant
-			   and make the function behave like we're clearing it. */
-			if (g_variant_equal(default_value, value)) {
-				g_variant_ref_sink(value);
-				g_variant_unref(value);
-				value = NULL;
-			}
+	/* Check the defaults database to see if we have a default
+	   for this property. */
+	GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+	if (default_value != NULL) {
+		/* Now see if we're setting this to the same value as the
+		   default.  If we are then we just want to swallow this variant
+		   and make the function behave like we're clearing it. */
+		if (g_variant_equal(default_value, value)) {
+			g_variant_ref_sink(value);
+			g_variant_unref(value);
+			value = NULL;
 		}
 	}
 
-- 
cgit v1.2.3


From ac9229802235759397ce6fffc4d89f27be64ad3d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:27:13 -0600
Subject: Fleshing out the check for if a property is a default value.

---
 libdbusmenu-glib/menuitem.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 862cf63..bc2daf5 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1566,10 +1566,23 @@ dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp)
 
 /* Checks to see if the value of this property is unique or just the
    default value. */
-/* TODO: Implement this */
 gboolean
 dbusmenu_menuitem_property_is_default (DbusmenuMenuitem * mi, const gchar * property)
 {
-	/* No defaults system yet */
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, property);
+	if (currentval != NULL) {
+		/* If we're storing it locally, then it shouldn't be a default */
+		return FALSE;
+	}
+
+	currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property);
+	if (currentval != NULL) {
+		return TRUE;
+	}
+
+	g_warn_if_reached();
 	return FALSE;
 }
-- 
cgit v1.2.3


From 75ecaddcbeb02eaa40d11bb8c3f858062a14471b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:41:54 -0600
Subject: Ensure that we check the local db for the type and don't go all
 recursive.

---
 libdbusmenu-glib/menuitem.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index bc2daf5..ee18fab 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -439,7 +439,12 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 static const gchar *
 menuitem_get_type (DbusmenuMenuitem * mi)
 {
-	return dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, DBUSMENU_MENUITEM_PROP_TYPE);
+	if (currentval != NULL) {
+		return g_variant_get_string(currentval, NULL);
+	}
+	return NULL;
 }
 
 /* Public interface */
-- 
cgit v1.2.3


From 47b42d7d4679cab52b6b9871fc15e2fb4d12297a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:51:35 -0600
Subject: Make sure to either ref or allocate

---
 libdbusmenu-glib/defaults.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index 9031d20..3ad5d76 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -170,6 +170,8 @@ dbusmenu_defaults_ref_default (void)
 	if (default_defaults == NULL) {
 		default_defaults = DBUSMENU_DEFAULTS(g_object_new(DBUSMENU_TYPE_DEFAULTS, NULL));
 		g_object_add_weak_pointer(G_OBJECT(default_defaults), (gpointer *)&default_defaults);
+	} else {
+		g_object_ref(default_defaults);
 	}
 
 	return default_defaults;
-- 
cgit v1.2.3