From 9e734f64458bfe04a6aee5e80da9e1ceb9c3e1c9 Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Thu, 4 Feb 2010 12:51:46 -0800
Subject: Removed "revision" attribute from example xml.

---
 libdbusmenu-glib/dbus-menu.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index 121725e..c043ba6 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -151,13 +151,13 @@ License version 3 and version 2.1 along with this program.  If not, see
 			XML syntax:
 
 			@verbatim
-<menu id="1" revision="2"> # Root container
-	<menu id="2" revision="2"> # First level menu, for example "File"
-		<menu id="3" revision="2"/> ~ Second level menu, for example "Open"
-		<menu id="4" revision="3"/>
+<menu id="0"> # Root container
+	<menu id="1"> # First level menu, for example "File"
+		<menu id="2"/> ~ Second level menu, for example "Open"
+		<menu id="3"/>
 		...
 	</menu>
-	<menu id="5" revision="2"> # Another first level menu, say "Edit"
+	<menu id="4"> # Another first level menu, say "Edit"
 		...
 	</menu>
 	...
-- 
cgit v1.2.3


From a58966bc3e59acaf9bc313575fd52efb7ec0306f Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Thu, 4 Feb 2010 15:56:06 -0800
Subject: Added sentence about not sending default values.

---
 libdbusmenu-glib/dbus-menu.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index c043ba6..256a0f2 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -37,6 +37,9 @@ License version 3 and version 2.1 along with this program.  If not, see
 		Items are represented with a unique numeric id and a dictionary of
 		properties.
 
+		To reduce the amount of DBus traffic, a property should only be returned
+		if its value is not the default value.
+
 		Available properties are:
 
 		<table>
-- 
cgit v1.2.3


From 2f159626084dfb8646c07073fc3f07cdc51c6fd7 Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Thu, 4 Feb 2010 15:56:30 -0800
Subject: Minor typos

---
 libdbusmenu-glib/dbus-menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index 256a0f2..9af78fa 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-A library to allow applictions to provide simple indications of
+A library to allow applications to provide simple indications of
 information to be displayed to users of the application through the
 interface shell.
 
@@ -8,7 +8,7 @@ Copyright 2009 Canonical Ltd.
 
 Authors:
     Ted Gould <ted@canonical.com>
-    Aurelien Gateau <ted@canonical.com>
+    Aurélien Gâteau <aurelien.gateau@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:
-- 
cgit v1.2.3


From 8453c34c99dea3ab0742bfb87045b880a723c4f9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 19:30:15 -0800
Subject: Setting the initial id to -1 and then if so, and we get it, find us a
 good one.

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 14bc2db..6739257 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -270,7 +270,7 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 {
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(self);
 
-	priv->id = 0; 
+	priv->id = -1; 
 	priv->children = NULL;
 
 	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_value_free);
@@ -335,6 +335,9 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec)
 
 	switch (id) {
 	case PROP_ID:
+		if (priv->id == -1) {
+			priv->id = menuitem_next_id++;
+		}
 		g_value_set_int(value, priv->id);
 		break;
 	}
-- 
cgit v1.2.3