From aaa4ebbb1825dc423b08dd6801712bc92556de86 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 5 Oct 2009 11:32:19 -0400
Subject: releasing version 0.1.7-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 469f5ab..35d2e85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.1.7-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.1.7-0ubuntu1~ppa1) karmic; urgency=low
 
   * Upstream release 0.1.7
     * Adding the GPL v3 Copying file so that we're all legal.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 05 Oct 2009 11:30:12 -0400
+ -- Ted Gould <ted@ubuntu.com>  Mon, 05 Oct 2009 11:32:05 -0400
 
 libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low
 
-- 
cgit v1.2.3


From b83632a648ef96d295d494c07cf07be5457fd719 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 8 Dec 2009 14:15:23 -0600
Subject: debian/control, debian/libdbusmenu-tools.install: Setting up a
 package for the new dbusmenu-dumper tool.

---
 debian/changelog | 2 ++
 debian/control   | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cd3f68a..23c6972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libdbusmenu (0.2.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Test suite fixes and automation support
     * dbus-dumper tool
     * Switch to org.ayatana
+  * debian/control, debian/libdbusmenu-tools.install: Setting
+    up a package for the new dbusmenu-dumper tool.
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 08 Dec 2009 14:07:44 -0600
 
diff --git a/debian/control b/debian/control
index 69d6adf..7854be9 100644
--- a/debian/control
+++ b/debian/control
@@ -58,3 +58,11 @@ Description: Menus over DBus shared library for GTK
  This package contains files that are needed to build applications.
  .
  This package provides the development files.
+
+Package: libdbusmenu-tools
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libdbusmenu-glib0 (= ${binary:Version})
+Description: Need a better description.
-- 
cgit v1.2.3


From b6323180bf553bfc55b715aec40559937ea89568 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 8 Dec 2009 14:16:38 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23c6972..95800f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa1) karmic; urgency=low
 
   * Updating to trunk
     * Test suite fixes and automation support
@@ -7,7 +7,7 @@ libdbusmenu (0.2.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/control, debian/libdbusmenu-tools.install: Setting
     up a package for the new dbusmenu-dumper tool.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 08 Dec 2009 14:07:44 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 08 Dec 2009 14:16:37 -0600
 
 libdbusmenu (0.1.7-0ubuntu1~ppa1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 3105a84724ca6ddebf4485f96231781f0f43ca73 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Dec 2009 12:55:11 -0600
Subject: releasing version 0.1.8-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d71d91a..b0457b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.1.8-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.1.8-0ubuntu1~ppa1) karmic; urgency=low
 
   * Upstream release 0.1.8
     * Changing the name to org.ayatana
     * Underline fixes
     * Documenation of the DBus API 
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 12:53:12 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 12:55:07 -0600
 
 libdbusmenu (0.1.7-0ubuntu1~ppa1) karmic; urgency=low
 
-- 
cgit v1.2.3


From a7edc933259ba5f3352496bd7f1a09d856ec39b4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Dec 2009 13:03:44 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04d99af..4f02263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa2) karmic; urgency=low
 
   * Updating to trunk
     * Adding underline support
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 13:01:58 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 13:03:41 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 0a726c0bf8c601fd6f3d6a60cdb31d665f6275d7 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 10 Dec 2009 14:17:45 -0500
Subject: set version string

---
 debian/changelog | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0457b7..e0ca277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,12 @@
-libdbusmenu (0.1.8-0ubuntu1~ppa1) karmic; urgency=low
+libdbusmenu (0.1.8-0ubuntu1) karmic; urgency=low
 
   * Upstream release 0.1.8
     * Changing the name to org.ayatana
     * Underline fixes
     * Documenation of the DBus API 
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 12:55:07 -0600
-
-libdbusmenu (0.1.7-0ubuntu1~ppa1) karmic; urgency=low
-
-  * Upstream release 0.1.7
     * Adding the GPL v3 Copying file so that we're all legal.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 05 Oct 2009 11:32:05 -0400
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 12:55:07 -0600
 
 libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 0ab4e0cd4974e8f2a963b16f9abed2bd6c7eac12 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 10 Dec 2009 14:23:37 -0500
Subject: set release to lucid

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e0ca277..d692ece 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.1.8-0ubuntu1) karmic; urgency=low
+libdbusmenu (0.1.8-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.1.8
     * Changing the name to org.ayatana
-- 
cgit v1.2.3


From 49ae07290d8fb13ec4adae36759b0e0a94d1ea82 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 12:13:12 -0600
Subject: Somehow I messed up the merge and lost the version change.  Oops.

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3b19cea..e2bc1a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.1.7, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.1.8, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.1.7)
+AM_INIT_AUTOMAKE(libdbusmenu, 0.1.8)
 
 AM_MAINTAINER_MODE
 
@@ -66,7 +66,7 @@ AC_SUBST(DBUSMENUTESTS_LIBS)
 ###########################
 
 LIBDBUSMENU_CURRENT=0
-LIBDBUSMENU_REVISION=7
+LIBDBUSMENU_REVISION=8
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
-- 
cgit v1.2.3


From 85842906707111c8e0869956f4fd29327de9a0a6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 14:30:21 -0600
Subject: debian/control: Mentioning nicely that this will cause
 indicator-messages << 0.3 and indicator-session << 0.2 to break.

---
 debian/changelog | 3 +++
 debian/control   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 370acaa..1e6f70e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ libdbusmenu (0.2.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low
 
   * Updating trunk
     * Changing API to be V0.2 for reals
+  * debian/control: Mentioning nicely that this will cause
+    indicator-messages << 0.3 and indicator-session << 0.2 to
+    break.
 
  -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 13:21:40 -0600
 
diff --git a/debian/control b/debian/control
index 7854be9..c392b34 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: indicator-messages (<< 0.3.0),
+        indicator-session (<< 0.2.0)
 Description: Menus over DBus shared library for glib
  This package contains shared libraries to be used by applications.
 
-- 
cgit v1.2.3


From 5f76cf3fe29f1392172b51cf64e572a984bc396f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 14:31:47 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e6f70e..0aead8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa3) karmic; urgency=low
 
   * Updating trunk
     * Changing API to be V0.2 for reals
@@ -6,7 +6,7 @@ libdbusmenu (0.2.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low
     indicator-messages << 0.3 and indicator-session << 0.2 to
     break.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 13:21:40 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 14:31:45 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa2) karmic; urgency=low
 
-- 
cgit v1.2.3


From 69be0c929a75c877ffa89703e8e3ab4f3b8919e1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 15:31:12 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9435122..0bc0579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa4) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa4) karmic; urgency=low
 
   * Updating trunk
     * Setting version numbers
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 15:22:57 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 15:31:08 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa3) karmic; urgency=low
 
-- 
cgit v1.2.3


From 995a27ae56fb63ec7835090e6264b3e489e38b64 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 21:18:19 -0600
Subject: debian/control: Switching the breaks to be ~dev as those versions are
 not yet released.

---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bc0579..e8026b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low
+
+  * debian/control: Switching the breaks to be ~dev as those
+    versions are not yet released.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 21:17:31 -0600
+
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa4) karmic; urgency=low
 
   * Updating trunk
diff --git a/debian/control b/debian/control
index c392b34..7e307d3 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: indicator-messages (<< 0.3.0),
-        indicator-session (<< 0.2.0)
+Breaks: indicator-messages (<< 0.3.0~dev),
+        indicator-session (<< 0.2.0~dev)
 Description: Menus over DBus shared library for glib
  This package contains shared libraries to be used by applications.
 
-- 
cgit v1.2.3


From e930f7d167fe1e5a889be0fd7e1ed0b625773fe4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 21:21:15 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8026b0..b4593ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa5) karmic; urgency=low
 
   * debian/control: Switching the breaks to be ~dev as those
     versions are not yet released.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 21:17:31 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 21:21:12 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa4) karmic; urgency=low
 
-- 
cgit v1.2.3


From 1088cbfdb3cfd67ee3dfe048c7b0879d6f83a8d9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 22:04:00 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08f8b96..83f9a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix1) karmic; urgency=low
 
   * Upstream
     * Fixing the signal prototypes.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 21:59:03 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 22:03:56 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa5) karmic; urgency=low
 
-- 
cgit v1.2.3


From 13a19ef39002664d91cabfea8bfe0cb3ad01d61e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 22:10:47 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93e5787..09f5c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix1) karmic; urgency=low
 
   * Trying again
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 22:09:20 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 22:10:45 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 5217f7324cedb09aba9fab35c348c3191279a90e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 22:11:07 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix2

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 09f5c79..b1308ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix1) karmic; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix2) karmic; urgency=low
 
   * Trying again
 
-- 
cgit v1.2.3


From 9676ac55e84b21bf1318925bceb3b3135e07403c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 22:20:10 -0600
Subject: debian/rules: Massive debugging

---
 debian/changelog | 6 ++++++
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b1308ae..41dc81e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix3) UNRELEASED; urgency=low
+
+  * debian/rules: Massive debugging
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 22:19:52 -0600
+
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix2) karmic; urgency=low
 
   * Trying again
diff --git a/debian/rules b/debian/rules
index 7f7f405..ebcbf31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-massivedebugging
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.1.2)'
-- 
cgit v1.2.3


From ac0fbaf02100ff196bef3d97db162a4f01d58d58 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Dec 2009 22:21:46 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41dc81e..4621c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix3) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix3) karmic; urgency=low
 
   * debian/rules: Massive debugging
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 22:19:52 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 18 Dec 2009 22:21:44 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix2) karmic; urgency=low
 
-- 
cgit v1.2.3


From e32d593cf3457b68a1f05a5ece4aafd5a5918033 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 16:20:44 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab376d2..174aae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix4) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix4) karmic; urgency=low
 
   * Using a hash table replace
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Dec 2009 16:16:45 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Dec 2009 16:20:42 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix3) karmic; urgency=low
 
-- 
cgit v1.2.3


From f7a7a21c1f4365aa9857f20e420161f3df51c5af Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 21:22:37 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e51ca9..cb7d187 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix5) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix5) karmic; urgency=low
 
   * string to value fix
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Dec 2009 21:19:11 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Dec 2009 21:22:35 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix4) karmic; urgency=low
 
-- 
cgit v1.2.3


From 6fc4626f2267b38752bb0f8f09fdae21dd25e28a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 21:57:26 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67b39ca..15bc87f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix6) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix6) karmic; urgency=low
 
   * Signal change
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Dec 2009 21:52:10 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Dec 2009 21:57:24 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix5) karmic; urgency=low
 
-- 
cgit v1.2.3


From fe1a34466dc13f83d43f2326e9f1790f83eb83fd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Dec 2009 08:10:10 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6~sigfix7

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70df135..f7a8e50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix7) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix7) karmic; urgency=low
 
   * Nope, bad idea.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Dec 2009 08:01:39 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Dec 2009 08:10:08 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6~sigfix6) karmic; urgency=low
 
-- 
cgit v1.2.3


From 54afa3eb635e04792bae66938ce838daffc821dd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Dec 2009 14:40:23 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c8483b..3be6753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa6) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa6) karmic; urgency=low
 
   * Fixing the handling of typed properties, especially bools.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Dec 2009 14:38:00 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Dec 2009 14:40:21 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa5) karmic; urgency=low
 
-- 
cgit v1.2.3


From 7f60e7bc2dbe55b1234702028e4b509b70b404bb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 6 Jan 2010 22:17:19 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa7

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c37372..ae1ccbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa7) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa7) karmic; urgency=low
 
   * Upstream update:
     * Adding GetChildren function for getting a single submenu
     * Test suite fixes
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 22:14:49 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 22:17:16 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa6) karmic; urgency=low
 
-- 
cgit v1.2.3


From 0462b27759eee1bc0b022c5f4b270383c66b9f8a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 6 Jan 2010 22:23:22 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa8~light1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cab0e5..270b67b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light1) karmic; urgency=low
 
   * Upstream update:
     * Starting to watch DBus if the proxy builds fail.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 22:21:28 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 22:23:20 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa7) karmic; urgency=low
 
-- 
cgit v1.2.3


From dcef2a18df12bc88b893541bd63f2f8fa7ce3b6a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 6 Jan 2010 22:42:10 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa8~light2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f19608b..fc8d9b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light2) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light2) karmic; urgency=low
 
   * Upstream update:
     * Looking at the dbus name
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 22:37:07 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 22:42:07 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 376a22af7dc52b6f53b1bd543ea8af9a3add277f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 6 Jan 2010 23:19:47 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa8~light3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 785fe75..40ca049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light3) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light3) karmic; urgency=low
 
   * Upstream update:
     * Debug message
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 23:18:22 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 23:19:43 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light2) karmic; urgency=low
 
-- 
cgit v1.2.3


From a8948b9cdcaf3b26f3e8cd9e52778cd868257563 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 6 Jan 2010 23:25:21 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa8~light4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 779b921..5994a47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light4) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light4) karmic; urgency=low
 
   * Upstream update:
     * Look for NULL strings instead of NULL pointers
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 23:23:29 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 23:25:17 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light3) karmic; urgency=low
 
-- 
cgit v1.2.3


From 7fd90c39f2868b1ab893d3c3f3183e3e87e683e0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 6 Jan 2010 23:29:30 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa8~light5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4813688..323f427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light5) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light5) karmic; urgency=low
 
   * Upstream update:
     * Remove debug message
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 23:28:02 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 23:29:28 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light4) karmic; urgency=low
 
-- 
cgit v1.2.3


From f893a123a4b2ead16b29769df107478bac53a3da Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Jan 2010 10:54:24 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa8

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73ec9ac..e58c6d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa8) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa8) karmic; urgency=low
 
   * Upstream update:
     * Starting to watch DBus if the proxy builds fail.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 07 Jan 2010 10:47:12 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 07 Jan 2010 10:54:21 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa7) karmic; urgency=low
 
-- 
cgit v1.2.3


From 21f78865519b7c2c30255490e3d1004f79d76391 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Jan 2010 11:03:19 -0600
Subject: releasing version 0.2.0~dev-0ubuntu1~ppa9

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de8aba4..943cb0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.0~dev-0ubuntu1~ppa9) UNRELEASED; urgency=low
+libdbusmenu (0.2.0~dev-0ubuntu1~ppa9) karmic; urgency=low
 
   * Upstream update:
     * Fixing the consistency between the #defines and what
       was used in the code.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 07 Jan 2010 11:01:21 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 07 Jan 2010 11:03:16 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa8) karmic; urgency=low
 
-- 
cgit v1.2.3


From 214b29a5e3a400b8180bca7f079fbc89ab683644 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 8 Jan 2010 08:43:03 -0600
Subject: releasing version 0.2.0-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ac0343..0d39943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu1~ppa1) karmic; urgency=low
 
   * Upstream official 0.2.0
     * Remove unused libdbusmenu-qt
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 08 Jan 2010 08:40:50 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 08 Jan 2010 08:42:59 -0600
 
 libdbusmenu (0.2.0~dev-0ubuntu1~ppa9) karmic; urgency=low
 
-- 
cgit v1.2.3


From f3de0ef8eff09e02c81d86d0ce2c0912070c2af9 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Sat, 9 Jan 2010 09:09:31 -0500
Subject: * Added debian/libdbusmenu-tools.install * debian/control   -
 improved description for libdbusmenu-tools

---
 debian/changelog                 | 8 ++++++++
 debian/control                   | 5 ++++-
 debian/libdbusmenu-tools.install | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 debian/libdbusmenu-tools.install

diff --git a/debian/changelog b/debian/changelog
index 51362d2..4ed07a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low
+
+  * Added debian/libdbusmenu-tools.install
+  * debian/control
+    - improved description for libdbusmenu-tools
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Sat, 09 Jan 2010 09:05:47 -0500
+
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.0
diff --git a/debian/control b/debian/control
index c392b34..80f22f6 100644
--- a/debian/control
+++ b/debian/control
@@ -67,4 +67,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libdbusmenu-glib0 (= ${binary:Version})
-Description: Need a better description.
+Description: Tools useful during development with libdbusmenu
+ .
+ This package contains tools that are useful when building applications.
+
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
new file mode 100644
index 0000000..9f680c7
--- /dev/null
+++ b/debian/libdbusmenu-tools.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu/dbusmenu-dumper 
-- 
cgit v1.2.3


From 2740c7221e5cc93cbb821f35b606a6cbe805f83f Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 11 Jan 2010 16:11:40 +0100
Subject: * debian/rules:   - updated shlibs version

---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ed07a6..b54aca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low
+
+  * debian/rules:
+    - updated shlibs version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 11 Jan 2010 16:04:11 +0100
+
 libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low
 
   * Added debian/libdbusmenu-tools.install
diff --git a/debian/rules b/debian/rules
index 7f7f405..0611a62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.1.2)'
-
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.2)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib0 += -V 'libdbusmenu-glib0 (>= 0.2)'
 
-- 
cgit v1.2.3


From d670a52dd5214eda4d821c512774b4bca66eaa2b Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 11 Jan 2010 16:12:27 +0100
Subject: releasing version 0.2.0-0ubuntu3

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b54aca2..074d225 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low
 
   * debian/rules:
-    - updated shlibs version
+    - updated shlibs version (lp: #505258)
 
  -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 11 Jan 2010 16:04:11 +0100
 
-- 
cgit v1.2.3


From 95c320b4d0c411737d0298914498916cca01f553 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 11 Jan 2010 11:42:17 -0600
Subject: releasing version 0.2.0-0ubuntu2~ppa1~ltr1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13b186e..870b7d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr1) karmic; urgency=low
 
   * Upstream update
     * Adding in checking for icon name plus 'ltr' to see if
       it exists.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 11:32:38 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 11:42:14 -0600
 
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 1d4ff3da8619fff92db43d49bb3faaabb522205c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 11 Jan 2010 12:50:13 -0600
Subject: releasing version 0.2.0-0ubuntu2~ppa1~ltr2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81fae7d..830beeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr2) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr2) karmic; urgency=low
 
   * Upstream update
     * Setting direction based on parent widget text direction.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 12:46:46 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 12:50:10 -0600
 
 libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 7aeec5eb6310fbdda531d038b00b0a6f9d7a2185 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 11 Jan 2010 13:12:52 -0600
Subject: releasing version 0.2.0-0ubuntu2~ppa1~padding1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 848b422..01cc962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0-0ubuntu2~ppa1~padding1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu2~ppa1~padding1) karmic; urgency=low
 
   * Upstream update
     * Adding padding between the icon and the label.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 13:11:11 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 13:12:49 -0600
 
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From a7f456c679c535378d26033a810e82e019ec36b1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 11 Jan 2010 23:53:54 -0600
Subject: releasing version 0.2.0-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a896191..3596aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu2~ppa1) karmic; urgency=low
 
   * Upstream update
     * Adding padding between the icon and the label.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 23:51:45 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 23:53:51 -0600
 
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From f2ad57086a3e1438f65f3cd09a3f363731d4a953 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 11 Jan 2010 23:57:26 -0600
Subject: releasing version 0.2.0-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6124987..ea15e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu2~ppa2) karmic; urgency=low
 
   * Upstream update
     * Setting direction based on parent widget text direction.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 23:55:43 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 11 Jan 2010 23:57:24 -0600
 
 libdbusmenu (0.2.0-0ubuntu2~ppa1) karmic; urgency=low
 
-- 
cgit v1.2.3


From 824afdb35f165d4421cf60b080800c8d0e361db4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 12 Jan 2010 08:25:40 -0600
Subject: releasing version 0.2.0-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c202229..4020dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.0-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.2.0-0ubuntu2~ppa3) karmic; urgency=low
 
   * Upstream update
     * Not deleting images that we're still using.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jan 2010 08:23:55 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jan 2010 08:25:38 -0600
 
 libdbusmenu (0.2.0-0ubuntu2~ppa2) karmic; urgency=low
 
-- 
cgit v1.2.3


From f0f7c07acb1c0ec580ca507028f4b8574bbf40b5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 12 Jan 2010 08:46:12 -0600
Subject: releasing version 0.2.1-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c41f10..3f1bea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.1-0ubuntu1~ppa1) karmic; urgency=low
 
   * Upstream release 0.2.1
     * Not deleting images that we're still using.
     * Adding padding between the icon and the label.
     * Setting direction based on parent widget text direction.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jan 2010 08:43:02 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jan 2010 08:46:10 -0600
 
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 7a6c1e96ed3bd910ed0e4db7e0f0bf094f13f0d0 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 12 Jan 2010 11:16:04 -0500
Subject: * Upstream release 0.2.1   - Fix to not destroy the image if we're
 still using it.   - Adding code to support icon names that have an implied
 direction in them.   - Fix to put a small amount of padding between the icon
 and the label.

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 074d225..db9be55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.2.1
+    - Fix to not destroy the image if we're still using it.
+    - Adding code to support icon names that have an implied direction in them.
+    - Fix to put a small amount of padding between the icon and the label.
+
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 12 Jan 2010 11:03:39 -0500
+
 libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low
 
   * debian/rules:
-- 
cgit v1.2.3


From 3ebb5c0a4f9066c4b04bdcfb55a499370ab4237b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 11:21:03 -0800
Subject: releasing version 0.2.1-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed66db2..70fc772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.1-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.1-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Interoperability fixes
     * Adding timestamps to events
     * Better handling of XML
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 11:19:08 -0800
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 11:21:01 -0800
 
 libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From c0cf95e78a6f7ac0cbae47902f9eb3607099872b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 12:17:02 -0800
Subject: debian/libdbusmenu-tools.install: Adding a wildcard to get all of the
 tools in libexec

---
 debian/changelog                 | 2 ++
 debian/libdbusmenu-tools.install | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 221d219..d2fcea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libdbusmenu (0.2.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Adding timestamps to events
     * Better handling of XML
     * Adding tools for timing dbusmenu
+  * debian/libdbusmenu-tools.install: Adding a wildcard to get
+    all of the tools in libexec
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 12:14:58 -0800
 
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
index 9f680c7..8a66314 100644
--- a/debian/libdbusmenu-tools.install
+++ b/debian/libdbusmenu-tools.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libdbusmenu/dbusmenu-dumper 
+debian/tmp/usr/lib/libdbusmenu/dbusmenu-*
-- 
cgit v1.2.3


From 6bed6531192b318cfcf4281662491521b95b68f6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 12:18:34 -0800
Subject: releasing version 0.2.2-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2fcea6..4c9b347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.2-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream Release 0.2.2
     * Interoperability fixes
@@ -8,7 +8,7 @@ libdbusmenu (0.2.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/libdbusmenu-tools.install: Adding a wildcard to get
     all of the tools in libexec
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 12:14:58 -0800
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 12:18:26 -0800
 
 libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 391b595afecea47fb36295c33cddaa6f5fbb0d4a Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Thu, 4 Feb 2010 14:19:05 -0800
Subject: releasing version 0.2.2-0ubuntu2

---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f69ee88..c1b1382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low
+
+  * debian/control: fix a typo in the tools depends
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 04 Feb 2010 14:18:47 -0800
+
 libdbusmenu (0.2.2-0ubuntu1) lucid; urgency=low
 
   * Updated for the soname changes
diff --git a/debian/control b/debian/control
index c27756a..c4e4f3e 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Section: devel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-glib0 (= ${binary:Version})
+         libdbusmenu-glib1 (= ${binary:Version})
 Description: Tools useful during development with libdbusmenu
  .
  This package contains tools that are useful when building applications.
-- 
cgit v1.2.3


From 730e7609ef6042130f945f8ac43a8220171fee37 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Thu, 4 Feb 2010 18:12:21 -0800
Subject: releasing version 0.2.2-0ubuntu3

---
 debian/changelog | 8 ++++++++
 debian/control   | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c1b1382..1bdf8ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low
+
+  * debian/control: 
+    - let libdbusmenu-glib1 breaks libdbusmenu-glib0 since they are create
+      issues at runtime if both got loaded
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 04 Feb 2010 18:10:56 -0800
+
 libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low
 
   * debian/control: fix a typo in the tools depends
diff --git a/debian/control b/debian/control
index c4e4f3e..561429f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Breaks: indicator-messages (<< 0.3.0),
-        indicator-session (<< 0.2.0)
+        indicator-session (<< 0.2.0),
+        libdbusmenu-glib0
 Description: Menus over DBus shared library for glib
  This package contains shared libraries to be used by applications.
 
-- 
cgit v1.2.3


From ae4d9385b9cd076ad0fbadfbef5e8d603c1d102f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 19:34:20 -0800
Subject: releasing version 0.2.2-0ubuntu1~ppa2~autoid1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4663ee6..d0401dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid1) UNRELEASED; urgency=low
+libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid1) lucid; urgency=low
 
   * Upstream Merge
     * Auto handle ids even for subclasses
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 19:32:34 -0800
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 19:34:18 -0800
 
 libdbusmenu (0.2.2-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 103580a46bcffaae27e8dafc6cf943ad465cb2fa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 19:58:04 -0800
Subject: releasing version 0.2.2-0ubuntu1~ppa2~autoid2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8621528..078450f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid2) UNRELEASED; urgency=low
+libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid2) lucid; urgency=low
 
   * Upstream Merge
     * Menuitem ID handling properly.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 19:55:16 -0800
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 19:58:02 -0800
 
 libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid1) lucid; urgency=low
 
-- 
cgit v1.2.3


From fc35f16de9710c7aa59d3acf88eaa7c215838e36 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 23:31:45 -0800
Subject: releasing version 0.2.2-0ubuntu1~ppa2~autoid3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b42273..7fb6877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid3) UNRELEASED; urgency=low
+libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid3) lucid; urgency=low
 
   * Upstrem Merge
     * Fixing the range nd default.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 23:29:52 -0800
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 23:31:36 -0800
 
 libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid2) lucid; urgency=low
 
-- 
cgit v1.2.3


From a3b8e468f351cc487dfe930b95b0dafbbed7bc26 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 5 Feb 2010 11:07:47 -0800
Subject: libdbusmenu-tools.install: Add in json file and README so that
 they're put in the right directories.

---
 debian/changelog                 | 2 ++
 debian/libdbusmenu-tools.install | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b4436f4..ca8e8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libdbusmenu (0.2.2-0ubuntu3~ppa1) UNRELEASED; urgency=low
     * Fixing handing of root IDs being zero
     * Handling syncing of properties when reusing items
     * Shipping new JSON files and READMEs for testing.
+  * libdbusmenu-tools.install: Add in json file and README so
+    that they're put in the right directories.
 
  -- Ted Gould <ted@ubuntu.com>  Fri, 05 Feb 2010 10:59:02 -0800
 
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
index 8a66314..4bdf013 100644
--- a/debian/libdbusmenu-tools.install
+++ b/debian/libdbusmenu-tools.install
@@ -1 +1,3 @@
 debian/tmp/usr/lib/libdbusmenu/dbusmenu-*
+debian/tmp/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
+debian/tmp/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
-- 
cgit v1.2.3


From 32432e687018659c59b69afed1c6567788134637 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 5 Feb 2010 11:09:25 -0800
Subject: releasing version 0.2.2-0ubuntu3~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca8e8a8..32b7a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.2-0ubuntu3~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.2-0ubuntu3~ppa1) lucid; urgency=low
 
   * Upstrem Merge
     * Fixing handing of root IDs being zero
@@ -7,7 +7,7 @@ libdbusmenu (0.2.2-0ubuntu3~ppa1) UNRELEASED; urgency=low
   * libdbusmenu-tools.install: Add in json file and README so
     that they're put in the right directories.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 05 Feb 2010 10:59:02 -0800
+ -- Ted Gould <ted@ubuntu.com>  Fri, 05 Feb 2010 11:09:22 -0800
 
 libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low
 
-- 
cgit v1.2.3


From e8ac2fcb6cd946e90e873970976f6ae64354947c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 5 Feb 2010 11:25:00 -0800
Subject: releasing version 0.2.3-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d251871..6e8f49e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream release 0.2.3
     * Fixing handing of root IDs being zero
@@ -7,7 +7,7 @@ libdbusmenu (0.2.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * libdbusmenu-tools.install: Add in json file and README so
     that they're put in the right directories.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 05 Feb 2010 11:19:22 -0800
+ -- Ted Gould <ted@ubuntu.com>  Fri, 05 Feb 2010 11:24:58 -0800
 
 libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low
 
-- 
cgit v1.2.3


From ba5b0697ef6bc15161b2d05beb8cd664c9e543ea Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 12:28:23 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2126d83..f3edffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) lucid; urgency=low
 
   * Upstream Merge
     * Making sure to unref the old item in all cases.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 12:25:56 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 12:28:21 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From b7c84897cf0404bb42a6924ec69bdd15d2e4ed19 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 13:53:42 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2b6309..d2c076e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) lucid; urgency=low
 
   * Upstream Merge
     * Debugging message
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 13:50:32 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 13:53:40 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 95da331be05c5da867a885719aa844d1e9e34ccc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 14:43:06 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d571f67..db8c8cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) lucid; urgency=low
 
   * Upstream Merge
     * Debugging message
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 14:28:48 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 14:43:04 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) lucid; urgency=low
 
-- 
cgit v1.2.3


From fdb8fd92150e09cf3d30c4d41e5610ee1e9bd8d7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 15:36:51 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d614bb9..376220a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat4) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat4) lucid; urgency=low
 
   * Upstream Merge
     * Debugging message
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 15:32:46 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 15:36:49 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) lucid; urgency=low
 
-- 
cgit v1.2.3


From 7cbb892373e78a26a7c50d535b97c444139b5942 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 15:50:02 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0cb68f..7f663eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) lucid; urgency=low
 
   * Upstream Merge
     * Debugging message
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 15:48:33 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 15:49:58 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat4) lucid; urgency=low
 
-- 
cgit v1.2.3


From 8f6dbb970e761517fb32760e81a4759c2aeb307c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 15:55:55 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f456d97..d780f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) lucid; urgency=low
 
   * Upstream Merge
     * Removing the ref to root and a setting of root
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 15:53:42 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 15:55:53 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) lucid; urgency=low
 
-- 
cgit v1.2.3


From b50e7c722403caae5e40157b1b70a7a6ac8a206f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 8 Feb 2010 16:04:15 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat7

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88ad187..2e8ff63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat7) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat7) lucid; urgency=low
 
   * Upstream Merge
     * Removing debug messages
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 16:02:40 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 16:04:12 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) lucid; urgency=low
 
-- 
cgit v1.2.3


From ba028f8b4889fe56863065cbcbb8284c36517913 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 9 Feb 2010 08:53:03 -0600
Subject: releasing version 0.2.3-0ubuntu1~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb93c12..062ab19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.3-0ubuntu1~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.3-0ubuntu1~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * Removing the ref to root and a setting of root
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 09 Feb 2010 08:49:16 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 09 Feb 2010 08:53:00 -0600
 
 libdbusmenu (0.2.3-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 74052e601e19a2ce169ddd8529874f85497c909c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 11 Feb 2010 10:13:58 -0600
Subject: releasing version 0.2.4-0ubuntu1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c860120..675a934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.4-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.4
     * Remove uneccessary reference to stop duplication of menus
     * Handle dbus method errors better
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 11 Feb 2010 10:08:17 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 11 Feb 2010 10:13:56 -0600
 
 libdbusmenu (0.2.3-0ubuntu3) lucid; urgency=low
 
-- 
cgit v1.2.3


From 9fbb722bd51a16edc090b46350474c7b6f3a5ed5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Feb 2010 14:30:08 -0600
Subject: releasing version 0.2.4-0ubuntu2~ppa1~proxy1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84bcd4c..aa97ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.4-0ubuntu2~ppa1~proxy1) UNRELEASED; urgency=low
+libdbusmenu (0.2.4-0ubuntu2~ppa1~proxy1) lucid; urgency=low
 
   * Upstream Merge
     * Adding in menuitem proxy object.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 17 Feb 2010 14:28:16 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 17 Feb 2010 14:30:04 -0600
 
 libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From c1ab2f992a08d7ab9a34db1c9b6fb1136e4af7e4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Feb 2010 10:52:19 -0600
Subject: releasing version 0.2.4-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb68bab..dce6776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.4-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.4-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream merge
     * Adding ID to default <menu> item.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 10:50:40 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 10:52:16 -0600
 
 libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From fef1fc6bdf52b46d1ef85a78fe24f71e853eed3b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Feb 2010 10:54:18 -0600
Subject: releasing version 0.2.4-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fd03c2..83ddaf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.4-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.4-0ubuntu2~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * Adding in menuitem proxy object.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 10:53:20 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 10:54:14 -0600
 
 libdbusmenu (0.2.4-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 3a8693e2b3bdaaac979eadca296cb44257e6f882 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Feb 2010 10:57:45 -0600
Subject: debian/rules: Updating shlibs

---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b4a7fe..456bc85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdbusmenu (0.2.5-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * Upstream release 0.2.5
     * Adding in menuitem proxy object.
     * Adding ID to default <menu> item.
+  * debian/rules: Updating shlibs
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 10:54:24 -0600
 
diff --git a/debian/rules b/debian/rules
index cc20837..07187d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.2)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.2)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.5)'
 
-- 
cgit v1.2.3


From 4ee1fccc17c4734c356ee528dd3a0665f5e296f0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Feb 2010 11:00:29 -0600
Subject: releasing version 0.2.5-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 456bc85..0cbfe5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.5-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.5-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream release 0.2.5
     * Adding in menuitem proxy object.
     * Adding ID to default <menu> item.
   * debian/rules: Updating shlibs
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 10:54:24 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 11:00:24 -0600
 
 libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 688b1c13a36bf5c0dcc885000b7cec42e043bf24 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 25 Feb 2010 10:23:52 -0600
Subject: releasing version 0.2.6-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7a0aa1..038d7b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream release 0.2.6
     * Fix testing to make it more reliable
     * Remove delayed property queueing as it was causing
       properties to not get updated.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 25 Feb 2010 10:20:14 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Feb 2010 10:23:49 -0600
 
 libdbusmenu (0.2.5-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 9d30df280c0f9ea924891ff9546a9f2743a79eb8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 14:46:01 -0600
Subject: debian/control, debian/gir1.0-dbusmenu-glib-0.2.install,
 gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold the typelib
 files generated by GObject introspection.

---
 debian/changelog                        |  3 +++
 debian/control                          | 12 ++++++++++++
 debian/gir1.0-dbusmenu-glib-0.2.install |  1 +
 debian/gir1.0-dbusmenu-gtk-0.2.install  |  1 +
 4 files changed, 17 insertions(+)
 create mode 100644 debian/gir1.0-dbusmenu-glib-0.2.install
 create mode 100644 debian/gir1.0-dbusmenu-gtk-0.2.install

diff --git a/debian/changelog b/debian/changelog
index 2a55e3a..107b9d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Adding in building of the GObject Introspection details
+  * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install,
+    gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold
+    the typelib files generated by GObject introspection.
 
  -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 14:35:59 -0600
 
diff --git a/debian/control b/debian/control
index 561429f..8e72167 100644
--- a/debian/control
+++ b/debian/control
@@ -72,3 +72,15 @@ Description: Tools useful during development with libdbusmenu
  .
  This package contains tools that are useful when building applications.
 
+Package: gir1.0-dbusmenu-glib-0.2
+Section: libs
+Architecture: any
+Depends: libdbusmenu-glib1 (= ${binary:Version})
+Description: Typelib file for libdbusmenu-glib1
+
+Package: gir1.0-dbusmenu-gtk-0.2
+Section: libs
+Architecture: any
+Depends: libdbusmenu-gtk1 (= ${binary:Version})
+Description: Typelib file for libdbusmenu-gtk1
+
diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install
new file mode 100644
index 0000000..a6c4fd0
--- /dev/null
+++ b/debian/gir1.0-dbusmenu-glib-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGlib-0.2.typelib
diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install
new file mode 100644
index 0000000..829a344
--- /dev/null
+++ b/debian/gir1.0-dbusmenu-gtk-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib
-- 
cgit v1.2.3


From fd15b2518b038e31c95f0ecad8f8331d3cba3914 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 14:52:48 -0600
Subject: debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold
 the typelib files generated by GObject introspection. * debian/control:
 Adding in build dependencies for GIR dev

---
 debian/changelog |  5 +++--
 debian/control   | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 107b9d8..91938b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low
   * Upstream Merge
     * Adding in building of the GObject Introspection details
   * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install,
-    gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold
-    the typelib files generated by GObject introspection.
+    debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to
+    hold the typelib files generated by GObject introspection.
+  * debian/control: Adding in build dependencies for GIR dev
 
  -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 14:35:59 -0600
 
diff --git a/debian/control b/debian/control
index 8e72167..5575fb9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0),
                libtool,
                intltool,
                libxml2-dev,
-               libjson-glib-dev
+               libjson-glib-dev,
+               libgirepository1.0-dev
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/libdbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
@@ -75,12 +76,15 @@ Description: Tools useful during development with libdbusmenu
 Package: gir1.0-dbusmenu-glib-0.2
 Section: libs
 Architecture: any
-Depends: libdbusmenu-glib1 (= ${binary:Version})
+Depends: libdbusmenu-glib1 (= ${binary:Version}),
+         gir1.0-glib-2.0
 Description: Typelib file for libdbusmenu-glib1
 
 Package: gir1.0-dbusmenu-gtk-0.2
 Section: libs
 Architecture: any
-Depends: libdbusmenu-gtk1 (= ${binary:Version})
+Depends: libdbusmenu-gtk1 (= ${binary:Version}),
+         gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
+         gir1.0-gtk-2.0
 Description: Typelib file for libdbusmenu-gtk1
 
-- 
cgit v1.2.3


From 219065ec232985727a201fd1eac7cfd42ea72d22 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 14:58:31 -0600
Subject: Fixing deps

---
 debian/control | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 5575fb9..10a0d82 100644
--- a/debian/control
+++ b/debian/control
@@ -76,14 +76,16 @@ Description: Tools useful during development with libdbusmenu
 Package: gir1.0-dbusmenu-glib-0.2
 Section: libs
 Architecture: any
-Depends: libdbusmenu-glib1 (= ${binary:Version}),
+Depends: ${misc:Depends},
+         libdbusmenu-glib1 (= ${binary:Version}),
          gir1.0-glib-2.0
 Description: Typelib file for libdbusmenu-glib1
 
 Package: gir1.0-dbusmenu-gtk-0.2
 Section: libs
 Architecture: any
-Depends: libdbusmenu-gtk1 (= ${binary:Version}),
+Depends: ${misc:Depends},
+         libdbusmenu-gtk1 (= ${binary:Version}),
          gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
          gir1.0-gtk-2.0
 Description: Typelib file for libdbusmenu-gtk1
-- 
cgit v1.2.3


From ee337328f1addebce24029d8416c4fc8de6ddf83 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 14:58:49 -0600
Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91938b0..7700b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low
 
   * Upstream Merge
     * Adding in building of the GObject Introspection details
@@ -7,7 +7,7 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low
     hold the typelib files generated by GObject introspection.
   * debian/control: Adding in build dependencies for GIR dev
 
- -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 14:35:59 -0600
+ -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 14:58:45 -0600
 
 libdbusmenu (0.2.6-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 0f771fe8f7985930d4935de3208207f06a4aa78f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 20:30:21 -0600
Subject: debian/control: Adding in gir's as build dependencies.

---
 debian/changelog | 6 ++++++
 debian/control   | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7700b4f..7b90555 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) UNRELEASED; urgency=low
+
+  * debian/control: Adding in gir's as build dependencies.
+
+ -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 20:29:56 -0600
+
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low
 
   * Upstream Merge
diff --git a/debian/control b/debian/control
index 10a0d82..ebd3ca9 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 5.0),
                intltool,
                libxml2-dev,
                libjson-glib-dev,
-               libgirepository1.0-dev
+               libgirepository1.0-dev,
+               gir1.0-glib-2.0,
+               gir1.0-gtk-2.0
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/libdbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
-- 
cgit v1.2.3


From 9fdaca202c2ad5188f42893a7a058493afea28f9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 20:30:31 -0600
Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b90555..0dcd128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low
 
   * debian/control: Adding in gir's as build dependencies.
 
- -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 20:29:56 -0600
+ -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 20:30:27 -0600
 
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low
 
-- 
cgit v1.2.3


From b8e941ef47f14e81afc063250472c64d163de13b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 22:17:43 -0600
Subject: debian/libdbusmenu-glib-dev.install,
 debian/libdbusmenu-gtk-dev.install: Added GIR files to the packages.

---
 debian/changelog                    | 8 ++++++++
 debian/libdbusmenu-glib-dev.install | 1 +
 debian/libdbusmenu-gtk-dev.install  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0dcd128..4c82134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) UNRELEASED; urgency=low
+
+  * debian/libdbusmenu-glib-dev.install,
+    debian/libdbusmenu-gtk-dev.install: Added GIR files to
+    the packages.
+
+ -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 22:15:49 -0600
+
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low
 
   * debian/control: Adding in gir's as build dependencies.
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 17ddd2b..64c14d8 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-glib/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
+debian/tmp/usr/share/gir-1.0/DbusmenuGlib-0.2.gir
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 247fbca..a235baa 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-gtk/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc
 debian/tmp/usr/lib/libdbusmenu-gtk.a
 debian/tmp/usr/lib/libdbusmenu-gtk.so
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.2.gir
-- 
cgit v1.2.3


From 2906283edf2a5248a94aad276a201ec1be35b7da Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 28 Feb 2010 22:22:24 -0600
Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c82134..589b8fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) lucid; urgency=low
 
   * debian/libdbusmenu-glib-dev.install,
     debian/libdbusmenu-gtk-dev.install: Added GIR files to
     the packages.
 
- -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 22:15:49 -0600
+ -- Ted Gould <ted@ubuntu.com>  Sun, 28 Feb 2010 22:22:21 -0600
 
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low
 
-- 
cgit v1.2.3


From 61ff7d827555b8f8fc60122ebdc5b3cebb0e21de Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 1 Mar 2010 10:53:04 -0600
Subject: * debian/control: Adding dependency on valac *
 debian/libdbusmenu-glib-dev.install,   debian/libdbusmenu-gtk-dev.install:
 Added VAPI files to   the packages.

---
 debian/changelog                    | 4 ++++
 debian/control                      | 3 ++-
 debian/libdbusmenu-glib-dev.install | 1 +
 debian/libdbusmenu-gtk-dev.install  | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1ad4ba5..cdf5e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Adding in building of VAPI files
+  * debian/control: Adding dependency on valac
+  * debian/libdbusmenu-glib-dev.install,
+    debian/libdbusmenu-gtk-dev.install: Added VAPI files to
+    the packages.
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 10:50:08 -0600
 
diff --git a/debian/control b/debian/control
index ebd3ca9..869b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 5.0),
                libjson-glib-dev,
                libgirepository1.0-dev,
                gir1.0-glib-2.0,
-               gir1.0-gtk-2.0
+               gir1.0-gtk-2.0,
+               valac
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/libdbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 64c14d8..724eb9c 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -3,3 +3,4 @@ debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
 debian/tmp/usr/share/gir-1.0/DbusmenuGlib-0.2.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGlib-0.2.vapi
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index a235baa..3fa028f 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -3,3 +3,4 @@ debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc
 debian/tmp/usr/lib/libdbusmenu-gtk.a
 debian/tmp/usr/lib/libdbusmenu-gtk.so
 debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.2.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.2.vapi
-- 
cgit v1.2.3


From ed2766ed77d7a5e7e094cb7f05957dc6186f2cf8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 1 Mar 2010 10:56:51 -0600
Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cdf5e13..bf47970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low
 
   * Upstream Merge
     * Adding in building of VAPI files
@@ -7,7 +7,7 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low
     debian/libdbusmenu-gtk-dev.install: Added VAPI files to
     the packages.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 10:50:08 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 10:56:47 -0600
 
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) lucid; urgency=low
 
-- 
cgit v1.2.3


From e77ba68be1e4429a94ce5f6513fadb289cc9c987 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 1 Mar 2010 14:04:38 -0600
Subject: * debian/rules: Setting up to run autogen.sh * debian/control: Adding
 dep on gnome-common

---
 debian/changelog | 7 +++++++
 debian/control   | 1 +
 debian/rules     | 1 +
 3 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf47970..b0e05cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) UNRELEASED; urgency=low
+
+  * debian/rules: Setting up to run autogen.sh
+  * debian/control: Adding dep on gnome-common
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 14:04:01 -0600
+
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low
 
   * Upstream Merge
diff --git a/debian/control b/debian/control
index 869b3e8..6c925e5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 5.0),
                intltool,
                libxml2-dev,
                libjson-glib-dev,
+               gnome-common,
                libgirepository1.0-dev,
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
diff --git a/debian/rules b/debian/rules
index 90e7af5..3b6e341 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
+DEB_CONFIGURE_SCRIPT=$(CURDIR)/$(DEB_SRCDIR)/autogen.sh
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-- 
cgit v1.2.3


From 9bb2be1cf05e30786e3d887bd701f213748cd81d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 1 Mar 2010 14:06:03 -0600
Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0e05cb..90a728d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) lucid; urgency=low
 
   * debian/rules: Setting up to run autogen.sh
   * debian/control: Adding dep on gnome-common
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 14:04:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 14:06:00 -0600
 
 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low
 
-- 
cgit v1.2.3


From e35966edb1360bbfaca88e8b1d12a9d56e3248d4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 1 Mar 2010 22:14:55 -0600
Subject: releasing version 0.2.6-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6e3bea..bf6e515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Adding in building of the GObject Introspection details
@@ -15,7 +15,7 @@ libdbusmenu (0.2.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
     debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to
     hold the typelib files generated by GObject introspection.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 22:06:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 22:14:51 -0600
 
 libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From a7e96d73d61223b26ec64186d33584a73428e763 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 2 Mar 2010 10:13:36 -0600
Subject: * debian/control:   * Adding dependencies for gir-repository-dev and 
    gobject-introspection to ensure we get all the GI goodies.

---
 debian/changelog | 8 ++++++++
 debian/control   | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf6e515..519e5da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.2.6-0ubuntu2~ppa2) UNRELEASED; urgency=low
+
+  * debian/control:
+    * Adding dependencies for gir-repository-dev and
+      gobject-introspection to ensure we get all the GI goodies.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 02 Mar 2010 10:12:52 -0600
+
 libdbusmenu (0.2.6-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
diff --git a/debian/control b/debian/control
index 869b3e8..cdc808d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Build-Depends: debhelper (>= 5.0),
                intltool,
                libxml2-dev,
                libjson-glib-dev,
+               gobject-introspection,
+               gir-repository-dev,
                libgirepository1.0-dev,
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
-- 
cgit v1.2.3


From 180d4e26a370d89e8db44ad4d2d896eb57e2ef77 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 2 Mar 2010 10:13:42 -0600
Subject: releasing version 0.2.6-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 519e5da6..fa4da1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.6-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.6-0ubuntu2~ppa2) lucid; urgency=low
 
   * debian/control:
     * Adding dependencies for gir-repository-dev and
       gobject-introspection to ensure we get all the GI goodies.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 02 Mar 2010 10:12:52 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 02 Mar 2010 10:13:39 -0600
 
 libdbusmenu (0.2.6-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From f4e92974c1bca56c4be0602b867cc8ba90927d6a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Mar 2010 11:13:46 -0600
Subject: releasing version 0.2.7-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 33df4ba..5a8db24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.7-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.7-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream release 0.2.7
     * Adding in building of the GObject Introspection details
@@ -17,7 +17,7 @@ libdbusmenu (0.2.7-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Added VAPI files to the packages.
     * Added GIR files to the packages.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Mar 2010 11:11:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Mar 2010 11:13:43 -0600
 
 libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 388a8e335ad01e46bf934036fad62fb0ccbbabf4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 24 Mar 2010 11:20:37 -0500
Subject: releasing version 0.2.7-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a8086d..336f048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.7-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.7-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Adding support for blank icons
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 24 Mar 2010 11:15:48 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 24 Mar 2010 11:20:33 -0500
 
 libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 504bca7412c56173e3e5e9fcaf9f231479e88d8a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 24 Mar 2010 12:42:30 -0500
Subject: releasing version 0.2.7-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcf8066..485657f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.7-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.7-0ubuntu2~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * Crash fix in blank items
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 24 Mar 2010 12:34:09 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 24 Mar 2010 12:42:27 -0500
 
 libdbusmenu (0.2.7-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From cc7a0c520d9a3871a3fd844d6c895ecc6f3260bb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 25 Mar 2010 10:12:30 -0500
Subject: releasing version 0.2.8-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8a13dd..3979ac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.8-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream release 0.2.8
     * Adding support for blank icons (LP: #534854)
     * Remove unneeded warning (LP: #537312)
     * Fix typo in documentation
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 25 Mar 2010 10:07:29 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Mar 2010 10:12:27 -0500
 
 libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 2f5faa5dfaef3da5c42b5c7494bf30d98ecba992 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 01:05:51 -0500
Subject: releasing version 0.2.8-0ubuntu1~ppa2~crash1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc72d48..787c739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1) lucid; urgency=low
 
   * Upstream Merge
     * Trying to fix stuff.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 01:04:04 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 01:05:49 -0500
 
 libdbusmenu (0.2.8-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 923222aa364e1ed26a1f69e0f128ee4a6a62ddc8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 09:01:50 -0500
Subject: releasing version 0.2.8-0ubuntu1~ppa2~crash1ubuntu1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 455121a..b1c691c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1ubuntu1) lucid; urgency=low
 
   * Upstream merge
     * Making an unref more accessible
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 08:59:48 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 09:01:48 -0500
 
 libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 26bb50e3a77b677e839ff4e2d3611e2e001611d6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 09:02:05 -0500
Subject: releasing version 0.2.8-0ubuntu1~ppa2~crash2

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b1c691c..177c097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1ubuntu1) lucid; urgency=low
+libdbusmenu (0.2.8-0ubuntu1~ppa2~crash2) lucid; urgency=low
 
   * Upstream merge
     * Making an unref more accessible
-- 
cgit v1.2.3


From 85a76718ac641b83bb3a283d5819a3272fdd134c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 11:12:45 -0500
Subject: releasing version 0.2.8-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 142d224..dbf72d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.8-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream merge
     * Unrefing on layout updates (LP: #545026)
     * Resetting sync versions on disconnection
     * Removing useless warning
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 11:07:55 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 11:12:42 -0500
 
 libdbusmenu (0.2.8-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 8147c935ceef9cbd0dcefee8647b5be9ffc17de9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 14:17:16 -0500
Subject: releasing version 0.2.8-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfb1c4d..e274875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.8-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu2~ppa2) lucid; urgency=low
 
   * Upstream merge
     * Supporting AboutToShow in event callbacks to catch up
       with QT implementation.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 14:12:57 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 14:17:14 -0500
 
 libdbusmenu (0.2.8-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From ff4238af178ca889e52234ae37b027cb4defffc8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 14:51:18 -0500
Subject: releasing version 0.2.8-0ubuntu2~ppa3~update1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ab95ac..169fa23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.8-0ubuntu2~ppa3~update1) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu2~ppa3~update1) lucid; urgency=low
 
   * Upstream Merge
     * Changing the parse function to get_children instead of
       taking them.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 14:47:54 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 14:51:16 -0500
 
 libdbusmenu (0.2.8-0ubuntu2~ppa2) lucid; urgency=low
 
-- 
cgit v1.2.3


From 65bd97a9dfb54716be7797923773e1ad7a33a67c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 31 Mar 2010 17:39:50 -0500
Subject: releasing version 0.2.8-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1162e20..fa90e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.8-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu2~ppa3) lucid; urgency=low
 
   * Upstream Merge
     * Changing the parse function to get_children instead of
       taking them. (LP: #471044)
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 17:37:16 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 31 Mar 2010 17:39:46 -0500
 
 libdbusmenu (0.2.8-0ubuntu2~ppa2) lucid; urgency=low
 
-- 
cgit v1.2.3


From ed62aa80eb9b365da5967b0cd530213083db5d92 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 1 Apr 2010 09:05:18 -0500
Subject: Turning off merge mode

---
 .bzr-builddeb/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
index 3165e05..36c28f8 100644
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,2 @@
 [BUILDDEB]
-merge = True
+merge = False
-- 
cgit v1.2.3


From c1aafdb75dbb6cedaba949a37cc3486b47697de5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 1 Apr 2010 09:09:23 -0500
Subject: releasing version 0.2.8-0ubuntu3~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f78f89..566f456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.8-0ubuntu3~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.8-0ubuntu3~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Documentation fix
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 01 Apr 2010 09:07:25 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Apr 2010 09:09:21 -0500
 
 libdbusmenu (0.2.8-0ubuntu2) lucid; urgency=low
 
-- 
cgit v1.2.3


From addd35e86d7126f9d0d374f1507425941869d240 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 1 Apr 2010 09:14:41 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5a5054..5089e38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Documentation fix
@@ -10,7 +10,7 @@ libdbusmenu (0.2.9-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Resetting sync versions on disconnection
     * Removing useless warning
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 01 Apr 2010 09:09:51 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Apr 2010 09:14:36 -0500
 
 libdbusmenu (0.2.8-0ubuntu2) lucid; urgency=low
 
-- 
cgit v1.2.3


From 2fe45ccfa9a884307de9fd87035c7a397ddf9571 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 14:41:30 -0500
Subject: debian/rules: Massive debugging

---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4783d80..20d99bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) UNRELEASED; urgency=low
   * Upstream Merge
     * Adding in visible property to docs
     * Helpful comments in the code
+  * debian/rules: Massive debugging
 
  -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 14:40:26 -0500
 
diff --git a/debian/rules b/debian/rules
index c23bde6..7399803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-massivedebugging
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)'
-- 
cgit v1.2.3


From b7828c57bb679c28e14c955a19069451e156568a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 14:44:09 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20d99bc..596124b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) lucid; urgency=low
 
   * Upstream Merge
     * Adding in visible property to docs
     * Helpful comments in the code
   * debian/rules: Massive debugging
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 14:40:26 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 14:44:04 -0500
 
 libdbusmenu (0.2.9-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From ce2d71df4a6c4dac558ff87bf00cb14358a24267 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 17:07:44 -0500
Subject: Wrong version number

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 620ddd4..f701dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Don't allow setting children twice
-- 
cgit v1.2.3


From 25d8905a105e39615aff76d9a96cc5cdd60bbed7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 17:10:33 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f701dcf..6a59eff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) lucid; urgency=low
 
   * Upstream Merge
     * Don't allow setting children twice
     * Ref children of a menuitem
     * Return error when parent ID of getlayout can't be found
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 17:06:34 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 17:10:29 -0500
 
 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 1d2607d298341bf89396b65adb2b4243651d08ef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 17:16:03 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89b6326..2e03a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) lucid; urgency=low
 
   * Upstream Merge
     * Fixing the truth
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 17:13:35 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 17:16:01 -0500
 
 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) lucid; urgency=low
 
-- 
cgit v1.2.3


From e1d826fcfb9bb619cf69e16f72616d8e396cc494 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 17:21:13 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d6a402..40c8222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) lucid; urgency=low
 
   * Upstream Merge
     * I really don't want to talk about it.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 17:18:48 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 17:21:11 -0500
 
 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) lucid; urgency=low
 
-- 
cgit v1.2.3


From e4edc21b3d2a65948b4fb4dc0ba714649850c167 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Apr 2010 23:56:40 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03ce2e2..b8ca4fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) lucid; urgency=low
 
   * Upstream Merge
     * Changing GTK layer to look at position in realized
       children to avoid realization races.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 23:52:15 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 23:56:36 -0500
 
 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) lucid; urgency=low
 
-- 
cgit v1.2.3


From 05de6403c4ddaba5aa5cf50ef97a3241fbdad251 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 15 Apr 2010 00:57:38 -0500
Subject: releasing version 0.2.9-0ubuntu1~ppa2~ordering6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfa52db..45b046d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering6) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering6) lucid; urgency=low
 
   * Upstream Merge
     * A position functions using realized position
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 15 Apr 2010 00:54:56 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 15 Apr 2010 00:57:35 -0500
 
 libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) lucid; urgency=low
 
-- 
cgit v1.2.3


From 209320abfce67eef832cfe30a8c24b9505cf9718 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 15 Apr 2010 01:25:47 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44c67ec..028e2a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Changing GTK layer to look at position in realized
@@ -9,7 +9,7 @@ libdbusmenu (0.2.9-0ubuntu2~ppa1) UNRELEASED; urgency=low
     * Adding in visible property to docs
     * Helpful comments in the code
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 15 Apr 2010 01:17:34 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 15 Apr 2010 01:25:42 -0500
 
 libdbusmenu (0.2.9-0ubuntu1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 7fc5afd02428815be2978548aaf3676e0fd45f37 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 10:54:25 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa2~refs1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6557bd..f1cd8a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs1) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs1) lucid; urgency=low
 
   * Upstream Merge
     * Decrementing refs when added to child menus
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 10:48:14 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 10:54:22 -0500
 
 libdbusmenu (0.2.9-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 33fa3fd7eeed10107b96698d23a9e0fc8f03c2f8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 11:45:57 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa2~refs3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b01b3e6..1324d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs3) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs3) lucid; urgency=low
 
   * Upstream merge
     * Protecting references before signalling
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 11:43:18 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 11:45:54 -0500
 
 libdbusmenu (0.2.9-0ubuntu2~ppa2~refs2) lucid; urgency=low
 
-- 
cgit v1.2.3


From a9eef64661d79c56329bdc895a6e390f6fcea7d0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 11:54:24 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa2~refs4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eeb6d06..9ca9b4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs4) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs4) lucid; urgency=low
 
   * Upstream merge
     * Removing extra unref which allows us to not make an
       extra ref.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 11:50:51 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 11:54:19 -0500
 
 libdbusmenu (0.2.9-0ubuntu2~ppa2~refs3) lucid; urgency=low
 
-- 
cgit v1.2.3


From 5cdb4b7f20df54f8ee25a216c2381178636ff0c9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 11:59:46 -0500
Subject: debian/rules: Massive debugging

---
 debian/changelog | 6 ++++++
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9ca9b4d..fda5a87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs5) UNRELEASED; urgency=low
+
+  * debian/rules: Massive debugging
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 11:59:28 -0500
+
 libdbusmenu (0.2.9-0ubuntu2~ppa2~refs4) lucid; urgency=low
 
   * Upstream merge
diff --git a/debian/rules b/debian/rules
index c23bde6..7399803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-massivedebugging
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)'
-- 
cgit v1.2.3


From 4ffcefaf2369d9069be8116820984c7289d81302 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 12:02:51 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa2~refs5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fda5a87..db776d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs5) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs5) lucid; urgency=low
 
   * debian/rules: Massive debugging
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 11:59:28 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 12:02:48 -0500
 
 libdbusmenu (0.2.9-0ubuntu2~ppa2~refs4) lucid; urgency=low
 
-- 
cgit v1.2.3


From b8e566754bb9aad78726eb46305589a286a86ec3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 12:16:23 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa2~refs6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef0362f..9983db4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs6) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs6) lucid; urgency=low
 
   * Upstream Merge
     * Ensure that callbacks retain references to objects incase
       they get deleted quickly.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 12:13:33 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 12:16:21 -0500
 
 libdbusmenu (0.2.9-0ubuntu2~ppa2~refs5) lucid; urgency=low
 
-- 
cgit v1.2.3


From 3440a98fcc055f181a27419922d0f243cea51df3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 16 Apr 2010 12:23:58 -0500
Subject: releasing version 0.2.9-0ubuntu2~ppa2~refs7

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2baf8be..849085b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs7) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs7) lucid; urgency=low
 
   * Upstream Merge
     * Only unref root if the root has changed.
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 12:21:30 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 16 Apr 2010 12:23:56 -0500
 
 libdbusmenu (0.2.9-0ubuntu2~ppa2~refs6) lucid; urgency=low
 
-- 
cgit v1.2.3


From ca5a088631f8ea85067b06f433d6f33bf569493a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 17 Apr 2010 13:10:00 -0500
Subject: releasing version 0.2.9-0ubuntu3~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ee114f..b7398a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.9-0ubuntu3~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.2.9-0ubuntu3~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Only unref root if the root has changed.
@@ -7,7 +7,7 @@ libdbusmenu (0.2.9-0ubuntu3~ppa1) UNRELEASED; urgency=low
     * Protecting references before signalling
     * Decrementing refs when added to child menus
 
- -- Ted Gould <ted@ubuntu.com>  Sat, 17 Apr 2010 12:53:25 -0500
+ -- Ted Gould <ted@ubuntu.com>  Sat, 17 Apr 2010 13:09:57 -0500
 
 libdbusmenu (0.2.9-0ubuntu2) lucid; urgency=low
 
-- 
cgit v1.2.3


From e5fdf2b304b359b22fd12325e50874a3f2b75734 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 6 May 2010 10:31:48 +0200
Subject: Bump version

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b7398a1..efe1e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * Bump version
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 06 May 2010 10:31:23 +0200
+
 libdbusmenu (0.2.9-0ubuntu3~ppa1) lucid; urgency=low
 
   * Upstream Merge
-- 
cgit v1.2.3


From 2fd9f0d0c632cb9cb0cff3a843a4871109dee6ef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 6 May 2010 10:33:13 +0200
Subject: releasing version 0.3.0~dev-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efe1e3e..55ad134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
 
   * Bump version
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 06 May 2010 10:31:23 +0200
+ -- Ted Gould <ted@ubuntu.com>  Thu, 06 May 2010 10:33:11 +0200
 
 libdbusmenu (0.2.9-0ubuntu3~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 79479e390c6cec294545fd69c449202c8ebe6f31 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 11:22:33 -0500
Subject: Autogen

---
 Makefile.in                  |    6 +-
 aclocal.m4                   | 8262 +-----------------------------------------
 configure                    |   24 +-
 debian/changelog             |    3 +-
 libdbusmenu-glib/Makefile.in |   30 +-
 libdbusmenu-gtk/Makefile.in  |   16 +-
 tests/Makefile.in            |    6 +-
 tools/Makefile.in            |    6 +-
 tools/testapp/Makefile.in    |    6 +-
 9 files changed, 74 insertions(+), 8285 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6c49a81..b346576 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	compile config.guess config.sub depcomp install-sh ltmain.sh \
 	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/aclocal.m4 b/aclocal.m4
index 3eb818e..de3f860 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -452,8261 +452,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  xl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='echo'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=echo
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='echo'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${F77-"f77"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${FC-"f95"}
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
-    ;;
-  esac
-])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 3017 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 4 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
 # nls.m4 serial 3 (gettext-0.15)
 dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -9941,3 +1686,10 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/intltool.m4])
+m4_include([m4/introspection.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
diff --git a/configure b/configure
index cf9f6f6..5c9ce73 100755
--- a/configure
+++ b/configure
@@ -8708,6 +8708,10 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8733,11 +8737,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8736: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8740: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8740: \$? = $ac_status" >&5
+   echo "$as_me:8744: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9072,11 +9076,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9075: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9079: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9079: \$? = $ac_status" >&5
+   echo "$as_me:9083: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9177,11 +9181,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9180: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9184: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9184: \$? = $ac_status" >&5
+   echo "$as_me:9188: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9232,11 +9236,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9235: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9239: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9239: \$? = $ac_status" >&5
+   echo "$as_me:9243: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11616,7 +11620,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11619 "configure"
+#line 11623 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11712,7 +11716,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11715 "configure"
+#line 11719 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/debian/changelog b/debian/changelog
index b6ae231..2734fb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdbusmenu (0.3.0~dev-0ubuntu1~ppa2~vapi1) lucid; urgency=low
 
   * Upstream Merge
     * Fixing up VAPI files to build them correctly
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:21:02 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:22:21 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
 
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index 1556622..0613a69 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -36,14 +36,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@HAVE_INTROSPECTION_TRUE@am__append_1 = DbusmenuGlib-0.2.gir
+@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.2.gir
 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \
 @HAVE_INTROSPECTION_TRUE@	$(vapi_DATA)
 subdir = libdbusmenu-glib
 DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -339,15 +343,19 @@ BUILT_SOURCES = \
 	server-marshal.c
 
 INTROSPECTION_GIRS = $(am__append_1)
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(srcdir) \
+	$(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGlib_0_2_gir_INCLUDES = \
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_INCLUDES = \
 @HAVE_INTROSPECTION_TRUE@	GObject-2.0
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGlib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGlib_0_2_gir_LIBS = libdbusmenu-glib.la
-@HAVE_INTROSPECTION_TRUE@DbusmenuGlib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
@@ -357,7 +365,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 # VAPI Files
 #########################
 @HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
-@HAVE_INTROSPECTION_TRUE@vapi_DATA = DbusmenuGlib-0.2.vapi
+@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.2.vapi
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -885,10 +893,10 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list
 
 -include $(INTROSPECTION_MAKEFILE)
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGlib-0.2.gir: libdbusmenu-glib.la
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGlib-0.2.vapi: DbusmenuGlib-0.2.gir
-@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=DbusmenuGlib-0.2 $<
+@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.2.vapi: Dbusmenu-Glib-0.2.gir
+@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index 771ba0a..6cc87ee 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -43,7 +43,11 @@ subdir = libdbusmenu-gtk
 DIST_COMMON = $(libdbusmenu_gtkinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -316,13 +320,17 @@ libdbusmenu_gtk_la_LIBADD = \
 pkgconfig_DATA = dbusmenu-gtk.pc
 pkgconfigdir = $(libdir)/pkgconfig
 INTROSPECTION_GIRS = $(am__append_1)
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libdbusmenu-glib
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(srcdir) \
+	--add-include-path=$(top_builddir)/libdbusmenu-glib \
+	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
+
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_gtkinclude_HEADERS)
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_INCLUDES = \
 @HAVE_INTROSPECTION_TRUE@	GObject-2.0 \
 @HAVE_INTROSPECTION_TRUE@	Gtk-2.0 \
-@HAVE_INTROSPECTION_TRUE@	DbusmenuGlib-0.2
+@HAVE_INTROSPECTION_TRUE@	Dbusmenu-Glib-0.2
 
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk.la
@@ -805,7 +813,7 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 @HAVE_INTROSPECTION_TRUE@		--pkg gdk-pixbuf-2.0 \
 @HAVE_INTROSPECTION_TRUE@		--pkg gtk+-2.0 \
 @HAVE_INTROSPECTION_TRUE@		--pkg atk \
-@HAVE_INTROSPECTION_TRUE@		--pkg DbusmenuGlib-0.2 \
+@HAVE_INTROSPECTION_TRUE@		--pkg Dbusmenu-Glib-0.2 \
 @HAVE_INTROSPECTION_TRUE@		--vapidir=$(top_builddir)/libdbusmenu-glib \
 @HAVE_INTROSPECTION_TRUE@		$<
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6f71436..36803b9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -50,7 +50,11 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tools/Makefile.in b/tools/Makefile.in
index bcf5acc..e3a87aa 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -40,7 +40,11 @@ libexec_PROGRAMS = dbusmenu-dumper$(EXEEXT)
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in
index 979d58f..2b17ca3 100644
--- a/tools/testapp/Makefile.in
+++ b/tools/testapp/Makefile.in
@@ -38,7 +38,11 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT)
 subdir = tools/testapp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-- 
cgit v1.2.3


From de02cdcebcb088d238937c9ffae3b39f709c2537 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 11:26:02 -0500
Subject: debian/libdbusmenu-glib-dev.install: Updating gir and vapi file names
 for package list.

---
 debian/changelog                    | 4 +++-
 debian/libdbusmenu-glib-dev.install | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2734fb3..2022d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libdbusmenu (0.3.0~dev-0ubuntu1~ppa2~vapi1) lucid; urgency=low
   * Upstream Merge
     * Fixing up VAPI files to build them correctly
   * Autogen
+  * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
+    names for package list.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:22:21 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:25:38 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
 
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 724eb9c..b693fda 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -2,5 +2,5 @@ debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-glib/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
-debian/tmp/usr/share/gir-1.0/DbusmenuGlib-0.2.gir
-debian/tmp/usr/share/vala/vapi/DbusmenuGlib-0.2.vapi
+debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.2.gir
+debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.2.vapi
-- 
cgit v1.2.3


From d2c7a8e473f82d00952d115c78ed630985310e57 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 11:28:16 -0500
Subject: debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
 typelib file.

---
 debian/changelog                        | 4 +++-
 debian/gir1.0-dbusmenu-glib-0.2.install | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2022d04..33f46ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ libdbusmenu (0.3.0~dev-0ubuntu1~ppa2~vapi1) lucid; urgency=low
   * Autogen
   * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
     names for package list.
+  * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
+    typelib file.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:25:38 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:27:58 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
 
diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install
index a6c4fd0..86f7711 100644
--- a/debian/gir1.0-dbusmenu-glib-0.2.install
+++ b/debian/gir1.0-dbusmenu-glib-0.2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGlib-0.2.typelib
+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib
-- 
cgit v1.2.3


From 6a4ae9bdcd09926f48ffd5f8677c11cd28cff0f1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 11:30:20 -0500
Subject: releasing version 0.3.0~dev-0ubuntu1~ppa2~vapi1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 33f46ab..9a22c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ libdbusmenu (0.3.0~dev-0ubuntu1~ppa2~vapi1) lucid; urgency=low
   * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
     typelib file.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:27:58 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 11:30:17 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 904f0e1c6456ffaf05f45564caf0c6bf031636bf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 13:58:48 -0500
Subject: releasing version 0.3.0~dev-0ubuntu1~ppa2

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ae50a70..e49612a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ libdbusmenu (0.3.0~dev-0ubuntu1~ppa2) lucid; urgency=low
   * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
     typelib file.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 13:54:02 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 13:58:45 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 10ad5c8d458c05354a23becd89c4e08a1cb1843c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 21 May 2010 13:39:47 -0500
Subject: releasing version 0.3.0~dev-0ubuntu1~ppa3

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1984e2c..e20ff39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ libdbusmenu (0.3.0~dev-0ubuntu1~ppa3) lucid; urgency=low
   * Upstream Merge
   	* Fixing the version string in the GIR file
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 21 May 2010 13:37:47 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 21 May 2010 13:39:44 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa2) lucid; urgency=low
 
-- 
cgit v1.2.3


From 35db2efc8d2c3a27b687bc77015fa6da3a6895f1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 21 May 2010 13:56:19 -0500
Subject: Autogen update

---
 debian/changelog             | 6 ++++++
 libdbusmenu-glib/Makefile.in | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e20ff39..4a021e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.0~dev-0ubuntu1~ppa4) UNRELEASED; urgency=low
+
+  * Autogen update
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 21 May 2010 13:55:57 -0500
+
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa3) lucid; urgency=low
 
   * Upstream Merge
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index 0613a69..2bd983e 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -356,6 +356,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
-- 
cgit v1.2.3


From 213a5948b765fefc04ae8dfcfc94451f082e44ed Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 21 May 2010 13:57:34 -0500
Subject: releasing version 0.3.0~dev-0ubuntu1~ppa4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a021e8..1d222ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.3.0~dev-0ubuntu1~ppa4) UNRELEASED; urgency=low
+libdbusmenu (0.3.0~dev-0ubuntu1~ppa4) lucid; urgency=low
 
   * Autogen update
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 21 May 2010 13:55:57 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 21 May 2010 13:57:31 -0500
 
 libdbusmenu (0.3.0~dev-0ubuntu1~ppa3) lucid; urgency=low
 
-- 
cgit v1.2.3


From ba52ef2eaf9e377bfc55e00e3c8520a26f2fa0e6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 27 May 2010 11:35:57 -0500
Subject: Change version number for merge-upstream

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1d222ca..0eaff72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.0~dev-0ubuntu1~ppa4) lucid; urgency=low
+libdbusmenu (0.2.9-0ubuntu1~ppa4) lucid; urgency=low
 
   * Autogen update
 
-- 
cgit v1.2.3


From 46b9469ec87422d805a40a3834b9e5ab18f8e909 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 27 May 2010 11:47:15 -0500
Subject: releasing version 0.3.0-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4238635..869b894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.0-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Add function to get submenu of GTK-ified items
@@ -12,7 +12,7 @@ libdbusmenu (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
     typelib file.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 27 May 2010 11:40:42 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 May 2010 11:47:05 -0500
 
 libdbusmenu (0.2.9-0ubuntu3) lucid; urgency=low
 
-- 
cgit v1.2.3


From fbf81fed135ad3a0f5f0ed3e9edcdd4fc7a1be5c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 4 Jun 2010 14:42:29 -0500
Subject: releasing version 0.3.1-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 107d641..4adca93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.1-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Fix annotations for GIR scanner
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Jun 2010 14:39:37 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Jun 2010 14:42:26 -0500
 
 libdbusmenu (0.3.0-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 61ad4d5c68a37c07a9046640cfdf6f92e787c48c Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 7 Jun 2010 17:34:11 +0200
Subject: releasing version 0.3.1-0ubuntu1

---
 debian/changelog | 2 +-
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52d4e9b..0a5e059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.1-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
     * Fix annotations for GIR scanner
diff --git a/debian/rules b/debian/rules
index c23bde6..4b97c18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.1)'
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)'
 
-- 
cgit v1.2.3


From 59c214159f0017b5c623772d4d6f34f940ac1113 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Jun 2010 15:08:32 -0500
Subject: Autogen and adding new Makefiles

---
 Makefile.in                                        |   13 +-
 aclocal.m4                                         |    2 +
 configure                                          |  439 ++++-
 debian/changelog                                   |    3 +-
 docs/Makefile.in                                   |  613 +++++++
 docs/libdbusmenu-glib/Makefile.in                  |  613 +++++++
 docs/libdbusmenu-glib/reference/Makefile.in        |  683 ++++++++
 .../reference/html/DbusmenuClientMenuitem.html     |  122 ++
 .../reference/html/DbusmenuMenuitem.html           | 1688 ++++++++++++++++++++
 .../reference/html/DbusmenuMenuitemProxy.html      |  160 ++
 .../reference/html/annotation-glossary.html        |   62 +
 .../reference/html/api-index-full.html             |  618 +++++++
 docs/libdbusmenu-glib/reference/html/ch01.html     |   53 +
 docs/libdbusmenu-glib/reference/html/home.png      |  Bin 0 -> 654 bytes
 docs/libdbusmenu-glib/reference/html/index.html    |   52 +
 docs/libdbusmenu-glib/reference/html/index.sgml    |  189 +++
 docs/libdbusmenu-glib/reference/html/left.png      |  Bin 0 -> 459 bytes
 .../html/libdbusmenu-glib-DbusmenuClient.html      |  452 ++++++
 .../html/libdbusmenu-glib-DbusmenuServer.html      |  241 +++
 .../html/libdbusmenu-glib-dbusmenu-client.html     | 1001 ++++++++++++
 .../html/libdbusmenu-glib-dbusmenu-server.html     |  672 ++++++++
 .../reference/html/libdbusmenu-glib.devhelp        |  164 ++
 .../reference/html/libdbusmenu-glib.devhelp2       |  164 ++
 .../reference/html/object-tree.html                |   36 +
 docs/libdbusmenu-glib/reference/html/right.png     |  Bin 0 -> 472 bytes
 docs/libdbusmenu-glib/reference/html/style.css     |  257 +++
 docs/libdbusmenu-glib/reference/html/up.png        |  Bin 0 -> 406 bytes
 .../reference/libdbusmenu-glib-sections.txt        |  208 +++
 .../reference/libdbusmenu-glib.types               |    5 +
 .../reference/tmpl/client-menuitem.sgml            |   54 +
 docs/libdbusmenu-glib/reference/tmpl/client.sgml   |  158 ++
 .../reference/tmpl/dbusmenu-client.sgml            |  285 ++++
 .../reference/tmpl/dbusmenu-server.sgml            |  246 +++
 .../reference/tmpl/libdbusmenu-glib-unused.sgml    |    0
 .../reference/tmpl/menuitem-proxy.sgml             |   60 +
 docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml |  575 +++++++
 docs/libdbusmenu-glib/reference/tmpl/server.sgml   |  105 ++
 docs/libdbusmenu-glib/reference/version.xml        |    1 +
 .../reference/xml/annotation-glossary.xml          |   54 +
 .../reference/xml/api-index-deprecated.xml         |    8 +
 .../reference/xml/api-index-full.xml               |  158 ++
 .../reference/xml/client-menuitem.xml              |   87 +
 docs/libdbusmenu-glib/reference/xml/client.xml     |  336 ++++
 .../reference/xml/dbusmenu-client.xml              |  657 ++++++++
 .../reference/xml/dbusmenu-server.xml              |  462 ++++++
 .../reference/xml/menuitem-proxy.xml               |  111 ++
 docs/libdbusmenu-glib/reference/xml/menuitem.xml   | 1166 ++++++++++++++
 docs/libdbusmenu-glib/reference/xml/server.xml     |  183 +++
 docs/libdbusmenu-gtk/Makefile.in                   |  613 +++++++
 docs/libdbusmenu-gtk/reference/Makefile.in         |  683 ++++++++
 .../reference/html/Genericmenuitem.html            |  360 +++++
 .../reference/html/api-index-full.html             |  172 ++
 docs/libdbusmenu-gtk/reference/html/ch01.html      |   44 +
 docs/libdbusmenu-gtk/reference/html/home.png       |  Bin 0 -> 654 bytes
 docs/libdbusmenu-gtk/reference/html/index.html     |   42 +
 docs/libdbusmenu-gtk/reference/html/index.sgml     |   47 +
 docs/libdbusmenu-gtk/reference/html/left.png       |  Bin 0 -> 459 bytes
 .../html/libdbusmenu-gtk-DbusmenuGtkClient.html    |  273 ++++
 .../html/libdbusmenu-gtk-DbusmenuGtkMenu.html      |  166 ++
 .../reference/html/libdbusmenu-gtk-menuitem.html   |  133 ++
 .../reference/html/libdbusmenu-gtk.devhelp         |   45 +
 .../reference/html/libdbusmenu-gtk.devhelp2        |   45 +
 .../reference/html/object-tree.html                |   42 +
 docs/libdbusmenu-gtk/reference/html/right.png      |  Bin 0 -> 472 bytes
 docs/libdbusmenu-gtk/reference/html/style.css      |  257 +++
 docs/libdbusmenu-gtk/reference/html/up.png         |  Bin 0 -> 406 bytes
 .../reference/libdbusmenu-gtk-sections.txt         |   62 +
 .../reference/libdbusmenu-gtk.types                |    3 +
 docs/libdbusmenu-gtk/reference/tmpl/client.sgml    |   91 ++
 .../reference/tmpl/genericmenuitem.sgml            |  153 ++
 .../reference/tmpl/libdbusmenu-gtk-unused.sgml     |    0
 docs/libdbusmenu-gtk/reference/tmpl/menu.sgml      |   61 +
 docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml  |   45 +
 docs/libdbusmenu-gtk/reference/version.xml         |    1 +
 .../reference/xml/api-index-deprecated.xml         |    8 +
 .../reference/xml/api-index-full.xml               |   53 +
 docs/libdbusmenu-gtk/reference/xml/client.xml      |  191 +++
 .../reference/xml/genericmenuitem.xml              |  256 +++
 docs/libdbusmenu-gtk/reference/xml/menu.xml        |  115 ++
 docs/libdbusmenu-gtk/reference/xml/menuitem.xml    |   89 ++
 libdbusmenu-glib/Makefile.in                       |   15 +-
 libdbusmenu-gtk/Makefile.in                        |   15 +-
 m4/gtk-doc.m4                                      |   61 +
 tests/Makefile.in                                  |   11 +-
 tools/Makefile.in                                  |   11 +-
 tools/testapp/Makefile.in                          |   11 +-
 86 files changed, 17362 insertions(+), 28 deletions(-)
 create mode 100644 docs/Makefile.in
 create mode 100644 docs/libdbusmenu-glib/Makefile.in
 create mode 100644 docs/libdbusmenu-glib/reference/Makefile.in
 create mode 100644 docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/annotation-glossary.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/api-index-full.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/ch01.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/home.png
 create mode 100644 docs/libdbusmenu-glib/reference/html/index.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/index.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/html/left.png
 create mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp
 create mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2
 create mode 100644 docs/libdbusmenu-glib/reference/html/object-tree.html
 create mode 100644 docs/libdbusmenu-glib/reference/html/right.png
 create mode 100644 docs/libdbusmenu-glib/reference/html/style.css
 create mode 100644 docs/libdbusmenu-glib/reference/html/up.png
 create mode 100644 docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt
 create mode 100644 docs/libdbusmenu-glib/reference/libdbusmenu-glib.types
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/client.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/libdbusmenu-glib-unused.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/server.sgml
 create mode 100644 docs/libdbusmenu-glib/reference/version.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/annotation-glossary.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/api-index-deprecated.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/api-index-full.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/client-menuitem.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/client.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/menuitem-proxy.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/menuitem.xml
 create mode 100644 docs/libdbusmenu-glib/reference/xml/server.xml
 create mode 100644 docs/libdbusmenu-gtk/Makefile.in
 create mode 100644 docs/libdbusmenu-gtk/reference/Makefile.in
 create mode 100644 docs/libdbusmenu-gtk/reference/html/Genericmenuitem.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/api-index-full.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/ch01.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/home.png
 create mode 100644 docs/libdbusmenu-gtk/reference/html/index.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/index.sgml
 create mode 100644 docs/libdbusmenu-gtk/reference/html/left.png
 create mode 100644 docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp
 create mode 100644 docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp2
 create mode 100644 docs/libdbusmenu-gtk/reference/html/object-tree.html
 create mode 100644 docs/libdbusmenu-gtk/reference/html/right.png
 create mode 100644 docs/libdbusmenu-gtk/reference/html/style.css
 create mode 100644 docs/libdbusmenu-gtk/reference/html/up.png
 create mode 100644 docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-sections.txt
 create mode 100644 docs/libdbusmenu-gtk/reference/libdbusmenu-gtk.types
 create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/client.sgml
 create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml
 create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/libdbusmenu-gtk-unused.sgml
 create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/menu.sgml
 create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml
 create mode 100644 docs/libdbusmenu-gtk/reference/version.xml
 create mode 100644 docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml
 create mode 100644 docs/libdbusmenu-gtk/reference/xml/api-index-full.xml
 create mode 100644 docs/libdbusmenu-gtk/reference/xml/client.xml
 create mode 100644 docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml
 create mode 100644 docs/libdbusmenu-gtk/reference/xml/menu.xml
 create mode 100644 docs/libdbusmenu-gtk/reference/xml/menuitem.xml
 create mode 100644 m4/gtk-doc.m4

diff --git a/Makefile.in b/Makefile.in
index b346576..5bbfe62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	compile config.guess config.sub depcomp install-sh ltmain.sh \
 	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -138,6 +139,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -150,6 +153,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -191,6 +199,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -277,9 +286,9 @@ SUBDIRS = \
 	libdbusmenu-gtk \
 	tools \
 	tests \
+	docs \
 	po
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/aclocal.m4 b/aclocal.m4
index de3f860..6a36808 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1686,6 +1686,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gnome-doc-utils.m4])
+m4_include([m4/gtk-doc.m4])
 m4_include([m4/intltool.m4])
 m4_include([m4/introspection.m4])
 m4_include([m4/libtool.m4])
diff --git a/configure b/configure
index 0e314e4..861cbff 100755
--- a/configure
+++ b/configure
@@ -780,7 +780,29 @@ DBUSMENUGTK_LIBS
 DBUSMENUGTK_CFLAGS
 DBUSMENUGLIB_LIBS
 DBUSMENUGLIB_CFLAGS
+HAVE_GNOME_DOC_UTILS_FALSE
+HAVE_GNOME_DOC_UTILS_TRUE
+DISTCHECK_CONFIGURE_FLAGS
+ENABLE_SK_FALSE
+ENABLE_SK_TRUE
+DOC_USER_FORMATS
+OMF_DIR
+HELP_DIR
+GTK_DOC_USE_REBASE_FALSE
+GTK_DOC_USE_REBASE_TRUE
+GTK_DOC_USE_LIBTOOL_FALSE
+GTK_DOC_USE_LIBTOOL_TRUE
+GTK_DOC_BUILD_PDF_FALSE
+GTK_DOC_BUILD_PDF_TRUE
+GTK_DOC_BUILD_HTML_FALSE
+GTK_DOC_BUILD_HTML_TRUE
+ENABLE_GTK_DOC_FALSE
+ENABLE_GTK_DOC_TRUE
 PKG_CONFIG
+HTML_DIR
+GTKDOC_MKPDF
+GTKDOC_REBASE
+GTKDOC_CHECK
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 OTOOL64
@@ -934,6 +956,14 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_silent_rules
+with_html_dir
+enable_gtk_doc
+enable_gtk_doc_html
+enable_gtk_doc_pdf
+with_help_dir
+with_omf_dir
+with_help_formats
+enable_scrollkeeper
 enable_introspection
 enable_massivedebugging
 '
@@ -1584,6 +1614,10 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
+  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
+  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
+  --disable-scrollkeeper  do not make updates to the scrollkeeper database
   --enable-introspection=[no/auto/yes]
                           Enable introspection for this build
   --enable-massivedebugging
@@ -1595,6 +1629,11 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-html-dir=PATH    path to installed docs
+  --with-help-dir=DIR     path to help docs
+  --with-omf-dir=DIR      path to OMF files
+  --with-help-formats=FORMATS
+                          list of formats
 
 Some influential environment variables:
   CC          C compiler command
@@ -6246,13 +6285,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6249: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6288: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6252: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6291: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6255: output\"" >&5)
+  (eval echo "\"\$as_me:6294: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7457,7 +7496,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7460 "configure"' > conftest.$ac_ext
+  echo '#line 7499 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8708,6 +8747,10 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8733,11 +8776,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8736: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8779: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8740: \$? = $ac_status" >&5
+   echo "$as_me:8783: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9072,11 +9115,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9075: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9118: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9079: \$? = $ac_status" >&5
+   echo "$as_me:9122: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9177,11 +9220,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9180: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9223: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9184: \$? = $ac_status" >&5
+   echo "$as_me:9227: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9232,11 +9275,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9235: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9278: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9239: \$? = $ac_status" >&5
+   echo "$as_me:9282: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11616,7 +11659,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11619 "configure"
+#line 11662 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11712,7 +11755,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11715 "configure"
+#line 11758 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11957,13 +12000,9 @@ AM_BACKSLASH='\'
 
 
 ###########################
-# Dependencies - GLib
+# GTK Doc
 ###########################
 
-GLIB_REQUIRED_VERSION=2.18
-DBUS_REQUIRED_VERSION=0.76
-XML_REQUIRED_VERSION=2.6
-
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -12081,6 +12120,331 @@ $as_echo "no" >&6; }
 
 fi
 
+
+    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_CHECK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+if test -n "$GTKDOC_CHECK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+$as_echo "$GTKDOC_CHECK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  for ac_prog in gtkdoc-rebase
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_REBASE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+if test -n "$GTKDOC_REBASE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
+$as_echo "$GTKDOC_REBASE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$GTKDOC_REBASE" && break
+done
+test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
+
+  # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+set dummy gtkdoc-mkpdf; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_MKPDF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+if test -n "$GTKDOC_MKPDF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
+$as_echo "$GTKDOC_MKPDF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+# Check whether --with-html-dir was given.
+if test "${with_html_dir+set}" = set; then :
+  withval=$with_html_dir;
+else
+  with_html_dir='${datadir}/gtk-doc/html'
+fi
+
+  HTML_DIR="$with_html_dir"
+
+
+    # Check whether --enable-gtk-doc was given.
+if test "${enable_gtk_doc+set}" = set; then :
+  enableval=$enable_gtk_doc;
+else
+  enable_gtk_doc=no
+fi
+
+
+  if test x$enable_gtk_doc = xyes; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  :
+else
+  as_fn_error "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5
+fi
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
+
+    # Check whether --enable-gtk-doc-html was given.
+if test "${enable_gtk_doc_html+set}" = set; then :
+  enableval=$enable_gtk_doc_html;
+else
+  enable_gtk_doc_html=yes
+fi
+
+    # Check whether --enable-gtk-doc-pdf was given.
+if test "${enable_gtk_doc_pdf+set}" = set; then :
+  enableval=$enable_gtk_doc_pdf;
+else
+  enable_gtk_doc_pdf=no
+fi
+
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
+
+
+   if test x$enable_gtk_doc = xyes; then
+  ENABLE_GTK_DOC_TRUE=
+  ENABLE_GTK_DOC_FALSE='#'
+else
+  ENABLE_GTK_DOC_TRUE='#'
+  ENABLE_GTK_DOC_FALSE=
+fi
+
+   if test x$enable_gtk_doc_html = xyes; then
+  GTK_DOC_BUILD_HTML_TRUE=
+  GTK_DOC_BUILD_HTML_FALSE='#'
+else
+  GTK_DOC_BUILD_HTML_TRUE='#'
+  GTK_DOC_BUILD_HTML_FALSE=
+fi
+
+   if test x$enable_gtk_doc_pdf = xyes; then
+  GTK_DOC_BUILD_PDF_TRUE=
+  GTK_DOC_BUILD_PDF_FALSE='#'
+else
+  GTK_DOC_BUILD_PDF_TRUE='#'
+  GTK_DOC_BUILD_PDF_FALSE=
+fi
+
+   if test -n "$LIBTOOL"; then
+  GTK_DOC_USE_LIBTOOL_TRUE=
+  GTK_DOC_USE_LIBTOOL_FALSE='#'
+else
+  GTK_DOC_USE_LIBTOOL_TRUE='#'
+  GTK_DOC_USE_LIBTOOL_FALSE=
+fi
+
+   if test -n "$GTKDOC_REBASE"; then
+  GTK_DOC_USE_REBASE_TRUE=
+  GTK_DOC_USE_REBASE_FALSE='#'
+else
+  GTK_DOC_USE_REBASE_TRUE='#'
+  GTK_DOC_USE_REBASE_FALSE=
+fi
+
+
+
+gdu_cv_version_required=0.3.2
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  gdu_cv_have_gdu=yes
+else
+  gdu_cv_have_gdu=no
+fi
+
+if test "$gdu_cv_have_gdu" = "yes"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+fi
+
+
+
+# Check whether --with-help-dir was given.
+if test "${with_help_dir+set}" = set; then :
+  withval=$with_help_dir;
+else
+  with_help_dir='${datadir}/gnome/help'
+fi
+
+HELP_DIR="$with_help_dir"
+
+
+
+# Check whether --with-omf-dir was given.
+if test "${with_omf_dir+set}" = set; then :
+  withval=$with_omf_dir;
+else
+  with_omf_dir='${datadir}/omf'
+fi
+
+OMF_DIR="$with_omf_dir"
+
+
+
+# Check whether --with-help-formats was given.
+if test "${with_help_formats+set}" = set; then :
+  withval=$with_help_formats;
+else
+  with_help_formats=''
+fi
+
+DOC_USER_FORMATS="$with_help_formats"
+
+
+# Check whether --enable-scrollkeeper was given.
+if test "${enable_scrollkeeper+set}" = set; then :
+  enableval=$enable_scrollkeeper;
+else
+  enable_scrollkeeper=yes
+fi
+
+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+  ENABLE_SK_TRUE=
+  ENABLE_SK_FALSE='#'
+else
+  ENABLE_SK_TRUE='#'
+  ENABLE_SK_FALSE=
+fi
+
+
+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+ if test "$gdu_cv_have_gdu" = "yes"; then
+  HAVE_GNOME_DOC_UTILS_TRUE=
+  HAVE_GNOME_DOC_UTILS_FALSE='#'
+else
+  HAVE_GNOME_DOC_UTILS_TRUE='#'
+  HAVE_GNOME_DOC_UTILS_FALSE=
+fi
+
+
+
+
+###########################
+# Dependencies - GLib
+###########################
+
+GLIB_REQUIRED_VERSION=2.18
+DBUS_REQUIRED_VERSION=0.76
+XML_REQUIRED_VERSION=2.6
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUGLIB" >&5
 $as_echo_n "checking for DBUSMENUGLIB... " >&6; }
@@ -13313,7 +13677,7 @@ fi
 # Files
 ###########################
 
-ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13440,6 +13804,34 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+  as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
+  as_fn_error "conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
   as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -14310,6 +14702,13 @@ do
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+    "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;;
+    "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;;
+    "docs/libdbusmenu-glib/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/version.xml" ;;
+    "docs/libdbusmenu-gtk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-gtk/Makefile" ;;
+    "docs/libdbusmenu-gtk/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-gtk/reference/Makefile" ;;
+    "docs/libdbusmenu-gtk/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-gtk/reference/version.xml" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/debian/changelog b/debian/changelog
index d499767..75683ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdbusmenu (0.3.1-0ubuntu1~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * gtk-doc support
+  * Autogen and adding new Makefiles
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 09 Jun 2010 14:56:10 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 09 Jun 2010 15:08:22 -0500
 
 libdbusmenu (0.3.1-0ubuntu1~ppa1) lucid; urgency=low
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
new file mode 100644
index 0000000..39985e6
--- /dev/null
+++ b/docs/Makefile.in
@@ -0,0 +1,613 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = docs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@
+DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@
+DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@
+DBUSMENUGTK_LIBS = @DBUSMENUGTK_LIBS@
+DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
+DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDBUSMENU_AGE = @LIBDBUSMENU_AGE@
+LIBDBUSMENU_CURRENT = @LIBDBUSMENU_CURRENT@
+LIBDBUSMENU_REVISION = @LIBDBUSMENU_REVISION@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VALA_API_GEN = @VALA_API_GEN@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = libdbusmenu-glib libdbusmenu-gtk
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/docs/libdbusmenu-glib/Makefile.in b/docs/libdbusmenu-glib/Makefile.in
new file mode 100644
index 0000000..203ae9a
--- /dev/null
+++ b/docs/libdbusmenu-glib/Makefile.in
@@ -0,0 +1,613 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = docs/libdbusmenu-glib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@
+DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@
+DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@
+DBUSMENUGTK_LIBS = @DBUSMENUGTK_LIBS@
+DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
+DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDBUSMENU_AGE = @LIBDBUSMENU_AGE@
+LIBDBUSMENU_CURRENT = @LIBDBUSMENU_CURRENT@
+LIBDBUSMENU_REVISION = @LIBDBUSMENU_REVISION@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VALA_API_GEN = @VALA_API_GEN@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = reference
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libdbusmenu-glib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/libdbusmenu-glib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/docs/libdbusmenu-glib/reference/Makefile.in b/docs/libdbusmenu-glib/reference/Makefile.in
new file mode 100644
index 0000000..76d1fec
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/Makefile.in
@@ -0,0 +1,683 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make
+subdir = docs/libdbusmenu-glib/reference
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = version.xml
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@
+DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@
+DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@
+DBUSMENUGTK_LIBS = @DBUSMENUGTK_LIBS@
+DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
+DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDBUSMENU_AGE = @LIBDBUSMENU_AGE@
+LIBDBUSMENU_CURRENT = @LIBDBUSMENU_CURRENT@
+LIBDBUSMENU_REVISION = @LIBDBUSMENU_REVISION@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VALA_API_GEN = @VALA_API_GEN@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# We require automake 1.6 at least.
+AUTOMAKE_OPTIONS = 1.6
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
+
+# The name of the module, e.g. 'glib'.
+DOC_MODULE = libdbusmenu-glib
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+
+# The directory containing the source code. Relative to $(srcdir).
+# gtk-doc will search all .c & .h files beneath here for inline comments
+# documenting the functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR = ../../../libdbusmenu-glib
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS = --nogtkinit --type-init-func="g_type_init()"
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS = 
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
+MKTMPL_OPTIONS = 
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS = 
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB = $(top_srcdir)/libdbusmenu-glib/*.h
+CFILE_GLOB = $(top_srcdir)/libdbusmenu-glib/*.c
+
+# Header files to ignore when scanning.
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES = menuitem-marshal.h server-marshal.h menuitem-private.h
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES = 
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files = version.xml
+
+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# These files must be listed here *and* in content_files
+# e.g. expand_content_files=running.sgml
+expand_content_files = 
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+INCLUDES = -I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la 
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
+	version.xml.in
+DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.local.make $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libdbusmenu-glib/reference/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/libdbusmenu-glib/reference/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-local
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-local dist-hook distclean \
+	distclean-generic distclean-libtool distclean-local distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local
+
+
+@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+@ENABLE_GTK_DOC_FALSE@all-local:
+
+docs: html-build.stamp
+
+$(REPORT_FILES): sgml-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+	@echo 'gtk-doc: Scanning header files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo 'gtk-doc: Rebuilding template files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+tmpl/*.sgml:
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+	@echo 'gtk-doc: Building XML'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building HTML'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html
+	mkdir $(srcdir)/html
+	mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+	if test "$(?)" = "0"; then \
+	  mkhtml_options=--path="$(srcdir)"; \
+	fi
+	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo 'gtk-doc: Fixing cross-references'
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+	rm -rf .libs
+
+distclean-local:
+	cd $(srcdir) && \
+	  rm -rf xml $(REPORT_FILES) \
+	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html
+
+install-data-local:
+	installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	  else \
+	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	  fi; \
+	  $(mkinstalldirs) $${installdir} ; \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $${installdir}; \
+	  done; \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+	  fi; \
+	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
+	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+	fi
+
+uninstall-local:
+	if test -n "$(DOC_MODULE_VERSION)"; then \
+	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	else \
+	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	fi; \
+	rm -rf $${installdir}
+
+#
+# Require gtk-doc when making dist
+#
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+@ENABLE_GTK_DOC_FALSE@	@false
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	! which gtkdoc-rebase >/dev/null 2>&1 || \
+	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
+
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+#DISTCLEANFILES +=
+
+# Comment this out if you want your docs-status tested during 'make check'
+#TESTS = $(GTKDOC_CHECK)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html b/docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html
new file mode 100644
index 0000000..2e42bce
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuClientMenuitem</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">
+<link rel="next" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-glib-DbusmenuClient.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-glib-dbusmenu-client.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#DbusmenuClientMenuitem.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#DbusmenuClientMenuitem.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#DbusmenuClientMenuitem.object-hierarchy" class="shortcut">Object Hierarchy</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuClientMenuitem">
+<a name="DbusmenuClientMenuitem"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="DbusmenuClientMenuitem.top_of_page"></a>DbusmenuClientMenuitem</span></h2>
+<p>DbusmenuClientMenuitem</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="DbusmenuClientMenuitem.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="DbusmenuClientMenuitem.html#DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS" title="DBUSMENU_CLIENT_MENUITEM_TYPE">DBUSMENU_CLIENT_MENUITEM_TYPE</a>
+                    <a class="link" href="DbusmenuClientMenuitem.html#DbusmenuClientMenuitem-struct" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>;
+                    <a class="link" href="DbusmenuClientMenuitem.html#DbusmenuClientMenuitemClass" title="DbusmenuClientMenuitemClass">DbusmenuClientMenuitemClass</a>;
+<a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem"><span class="returnvalue">DbusmenuClientMenuitem</span></a> * <a class="link" href="DbusmenuClientMenuitem.html#dbusmenu-client-menuitem-new" title="dbusmenu_client_menuitem_new ()">dbusmenu_client_menuitem_new</a>   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="DbusmenuClientMenuitem.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+         +----DbusmenuClientMenuitem
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="DbusmenuClientMenuitem.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="DbusmenuClientMenuitem.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUSMENU_CLIENT_MENUITEM_TYPE">
+<a name="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS"></a><h3>DBUSMENU_CLIENT_MENUITEM_TYPE</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_MENUITEM_TYPE            (dbusmenu_client_menuitem_get_type ())
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuClientMenuitem">
+<a name="DbusmenuClientMenuitem-struct"></a><h3>DbusmenuClientMenuitem</h3>
+<pre class="programlisting">typedef struct _DbusmenuClientMenuitem DbusmenuClientMenuitem;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuClientMenuitemClass">
+<a name="DbusmenuClientMenuitemClass"></a><h3>DbusmenuClientMenuitemClass</h3>
+<pre class="programlisting">typedef struct {
+	DbusmenuMenuitemClass parent_class;
+} DbusmenuClientMenuitemClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_client_menuitem_new ()">
+<a name="dbusmenu-client-menuitem-new"></a><h3>dbusmenu_client_menuitem_new ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem"><span class="returnvalue">DbusmenuClientMenuitem</span></a> * dbusmenu_client_menuitem_new   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html b/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html
new file mode 100644
index 0000000..c5b7452
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html
@@ -0,0 +1,1688 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuMenuitem</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">
+<link rel="next" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="DbusmenuMenuitemProxy.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-glib-DbusmenuClient.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#DbusmenuMenuitem.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#DbusmenuMenuitem.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#DbusmenuMenuitem.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#DbusmenuMenuitem.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#DbusmenuMenuitem.signals" class="shortcut">Signals</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuMenuitem">
+<a name="DbusmenuMenuitem"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="DbusmenuMenuitem.top_of_page"></a>DbusmenuMenuitem</span></h2>
+<p>DbusmenuMenuitem — A lowlevel represenation of a menuitem</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1" title="Stability Level">
+<a name="DbusmenuMenuitem.stability-level"></a><h2>Stability Level</h2>
+Unstable, unless otherwise indicated
+</div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="DbusmenuMenuitem.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">
+#include &lt;libdbusmenu-glib/menuitem.h&gt;
+
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED">DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED">DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED">DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED">DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED">DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED">DBUSMENU_MENUITEM_SIGNAL_REALIZED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID">DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TYPE:CAPS" title="DBUSMENU_MENUITEM_PROP_TYPE">DBUSMENU_MENUITEM_PROP_TYPE</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS" title="DBUSMENU_MENUITEM_PROP_VISIBLE">DBUSMENU_MENUITEM_PROP_VISIBLE</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ENABLED:CAPS" title="DBUSMENU_MENUITEM_PROP_ENABLED">DBUSMENU_MENUITEM_PROP_ENABLED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-LABEL:CAPS" title="DBUSMENU_MENUITEM_PROP_LABEL">DBUSMENU_MENUITEM_PROP_LABEL</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS" title="DBUSMENU_MENUITEM_PROP_ICON_NAME">DBUSMENU_MENUITEM_PROP_ICON_NAME</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS" title="DBUSMENU_MENUITEM_PROP_ICON_DATA">DBUSMENU_MENUITEM_PROP_ICON_DATA</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS" title="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE">DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS" title="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE">DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_CHECK">DBUSMENU_MENUITEM_TOGGLE_CHECK</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_RADIO">DBUSMENU_MENUITEM_TOGGLE_RADIO</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED">DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED">DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN">DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</a>
+#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS" title="DBUSMENU_MENUITEM_ICON_NAME_BLANK">DBUSMENU_MENUITEM_ICON_NAME_BLANK</a>
+                    <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-struct" title="DbusmenuMenuitem">DbusmenuMenuitem</a>;
+<span class="returnvalue">void</span>                (<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()">*dbusmenu_menuitem_about_to_show_cb</a>)
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t" title="dbusmenu_menuitem_buildxml_slot_t ()">*dbusmenu_menuitem_buildxml_slot_t</a>)
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *stringarray</code></em>);
+                    <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitemClass" title="DbusmenuMenuitemClass">DbusmenuMenuitemClass</a>;
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-new" title="dbusmenu_menuitem_new ()">dbusmenu_menuitem_new</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-new-with-id" title="dbusmenu_menuitem_new_with_id ()">dbusmenu_menuitem_new_with_id</a>       (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-id" title="dbusmenu_menuitem_get_id ()">dbusmenu_menuitem_get_id</a>            (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-children" title="dbusmenu_menuitem_get_children ()">dbusmenu_menuitem_get_children</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-take-children" title="dbusmenu_menuitem_take_children ()">dbusmenu_menuitem_take_children</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position" title="dbusmenu_menuitem_get_position ()">dbusmenu_menuitem_get_position</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position-realized" title="dbusmenu_menuitem_get_position_realized ()">dbusmenu_menuitem_get_position_realized</a>
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-append" title="dbusmenu_menuitem_child_append ()">dbusmenu_menuitem_child_append</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-prepend" title="dbusmenu_menuitem_child_prepend ()">dbusmenu_menuitem_child_prepend</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-delete" title="dbusmenu_menuitem_child_delete ()">dbusmenu_menuitem_child_delete</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-add-position" title="dbusmenu_menuitem_child_add_position ()">dbusmenu_menuitem_child_add_position</a>
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-reorder" title="dbusmenu_menuitem_child_reorder ()">dbusmenu_menuitem_child_reorder</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-find" title="dbusmenu_menuitem_child_find ()">dbusmenu_menuitem_child_find</a>        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-find-id" title="dbusmenu_menuitem_find_id ()">dbusmenu_menuitem_find_id</a>           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set" title="dbusmenu_menuitem_property_set ()">dbusmenu_menuitem_property_set</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-value" title="dbusmenu_menuitem_property_set_value ()">dbusmenu_menuitem_property_set_value</a>
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-bool" title="dbusmenu_menuitem_property_set_bool ()">dbusmenu_menuitem_property_set_bool</a> (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-int" title="dbusmenu_menuitem_property_set_int ()">dbusmenu_menuitem_property_set_int</a>  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> value</code></em>);
+const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get" title="dbusmenu_menuitem_property_get ()">dbusmenu_menuitem_property_get</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="returnvalue">GValue</span></a> *      <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-value" title="dbusmenu_menuitem_property_get_value ()">dbusmenu_menuitem_property_get_value</a>
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-bool" title="dbusmenu_menuitem_property_get_bool ()">dbusmenu_menuitem_property_get_bool</a> (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-int" title="dbusmenu_menuitem_property_get_int ()">dbusmenu_menuitem_property_get_int</a>  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-exist" title="dbusmenu_menuitem_property_exist ()">dbusmenu_menuitem_property_exist</a>    (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-list" title="dbusmenu_menuitem_properties_list ()">dbusmenu_menuitem_properties_list</a>   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-copy" title="dbusmenu_menuitem_properties_copy ()">dbusmenu_menuitem_properties_copy</a>   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-remove" title="dbusmenu_menuitem_property_remove ()">dbusmenu_menuitem_property_remove</a>   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-set-root" title="dbusmenu_menuitem_set_root ()">dbusmenu_menuitem_set_root</a>          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> root</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-root" title="dbusmenu_menuitem_get_root ()">dbusmenu_menuitem_get_root</a>          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-foreach" title="dbusmenu_menuitem_foreach ()">dbusmenu_menuitem_foreach</a>           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> (funcDbusmenuMenuitem * mi, gpointer data) ()</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event" title="dbusmenu_menuitem_handle_event ()">dbusmenu_menuitem_handle_event</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timestamp</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-send-about-to-show" title="dbusmenu_menuitem_send_about_to_show ()">dbusmenu_menuitem_send_about_to_show</a>
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()"><span class="type">dbusmenu_menuitem_about_to_show_cb</span></a> cb</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> cb_data</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="DbusmenuMenuitem.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----DbusmenuMenuitem
+         +----<a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
+         +----<a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</pre>
+</div>
+<div class="refsect1" title="Properties">
+<a name="DbusmenuMenuitem.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem--id" title='The "id" property'>id</a>"                       <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct Only
+</pre>
+</div>
+<div class="refsect1" title="Signals">
+<a name="DbusmenuMenuitem.signals"></a><h2>Signals</h2>
+<pre class="synopsis">
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added" title='The "child-added" signal'>child-added</a>"                                    : Run Last
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved" title='The "child-moved" signal'>child-moved</a>"                                    : Run Last
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed" title='The "child-removed" signal'>child-removed</a>"                                  : Run Last
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated" title='The "item-activated" signal'>item-activated</a>"                                 : Run Last
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed" title='The "property-changed" signal'>property-changed</a>"                               : Run Last
+  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-realized" title='The "realized" signal'>realized</a>"                                       : Run Last
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="DbusmenuMenuitem.description"></a><h2>Description</h2>
+<p>
+A <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> is the lowest level of represenation of a
+single item in a menu.  It gets created on the server side
+and copied over to the client side where it gets rendered.  As
+the server starts to change it, and grow it, and do all kinds
+of fun stuff that information is transfered over DBus and the
+client updates it's understanding of the object model.
+</p>
+<p>
+Most people using either the client or the server should be
+able to deal mostly with <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.  These
+are simple, but then they can be attached to more complex
+objects and handled appropriately.
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="DbusmenuMenuitem.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED">
+<a name="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED    "property-changed"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED">
+<a name="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED      "item-activated"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED">
+<a name="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED         "child-added"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED">
+<a name="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED       "child-removed"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED">
+<a name="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED         "child-moved"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED">
+<a name="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_REALIZED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID">
+<a name="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_TYPE">
+<a name="DBUSMENU-MENUITEM-PROP-TYPE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_TYPE</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_TYPE                  "type"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_VISIBLE">
+<a name="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_VISIBLE</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_VISIBLE               "visible"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_ENABLED">
+<a name="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_ENABLED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_ENABLED               "enabled"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_LABEL">
+<a name="DBUSMENU-MENUITEM-PROP-LABEL:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_LABEL</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_LABEL                 "label"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_ICON_NAME">
+<a name="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_ICON_NAME</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_ICON_NAME             "icon-name"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_ICON_DATA">
+<a name="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_ICON_DATA</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_ICON_DATA             "icon-data"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE">
+<a name="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE           "toggle-type"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE">
+<a name="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE          "toggle-state"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_CHECK">
+<a name="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_CHECK</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_CHECK               "checkmark"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_RADIO">
+<a name="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_RADIO</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_RADIO               "radio"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED">
+<a name="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED     0
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED">
+<a name="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED       1
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN">
+<a name="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN       -1
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_MENUITEM_ICON_NAME_BLANK">
+<a name="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS"></a><h3>DBUSMENU_MENUITEM_ICON_NAME_BLANK</h3>
+<pre class="programlisting">#define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuMenuitem">
+<a name="DbusmenuMenuitem-struct"></a><h3>DbusmenuMenuitem</h3>
+<pre class="programlisting">typedef struct _DbusmenuMenuitem DbusmenuMenuitem;</pre>
+<p>
+This is the <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> based object that represents a menu
+item.  It gets created the same on both the client and
+the server side and libdbusmenu-glib does the work of making
+this object model appear on both sides of DBus.  Simple
+really, though through updates and people coming on and off
+the bus it can lead to lots of fun complex scenarios.
+</p>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_about_to_show_cb ()">
+<a name="dbusmenu-menuitem-about-to-show-cb"></a><h3>dbusmenu_menuitem_about_to_show_cb ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*dbusmenu_menuitem_about_to_show_cb)
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Callback prototype for a callback that is called when the
+menu should be shown.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>Menu item that should be shown
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td> Extra user data sent with the function. closure</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_buildxml_slot_t ()">
+<a name="dbusmenu-menuitem-buildxml-slot-t"></a><h3>dbusmenu_menuitem_buildxml_slot_t ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*dbusmenu_menuitem_buildxml_slot_t)
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *stringarray</code></em>);</pre>
+<p>
+This is the function that is called to represent this menu item
+as an XML fragment.  Should call it's own children.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td> Menu item that should be built from. <acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>. </td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>stringarray</code></em> :</span></p></td>
+<td> An array of strings that can be combined into an XML file.. <acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>. <acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>. <acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym>. <acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8. </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuMenuitemClass">
+<a name="DbusmenuMenuitemClass"></a><h3>DbusmenuMenuitemClass</h3>
+<pre class="programlisting">typedef struct {
+	GObjectClass parent_class;
+
+	/* Signals */
+	void (*property_changed) (gchar * property, GValue * value);
+	void (*item_activated) (guint timestamp);
+	void (*child_added) (DbusmenuMenuitem * child, guint position);
+	void (*child_removed) (DbusmenuMenuitem * child);
+	void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint oldpos);
+	void (*realized) (void);
+
+	/* Virtual functions */
+	dbusmenu_menuitem_buildxml_slot_t buildxml;
+	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+	void (*send_about_to_show) (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
+
+	void (*reserved1) (void);
+	/* void (*reserved2) (void); */
+	/* void (*reserved3) (void); */
+	/* void (*reserved4) (void); -- realized, realloc when bumping lib version */
+} DbusmenuMenuitemClass;
+</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="DbusmenuMenuitemClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.property-changed"></a>property_changed</code></em> ()</span></p></td>
+<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed" title='The "property-changed" signal'><span class="type">"property-changed"</span></a>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.item-activated"></a>item_activated</code></em> ()</span></p></td>
+<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated" title='The "item-activated" signal'><span class="type">"item-activated"</span></a>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.child-added"></a>child_added</code></em> ()</span></p></td>
+<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added" title='The "child-added" signal'><span class="type">"child-added"</span></a>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.child-removed"></a>child_removed</code></em> ()</span></p></td>
+<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed" title='The "child-removed" signal'><span class="type">"child-removed"</span></a>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.child-moved"></a>child_moved</code></em> ()</span></p></td>
+<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved" title='The "child-moved" signal'><span class="type">"child-moved"</span></a>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.realized"></a>realized</code></em> ()</span></p></td>
+<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-realized" title='The "realized" signal'><span class="type">"realized"</span></a>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t" title="dbusmenu_menuitem_buildxml_slot_t ()"><span class="type">dbusmenu_menuitem_buildxml_slot_t</span></a> <em class="structfield"><code><a name="DbusmenuMenuitemClass.buildxml"></a>buildxml</code></em>;</span></p></td>
+<td>Virtual function that appends the strings required to represent this menu item in the menu XML file.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.handle-event"></a>handle_event</code></em> ()</span></p></td>
+<td>This function is to override how events are handled by subclasses.  Look at <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event" title="dbusmenu_menuitem_handle_event ()"><span class="type">dbusmenu_menuitem_handle_event</span></a> for lots of good information.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.send-about-to-show"></a>send_about_to_show</code></em> ()</span></p></td>
+<td>Virtual function that notifies server that the client is about to show a menu.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.reserved1"></a>reserved1</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_new ()">
+<a name="dbusmenu-menuitem-new"></a><h3>dbusmenu_menuitem_new ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_new               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Create a new <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> with all default values.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A newly allocated <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_new_with_id ()">
+<a name="dbusmenu-menuitem-new-with-id"></a><h3>dbusmenu_menuitem_new_with_id ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_new_with_id       (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);</pre>
+<p>
+This creates a blank <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> with a specific ID.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>ID to use for this menuitem
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A newly allocated <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_get_id ()">
+<a name="dbusmenu-menuitem-get-id"></a><h3>dbusmenu_menuitem_get_id ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                dbusmenu_menuitem_get_id            (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+Gets the unique ID for <em class="parameter"><code>mi</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to query.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The ID of the <em class="parameter"><code>mi</code></em>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_get_children ()">
+<a name="dbusmenu-menuitem-get-children"></a><h3>dbusmenu_menuitem_get_children ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             dbusmenu_menuitem_get_children      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+Returns simply the list of children that this menu item
+	has.  The list is valid until another child related function
+	is called, where it might be changed.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to query.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A <a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of pointers to <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_take_children ()">
+<a name="dbusmenu-menuitem-take-children"></a><h3>dbusmenu_menuitem_take_children ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             dbusmenu_menuitem_take_children     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+While the name sounds devious that's exactly what this function
+	does.  It takes the list of children from the <em class="parameter"><code>mi</code></em> and clears the
+	internal list.  The calling function is now in charge of the ref's
+	on the children it has taken.  A lot of responsibility involved
+	in taking children.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenMenuitem</span> to take the children from.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A <a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of pointers to <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_get_position ()">
+<a name="dbusmenu-menuitem-get-position"></a><h3>dbusmenu_menuitem_get_position ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               dbusmenu_menuitem_get_position      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre>
+<p>
+This function returns the position of the menu item <em class="parameter"><code>mi</code></em>
+	in the children of <em class="parameter"><code>parent</code></em>.  It will return zero if the
+	menu item can't be found.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to find the position of
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> who's children contain <em class="parameter"><code>mi</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The position of <em class="parameter"><code>mi</code></em> in the children of <em class="parameter"><code>parent</code></em>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_get_position_realized ()">
+<a name="dbusmenu-menuitem-get-position-realized"></a><h3>dbusmenu_menuitem_get_position_realized ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               dbusmenu_menuitem_get_position_realized
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre>
+<p>
+This function is very similar to <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position" title="dbusmenu_menuitem_get_position ()"><span class="type">dbusmenu_menuitem_get_position</span></a>
+	except that it only counts in the children that have been realized.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to find the position of
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> who's children contain <em class="parameter"><code>mi</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The position of <em class="parameter"><code>mi</code></em> in the realized children of <em class="parameter"><code>parent</code></em>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_child_append ()">
+<a name="dbusmenu-menuitem-child-append"></a><h3>dbusmenu_menuitem_child_append ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_append      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);</pre>
+<p>
+This function adds <em class="parameter"><code>child</code></em> to the list of children on <em class="parameter"><code>mi</code></em> at
+	the end of that list.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which will become a new parent
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenMenuitem</span> that will be a child
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> Whether the child has been added successfully.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_child_prepend ()">
+<a name="dbusmenu-menuitem-child-prepend"></a><h3>dbusmenu_menuitem_child_prepend ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_prepend     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);</pre>
+<p>
+This function adds <em class="parameter"><code>child</code></em> to the list of children on <em class="parameter"><code>mi</code></em> at
+	the beginning of that list.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which will become a new parent
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenMenuitem</span> that will be a child
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> Whether the child has been added successfully.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_child_delete ()">
+<a name="dbusmenu-menuitem-child-delete"></a><h3>dbusmenu_menuitem_child_delete ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_delete      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);</pre>
+<p>
+This function removes <em class="parameter"><code>child</code></em> from the children list of <em class="parameter"><code>mi</code></em>.  It does
+	not call <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><span class="type">g_object_unref</span></a> on <em class="parameter"><code>child</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which has <em class="parameter"><code>child</code></em> as a child
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
+<td>The child <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that you want to no longer
+	    be a child of <em class="parameter"><code>mi</code></em>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> If we were able to delete <em class="parameter"><code>child</code></em>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_child_add_position ()">
+<a name="dbusmenu-menuitem-child-add-position"></a><h3>dbusmenu_menuitem_child_add_position ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_add_position
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);</pre>
+<p>
+Puts <em class="parameter"><code>child</code></em> in the list of children for <em class="parameter"><code>mi</code></em> at the location
+	specified in <em class="parameter"><code>position</code></em>.  If there is not enough entires available
+	then <em class="parameter"><code>child</code></em> will be placed at the end of the list.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that we're adding the child <em class="parameter"><code>child</code></em> to.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to make a child of <em class="parameter"><code>mi</code></em>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>position</code></em> :</span></p></td>
+<td>Where in <em class="parameter"><code>mi</code></em> object's list of chidren <em class="parameter"><code>child</code></em> should be placed.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> Whether <em class="parameter"><code>child</code></em> was added successfully.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_child_reorder ()">
+<a name="dbusmenu-menuitem-child-reorder"></a><h3>dbusmenu_menuitem_child_reorder ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_reorder     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);</pre>
+<p>
+This function moves a child on the list of children.  It is
+	for a child that is already in the list, but simply needs a 
+	new location.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that is a child needing to be moved
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>position</code></em> :</span></p></td>
+<td>The position in the list to place it in
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> Whether the move was successful.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_child_find ()">
+<a name="dbusmenu-menuitem-child-find"></a><h3>dbusmenu_menuitem_child_find ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_child_find        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);</pre>
+<p>
+Search the children of <em class="parameter"><code>mi</code></em> to find one with the ID of <em class="parameter"><code>id</code></em>.
+	If it doesn't exist then we return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> who's children to look on
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>The ID of the child that we're looking for.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The menu item with the ID <em class="parameter"><code>id</code></em> or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if it
+	   can't be found.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_find_id ()">
+<a name="dbusmenu-menuitem-find-id"></a><h3>dbusmenu_menuitem_find_id ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_find_id           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);</pre>
+<p>
+This function searchs the whole tree of children that
+	are attached to <em class="parameter"><code>mi</code></em>.  This could be quite a few nodes, all
+	the way down the tree.  It is a depth first search.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> at the top of the tree to search
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>ID of the <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to search for
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> with the ID of <em class="parameter"><code>id</code></em>
+		or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if there isn't such a menu item in the tree
+		represented by <em class="parameter"><code>mi</code></em>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_set ()">
+<a name="dbusmenu-menuitem-property-set"></a><h3>dbusmenu_menuitem_property_set ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);</pre>
+<p>
+Takes the pair of <em class="parameter"><code>property</code></em> and <em class="parameter"><code>value</code></em> and places them as a
+	property on <em class="parameter"><code>mi</code></em>.  If a property already exists by that name,
+	then the value is set to the new value.  If not, the property
+	is added.  If the value is changed or the property was previously
+	unset then the signal <span class="type">"prop-changed"</span> will be
+	emitted by this function.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>Name of the property to set.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>The value of the property.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>  A boolean representing if the property value was set.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_set_value ()">
+<a name="dbusmenu-menuitem-property-set-value"></a><h3>dbusmenu_menuitem_property_set_value ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_value
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_set_bool ()">
+<a name="dbusmenu-menuitem-property-set-bool"></a><h3>dbusmenu_menuitem_property_set_bool ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_bool (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
+<p>
+Takes a boolean <em class="parameter"><code>value</code></em> and sets it on <em class="parameter"><code>property</code></em> as a
+	property on <em class="parameter"><code>mi</code></em>.  If a property already exists by that name,
+	then the value is set to the new value.  If not, the property
+	is added.  If the value is changed or the property was previously
+	unset then the signal <span class="type">"prop-changed"</span> will be
+	emitted by this function.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>Name of the property to set.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>The value of the property.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>  A boolean representing if the property value was set.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_set_int ()">
+<a name="dbusmenu-menuitem-property-set-int"></a><h3>dbusmenu_menuitem_property_set_int ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_int  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> value</code></em>);</pre>
+<p>
+Takes a boolean <em class="parameter"><code>value</code></em> and sets it on <em class="parameter"><code>property</code></em> as a
+	property on <em class="parameter"><code>mi</code></em>.  If a property already exists by that name,
+	then the value is set to the new value.  If not, the property
+	is added.  If the value is changed or the property was previously
+	unset then the signal <span class="type">"prop-changed"</span> will be
+	emitted by this function.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>Name of the property to set.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>The value of the property.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>  A boolean representing if the property value was set.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_get ()">
+<a name="dbusmenu-menuitem-property-get"></a><h3>dbusmenu_menuitem_property_get ()</h3>
+<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       dbusmenu_menuitem_property_get      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
+	it exits.  <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> will be returned if the property doesn't
+	exist.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>The property to grab.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A string with the value of the property
+		that shouldn't be free'd.  Or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if the property
+		is not set or is not a string.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_get_value ()">
+<a name="dbusmenu-menuitem-property-get-value"></a><h3>dbusmenu_menuitem_property_get_value ()</h3>
+<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="returnvalue">GValue</span></a> *      dbusmenu_menuitem_property_get_value
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
+	it exits.  <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> will be returned if the property doesn't
+	exist.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>The property to grab.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A GValue for the property.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_get_bool ()">
+<a name="dbusmenu-menuitem-property-get-bool"></a><h3>dbusmenu_menuitem_property_get_bool ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_get_bool (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
+	it exits.  Returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> if the property doesn't exist.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>The property to grab.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The value of the property or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_get_int ()">
+<a name="dbusmenu-menuitem-property-get-int"></a><h3>dbusmenu_menuitem_property_get_int ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                dbusmenu_menuitem_property_get_int  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
+	it exits.  Returns zero if the property doesn't exist.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>The property to grab.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The value of the property or zero.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_exist ()">
+<a name="dbusmenu-menuitem-property-exist"></a><h3>dbusmenu_menuitem_property_exist ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_exist    (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_properties_list ()">
+<a name="dbusmenu-menuitem-properties-list"></a><h3>dbusmenu_menuitem_properties_list ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             dbusmenu_menuitem_properties_list   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+This functiong gets a list of the names of all the properties
+	that are set on this menu item.  This data on the list is owned
+	by the menuitem but the list is not and should be freed using
+	<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a> when the calling function is done with it.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to list the properties on
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A list of strings or NULL if there are none.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_properties_copy ()">
+<a name="dbusmenu-menuitem-properties-copy"></a><h3>dbusmenu_menuitem_properties_copy ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        dbusmenu_menuitem_properties_copy   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+This function takes the properties of a <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>
+	and puts them into a <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> that is referenced by the
+	key of a string and has the value of a string.  The hash
+	table may not have any entries if there aren't any or there
+	is an error in processing.  It is the caller's responsibility
+	to destroy the created <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that we're interested in the properties of
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A brand new <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> that contains all of the
+		properties that are on this <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> <em class="parameter"><code>mi</code></em>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_remove ()">
+<a name="dbusmenu-menuitem-property-remove"></a><h3>dbusmenu_menuitem_property_remove ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_property_remove   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+Removes a property from the menuitem.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to remove the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>The property to look for.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_set_root ()">
+<a name="dbusmenu-menuitem-set-root"></a><h3>dbusmenu_menuitem_set_root ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_set_root          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> root</code></em>);</pre>
+<p>
+This function sets the internal value of whether this is a
+	root node or not.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set whether it's root
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>root</code></em> :</span></p></td>
+<td>Whether <em class="parameter"><code>mi</code></em> is a root node or not
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_get_root ()">
+<a name="dbusmenu-menuitem-get-root"></a><h3>dbusmenu_menuitem_get_root ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_get_root          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+This function returns the internal value of whether this is a
+	root node or not.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to see whether it's root
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> if this is a root node
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_foreach ()">
+<a name="dbusmenu-menuitem-foreach"></a><h3>dbusmenu_menuitem_foreach ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_foreach           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> (funcDbusmenuMenuitem * mi, gpointer data) ()</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>);</pre>
+<p>
+This calls the function <em class="parameter"><code>func</code></em> on this menu item and all
+	of the children of this item.  And their children.  And
+	their children.  And... you get the point.  It will get
+	called on the whole tree.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenItem</span> to start from
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
+<td> User data to pass to the function. closure</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_handle_event ()">
+<a name="dbusmenu-menuitem-handle-event"></a><h3>dbusmenu_menuitem_handle_event ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_handle_event      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timestamp</code></em>);</pre>
+<p>
+This function is called to create an event.  It is likely
+	to be overrided by subclasses.  The default menu item
+	will respond to the activate signal and do:
+</p>
+<p>
+	Emits the <span class="type">"item-activate"</span> signal on this
+	menu item.  Called by server objects when they get the
+	appropriate DBus signals from the client.
+</p>
+<p>
+	If you subclass this function you should really think
+	about calling the parent function unless you have a good
+	reason not to.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to send the signal on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>The name of the signal
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>A value that could be set for the event
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
+<td>The timestamp of when the event happened
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_send_about_to_show ()">
+<a name="dbusmenu-menuitem-send-about-to-show"></a><h3>dbusmenu_menuitem_send_about_to_show ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_send_about_to_show
+                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()"><span class="type">dbusmenu_menuitem_about_to_show_cb</span></a> cb</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> cb_data</code></em>);</pre>
+<p>
+This function is used to send the even that the submenu
+	of this item is about to be shown.  Callers to this event
+	should delay showing the menu until their callback is
+	called if possible.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to send the signal on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>cb</code></em> :</span></p></td>
+<td>Callback to call when the call has returned.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>cb_data</code></em> :</span></p></td>
+<td> Data to pass to the callback.. closure</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1" title="Property Details">
+<a name="DbusmenuMenuitem.property-details"></a><h2>Property Details</h2>
+<div class="refsect2" title='The "id" property'>
+<a name="DbusmenuMenuitem--id"></a><h3>The <code class="literal">"id"</code> property</h3>
+<pre class="programlisting">  "id"                       <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct Only</pre>
+<p>This is a unique indentifier for the menu item.</p>
+<p>Allowed values: [G_MAXULONG,30000]</p>
+<p>Default value: -1</p>
+</div>
+</div>
+<div class="refsect1" title="Signal Details">
+<a name="DbusmenuMenuitem.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2" title='The "child-added" signal'>
+<a name="DbusmenuMenuitem-child-added"></a><h3>The <code class="literal">"child-added"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
+                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg2,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
+<p>
+Signaled when the child menuitem has been added to
+		the parent.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the parent.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the child.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
+<td>The position that the child is being added in.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title='The "child-moved" signal'>
+<a name="DbusmenuMenuitem-child-moved"></a><h3>The <code class="literal">"child-moved"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
+                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg2,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg3,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
+<p>
+Signaled when the child menuitem has had it's location
+		in the list change.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the parent.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the child.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
+<td>The position that the child is being moved to.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg3</code></em> :</span></p></td>
+<td>The position that the child is was in.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title='The "child-removed" signal'>
+<a name="DbusmenuMenuitem-child-removed"></a><h3>The <code class="literal">"child-removed"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
+                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
+<p>
+Signaled when the child menuitem has been requested to
+		be removed from the parent.  This signal is called when
+		it has been removed from the list but not yet had
+		<a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><span class="type">g_object_unref</span></a> called on it.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which was the parent.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which was the child.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title='The "item-activated" signal'>
+<a name="DbusmenuMenuitem-item-activated"></a><h3>The <code class="literal">"item-activated"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
+<p>
+Emitted on the objects on the server side when
+		they are signaled on the client side.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
+<td>The timestamp of when it was activated
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title='The "property-changed" signal'>
+<a name="DbusmenuMenuitem-property-changed"></a><h3>The <code class="literal">"property-changed"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>            *arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          arg2,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
+<p>
+Emitted everytime a property on a menuitem is either
+		updated or added.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
+<td>The name of the property that changed
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
+<td>The new value of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title='The "realized" signal'>
+<a name="DbusmenuMenuitem-realized"></a><h3>The <code class="literal">"realized"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
+<p>
+Emitted when the initial request for properties
+		is complete on the item.  If there is a type
+		handler configured for the "type" parameter
+		that will be executed before this is signaled.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html b/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html
new file mode 100644
index 0000000..b5efc96
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuMenuitemProxy</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">
+<link rel="next" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-glib-DbusmenuServer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="DbusmenuMenuitem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#DbusmenuMenuitemProxy.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#DbusmenuMenuitemProxy.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#DbusmenuMenuitemProxy.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#DbusmenuMenuitemProxy.properties" class="shortcut">Properties</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuMenuitemProxy">
+<a name="DbusmenuMenuitemProxy"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="DbusmenuMenuitemProxy.top_of_page"></a>DbusmenuMenuitemProxy</span></h2>
+<p>DbusmenuMenuitemProxy</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="DbusmenuMenuitemProxy.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">                    <a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy-struct" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>;
+                    <a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxyClass" title="DbusmenuMenuitemProxyClass">DbusmenuMenuitemProxyClass</a>;
+<a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="returnvalue">DbusmenuMenuitemProxy</span></a> * <a class="link" href="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-new" title="dbusmenu_menuitem_proxy_new ()">dbusmenu_menuitem_proxy_new</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-get-wrapped" title="dbusmenu_menuitem_proxy_get_wrapped ()">dbusmenu_menuitem_proxy_get_wrapped</a> (<em class="parameter"><code><a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> *pmi</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="DbusmenuMenuitemProxy.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+         +----DbusmenuMenuitemProxy
+</pre>
+</div>
+<div class="refsect1" title="Properties">
+<a name="DbusmenuMenuitemProxy.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy--menu-item" title='The "menu-item" property'>menu-item</a>"                <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>*     : Read / Write / Construct Only
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="DbusmenuMenuitemProxy.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="DbusmenuMenuitemProxy.details"></a><h2>Details</h2>
+<div class="refsect2" title="DbusmenuMenuitemProxy">
+<a name="DbusmenuMenuitemProxy-struct"></a><h3>DbusmenuMenuitemProxy</h3>
+<pre class="programlisting">typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuMenuitemProxyClass">
+<a name="DbusmenuMenuitemProxyClass"></a><h3>DbusmenuMenuitemProxyClass</h3>
+<pre class="programlisting">typedef struct {
+	DbusmenuMenuitemClass parent_class;
+} DbusmenuMenuitemProxyClass;
+</pre>
+<p>
+Functions and signal slots for <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitemClass" title="DbusmenuMenuitemClass"><span class="type">DbusmenuMenuitemClass</span></a> <em class="structfield"><code><a name="DbusmenuMenuitemProxyClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>The Class of <span class="type">DbusmeneMenuitem</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_proxy_new ()">
+<a name="dbusmenu-menuitem-proxy-new"></a><h3>dbusmenu_menuitem_proxy_new ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="returnvalue">DbusmenuMenuitemProxy</span></a> * dbusmenu_menuitem_proxy_new     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
+<p>
+Builds a new <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> object that proxies
+	all of the values for <em class="parameter"><code>mi</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
+<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to proxy
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A new <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> object.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_proxy_get_wrapped ()">
+<a name="dbusmenu-menuitem-proxy-get-wrapped"></a><h3>dbusmenu_menuitem_proxy_get_wrapped ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_proxy_get_wrapped (<em class="parameter"><code><a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> *pmi</code></em>);</pre>
+<p>
+Accesses the private variable of which <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>
+	we are doing the proxying for.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pmi</code></em> :</span></p></td>
+<td>
+<a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> to look into
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object or a <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if we
+		don't have one or there is an error.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1" title="Property Details">
+<a name="DbusmenuMenuitemProxy.property-details"></a><h2>Property Details</h2>
+<div class="refsect2" title='The "menu-item" property'>
+<a name="DbusmenuMenuitemProxy--menu-item"></a><h3>The <code class="literal">"menu-item"</code> property</h3>
+<pre class="programlisting">  "menu-item"                <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>*     : Read / Write / Construct Only</pre>
+<p>An instance of the DbusmenuMenuitem class that this menuitem will mimic.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/annotation-glossary.html b/docs/libdbusmenu-glib/reference/html/annotation-glossary.html
new file mode 100644
index 0000000..7fa1d86
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/annotation-glossary.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Annotation Glossary</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="prev" href="api-index-full.html" title="API Index">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="api-index-full.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td> </td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#glsA">A</a>
+                      | 
+                   <a class="shortcut" href="#glsE">E</a>
+                      | 
+                   <a class="shortcut" href="#glsI">I</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+</td></tr>
+</table>
+<div class="glossary" title="Annotation Glossary">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt>
+<a name="annotation-glossterm-array"></a>array</dt>
+<dd><p>Parameter points to an array of items.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt>
+<a name="annotation-glossterm-element-type"></a>element-type</dt>
+<dd><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsI"></a><h3 class="title">I</h3>
+<dt>
+<a name="annotation-glossterm-inout"></a>inout</dt>
+<dd><p>Parameter for input and for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<dt>
+<a name="annotation-glossterm-in"></a>in</dt>
+<dd><p>Parameter for input. Default is <acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20full"></a>transfer full</dt>
+<dd><p>Free data after the code is done.</p></dd>
+<dt>
+<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
+<dd><p>Don't free data after the code is done.</p></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/api-index-full.html b/docs/libdbusmenu-glib/reference/html/api-index-full.html
new file mode 100644
index 0000000..63813a6
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/api-index-full.html
@@ -0,0 +1,618 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API Index</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="prev" href="object-tree.html" title="Object Hierarchy">
+<link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="object-tree.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#idxG">G</a>
+                      | 
+                   <a class="shortcut" href="#idxM">M</a>
+                      | 
+                   <a class="shortcut" href="#idxO">O</a>
+</td></tr>
+</table>
+<div class="index" title="API Index">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="api-index-full"></a>API Index</h2></div></div></div>
+<a name="idx"></a><a name="idxG"></a><h3 class="title">G</h3>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu" title="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu">DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boolean" title="g_marshal_value_peek_boolean()">g_marshal_value_peek_boolean</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boxed" title="g_marshal_value_peek_boxed()">g_marshal_value_peek_boxed</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-char" title="g_marshal_value_peek_char()">g_marshal_value_peek_char</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-double" title="g_marshal_value_peek_double()">g_marshal_value_peek_double</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-enum" title="g_marshal_value_peek_enum()">g_marshal_value_peek_enum</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-flags" title="g_marshal_value_peek_flags()">g_marshal_value_peek_flags</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-float" title="g_marshal_value_peek_float()">g_marshal_value_peek_float</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int" title="g_marshal_value_peek_int()">g_marshal_value_peek_int</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int64" title="g_marshal_value_peek_int64()">g_marshal_value_peek_int64</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-long" title="g_marshal_value_peek_long()">g_marshal_value_peek_long</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-object" title="g_marshal_value_peek_object()">g_marshal_value_peek_object</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-param" title="g_marshal_value_peek_param()">g_marshal_value_peek_param</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-pointer" title="g_marshal_value_peek_pointer()">g_marshal_value_peek_pointer</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-string" title="g_marshal_value_peek_string()">g_marshal_value_peek_string</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uchar" title="g_marshal_value_peek_uchar()">g_marshal_value_peek_uchar</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint" title="g_marshal_value_peek_uint()">g_marshal_value_peek_uint</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint64" title="g_marshal_value_peek_uint64()">g_marshal_value_peek_uint64</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-ulong" title="g_marshal_value_peek_ulong()">g_marshal_value_peek_ulong</a>, macro in <a class="link" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">dbusmenu-server</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()">dbus_g_proxy_begin_call</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<a name="idxM"></a><h3 class="title">M</h3>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass" title="DbusmenuClientClass">DbusmenuClientClass</a>, struct in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuClientMenuitem.html#DbusmenuClientMenuitem-struct" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>, struct in <a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuClientMenuitem.html#DbusmenuClientMenuitemClass" title="DbusmenuClientMenuitemClass">DbusmenuClientMenuitemClass</a>, struct in <a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler" title="DbusmenuClientTypeHandler ()">DbusmenuClientTypeHandler</a>, user_function in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-struct" title="DbusmenuMenuitem">DbusmenuMenuitem</a>, struct in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added" title='The "child-added" signal'>DbusmenuMenuitem::child-added</a>, object signal in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved" title='The "child-moved" signal'>DbusmenuMenuitem::child-moved</a>, object signal in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed" title='The "child-removed" signal'>DbusmenuMenuitem::child-removed</a>, object signal in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated" title='The "item-activated" signal'>DbusmenuMenuitem::item-activated</a>, object signal in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed" title='The "property-changed" signal'>DbusmenuMenuitem::property-changed</a>, object signal in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-realized" title='The "realized" signal'>DbusmenuMenuitem::realized</a>, object signal in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem--id" title='The "id" property'>DbusmenuMenuitem:id</a>, object property in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitemClass" title="DbusmenuMenuitemClass">DbusmenuMenuitemClass</a>, struct in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy-struct" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>, struct in <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy--menu-item" title='The "menu-item" property'>DbusmenuMenuitemProxy:menu-item</a>, object property in <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxyClass" title="DbusmenuMenuitemProxyClass">DbusmenuMenuitemProxyClass</a>, struct in <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DbusmenuServerClass" title="DbusmenuServerClass">DbusmenuServerClass</a>, struct in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-add-type-handler" title="dbusmenu_client_add_type_handler ()">dbusmenu_client_add_type_handler</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-get-root" title="dbusmenu_client_get_root ()">dbusmenu_client_get_root</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuClientMenuitem.html#dbusmenu-client-menuitem-new" title="dbusmenu_client_menuitem_new ()">dbusmenu_client_menuitem_new</a>, function in <a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuClientMenuitem.html#DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS" title="DBUSMENU_CLIENT_MENUITEM_TYPE">DBUSMENU_CLIENT_MENUITEM_TYPE</a>, macro in <a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-new" title="dbusmenu_client_new ()">dbusmenu_client_new</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS" title="DBUSMENU_CLIENT_PROP_DBUS_NAME">DBUSMENU_CLIENT_PROP_DBUS_NAME</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS" title="DBUSMENU_CLIENT_PROP_DBUS_OBJECT">DBUSMENU_CLIENT_PROP_DBUS_OBJECT</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-about-to-show" title="dbusmenu_client_send_about_to_show ()">dbusmenu_client_send_about_to_show</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-event" title="dbusmenu_client_send_event ()">dbusmenu_client_send_event</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS" title="DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED">DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS" title="DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM">DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS" title="DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED">DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS" title="DBUSMENU_CLIENT_TYPES_DEFAULT">DBUSMENU_CLIENT_TYPES_DEFAULT</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-IMAGE:CAPS" title="DBUSMENU_CLIENT_TYPES_IMAGE">DBUSMENU_CLIENT_TYPES_IMAGE</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS" title="DBUSMENU_CLIENT_TYPES_SEPARATOR">DBUSMENU_CLIENT_TYPES_SEPARATOR</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">DbusmenuClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()">dbusmenu_menuitem_about_to_show_cb</a>, user_function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t" title="dbusmenu_menuitem_buildxml_slot_t ()">dbusmenu_menuitem_buildxml_slot_t</a>, user_function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-add-position" title="dbusmenu_menuitem_child_add_position ()">dbusmenu_menuitem_child_add_position</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-append" title="dbusmenu_menuitem_child_append ()">dbusmenu_menuitem_child_append</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-delete" title="dbusmenu_menuitem_child_delete ()">dbusmenu_menuitem_child_delete</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-find" title="dbusmenu_menuitem_child_find ()">dbusmenu_menuitem_child_find</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-prepend" title="dbusmenu_menuitem_child_prepend ()">dbusmenu_menuitem_child_prepend</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-reorder" title="dbusmenu_menuitem_child_reorder ()">dbusmenu_menuitem_child_reorder</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-find-id" title="dbusmenu_menuitem_find_id ()">dbusmenu_menuitem_find_id</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-foreach" title="dbusmenu_menuitem_foreach ()">dbusmenu_menuitem_foreach</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-children" title="dbusmenu_menuitem_get_children ()">dbusmenu_menuitem_get_children</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-id" title="dbusmenu_menuitem_get_id ()">dbusmenu_menuitem_get_id</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position" title="dbusmenu_menuitem_get_position ()">dbusmenu_menuitem_get_position</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position-realized" title="dbusmenu_menuitem_get_position_realized ()">dbusmenu_menuitem_get_position_realized</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-root" title="dbusmenu_menuitem_get_root ()">dbusmenu_menuitem_get_root</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event" title="dbusmenu_menuitem_handle_event ()">dbusmenu_menuitem_handle_event</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS" title="DBUSMENU_MENUITEM_ICON_NAME_BLANK">DBUSMENU_MENUITEM_ICON_NAME_BLANK</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-new" title="dbusmenu_menuitem_new ()">dbusmenu_menuitem_new</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-new-with-id" title="dbusmenu_menuitem_new_with_id ()">dbusmenu_menuitem_new_with_id</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-copy" title="dbusmenu_menuitem_properties_copy ()">dbusmenu_menuitem_properties_copy</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-list" title="dbusmenu_menuitem_properties_list ()">dbusmenu_menuitem_properties_list</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-exist" title="dbusmenu_menuitem_property_exist ()">dbusmenu_menuitem_property_exist</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get" title="dbusmenu_menuitem_property_get ()">dbusmenu_menuitem_property_get</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-bool" title="dbusmenu_menuitem_property_get_bool ()">dbusmenu_menuitem_property_get_bool</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-int" title="dbusmenu_menuitem_property_get_int ()">dbusmenu_menuitem_property_get_int</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-value" title="dbusmenu_menuitem_property_get_value ()">dbusmenu_menuitem_property_get_value</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-remove" title="dbusmenu_menuitem_property_remove ()">dbusmenu_menuitem_property_remove</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set" title="dbusmenu_menuitem_property_set ()">dbusmenu_menuitem_property_set</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-bool" title="dbusmenu_menuitem_property_set_bool ()">dbusmenu_menuitem_property_set_bool</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-int" title="dbusmenu_menuitem_property_set_int ()">dbusmenu_menuitem_property_set_int</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-value" title="dbusmenu_menuitem_property_set_value ()">dbusmenu_menuitem_property_set_value</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ENABLED:CAPS" title="DBUSMENU_MENUITEM_PROP_ENABLED">DBUSMENU_MENUITEM_PROP_ENABLED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS" title="DBUSMENU_MENUITEM_PROP_ICON_DATA">DBUSMENU_MENUITEM_PROP_ICON_DATA</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS" title="DBUSMENU_MENUITEM_PROP_ICON_NAME">DBUSMENU_MENUITEM_PROP_ICON_NAME</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-LABEL:CAPS" title="DBUSMENU_MENUITEM_PROP_LABEL">DBUSMENU_MENUITEM_PROP_LABEL</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS" title="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE">DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS" title="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE">DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TYPE:CAPS" title="DBUSMENU_MENUITEM_PROP_TYPE">DBUSMENU_MENUITEM_PROP_TYPE</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS" title="DBUSMENU_MENUITEM_PROP_VISIBLE">DBUSMENU_MENUITEM_PROP_VISIBLE</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-get-wrapped" title="dbusmenu_menuitem_proxy_get_wrapped ()">dbusmenu_menuitem_proxy_get_wrapped</a>, function in <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-new" title="dbusmenu_menuitem_proxy_new ()">dbusmenu_menuitem_proxy_new</a>, function in <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-send-about-to-show" title="dbusmenu_menuitem_send_about_to_show ()">dbusmenu_menuitem_send_about_to_show</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-set-root" title="dbusmenu_menuitem_set_root ()">dbusmenu_menuitem_set_root</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED">DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED">DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED">DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED">DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED">DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED">DBUSMENU_MENUITEM_SIGNAL_REALIZED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID">DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-take-children" title="dbusmenu_menuitem_take_children ()">dbusmenu_menuitem_take_children</a>, function in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_CHECK">DBUSMENU_MENUITEM_TOGGLE_CHECK</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_RADIO">DBUSMENU_MENUITEM_TOGGLE_RADIO</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED">DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED">DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN">DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</a>, macro in <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-new" title="dbusmenu_server_new ()">dbusmenu_server_new</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS" title="DBUSMENU_SERVER_PROP_DBUS_OBJECT">DBUSMENU_SERVER_PROP_DBUS_OBJECT</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS" title="DBUSMENU_SERVER_PROP_ROOT_NODE">DBUSMENU_SERVER_PROP_ROOT_NODE</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-VERSION:CAPS" title="DBUSMENU_SERVER_PROP_VERSION">DBUSMENU_SERVER_PROP_VERSION</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-set-root" title="dbusmenu_server_set_root ()">dbusmenu_server_set_root</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS" title="DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE">DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS" title="DBUSMENU_SERVER_SIGNAL_ID_UPDATE">DBUSMENU_SERVER_SIGNAL_ID_UPDATE</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS" title="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS" title="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">DbusmenuServer</a>
+</dt>
+<dd></dd>
+<a name="idxO"></a><h3 class="title">O</h3>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show" title="org_ayatana_dbusmenu_about_to_show ()">org_ayatana_dbusmenu_about_to_show</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-async" title="org_ayatana_dbusmenu_about_to_show_async ()">org_ayatana_dbusmenu_about_to_show_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()">org_ayatana_dbusmenu_about_to_show_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event" title="org_ayatana_dbusmenu_event ()">org_ayatana_dbusmenu_event</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-async" title="org_ayatana_dbusmenu_event_async ()">org_ayatana_dbusmenu_event_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()">org_ayatana_dbusmenu_event_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children" title="org_ayatana_dbusmenu_get_children ()">org_ayatana_dbusmenu_get_children</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-async" title="org_ayatana_dbusmenu_get_children_async ()">org_ayatana_dbusmenu_get_children_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()">org_ayatana_dbusmenu_get_children_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties" title="org_ayatana_dbusmenu_get_group_properties ()">org_ayatana_dbusmenu_get_group_properties</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-async" title="org_ayatana_dbusmenu_get_group_properties_async ()">org_ayatana_dbusmenu_get_group_properties_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()">org_ayatana_dbusmenu_get_group_properties_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout" title="org_ayatana_dbusmenu_get_layout ()">org_ayatana_dbusmenu_get_layout</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-async" title="org_ayatana_dbusmenu_get_layout_async ()">org_ayatana_dbusmenu_get_layout_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()">org_ayatana_dbusmenu_get_layout_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties" title="org_ayatana_dbusmenu_get_properties ()">org_ayatana_dbusmenu_get_properties</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-async" title="org_ayatana_dbusmenu_get_properties_async ()">org_ayatana_dbusmenu_get_properties_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()">org_ayatana_dbusmenu_get_properties_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property" title="org_ayatana_dbusmenu_get_property ()">org_ayatana_dbusmenu_get_property</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-async" title="org_ayatana_dbusmenu_get_property_async ()">org_ayatana_dbusmenu_get_property_async</a>, function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()">org_ayatana_dbusmenu_get_property_reply</a>, user_function in <a class="link" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">dbusmenu-client</a>
+</dt>
+<dd></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html
new file mode 100644
index 0000000..45d79b3
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/ch01.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="prev" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="next" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-glib-DbusmenuServer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter" title="API">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id364928"></a>API</h2></div></div></div>
+<div class="toc"><dl>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="DbusmenuMenuitemProxy.html">DbusmenuMenuitemProxy</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="DbusmenuMenuitem.html">DbusmenuMenuitem</a></span><span class="refpurpose"> — A lowlevel represenation of a menuitem</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuClient.html">DbusmenuClient</a></span><span class="refpurpose"> — The catcher of all the server traffic</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="DbusmenuClientMenuitem.html">DbusmenuClientMenuitem</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-dbusmenu-client.html">dbusmenu-client</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-dbusmenu-server.html">dbusmenu-server</a></span><span class="refpurpose"></span>
+</dt>
+</dl></div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/home.png b/docs/libdbusmenu-glib/reference/html/home.png
new file mode 100644
index 0000000..1700361
Binary files /dev/null and b/docs/libdbusmenu-glib/reference/html/home.png differ
diff --git a/docs/libdbusmenu-glib/reference/html/index.html b/docs/libdbusmenu-glib/reference/html/index.html
new file mode 100644
index 0000000..89636dc
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>libdbusmenu-glib Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="next" href="ch01.html" title="API">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="book" title="libdbusmenu-glib Reference Manual">
+<div class="titlepage">
+<div><div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libdbusmenu-glib Reference Manual</p></th></tr></table></div></div>
+<hr>
+</div>
+<div class="toc"><dl>
+<dt><span class="chapter"><a href="ch01.html">API</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="DbusmenuMenuitemProxy.html">DbusmenuMenuitemProxy</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="DbusmenuMenuitem.html">DbusmenuMenuitem</a></span><span class="refpurpose"> — A lowlevel represenation of a menuitem</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuClient.html">DbusmenuClient</a></span><span class="refpurpose"> — The catcher of all the server traffic</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="DbusmenuClientMenuitem.html">DbusmenuClientMenuitem</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-dbusmenu-client.html">dbusmenu-client</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-glib-dbusmenu-server.html">dbusmenu-server</a></span><span class="refpurpose"></span>
+</dt>
+</dl></dd>
+<dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt>
+<dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt>
+<dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt>
+</dl></div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/index.sgml b/docs/libdbusmenu-glib/reference/html/index.sgml
new file mode 100644
index 0000000..7f7fb2f
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/index.sgml
@@ -0,0 +1,189 @@
+<ANCHOR id="libdbusmenu-glib-DbusmenuServer" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html">
+<ANCHOR id="libdbusmenu-glib-DbusmenuServer.synopsis" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#libdbusmenu-glib-DbusmenuServer.synopsis">
+<ANCHOR id="libdbusmenu-glib-DbusmenuServer.description" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#libdbusmenu-glib-DbusmenuServer.description">
+<ANCHOR id="libdbusmenu-glib-DbusmenuServer.details" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#libdbusmenu-glib-DbusmenuServer.details">
+<ANCHOR id="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS">
+<ANCHOR id="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS">
+<ANCHOR id="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS">
+<ANCHOR id="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS">
+<ANCHOR id="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS">
+<ANCHOR id="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS">
+<ANCHOR id="DBUSMENU-SERVER-PROP-VERSION:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-VERSION:CAPS">
+<ANCHOR id="DbusmenuServerClass" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServerClass">
+<ANCHOR id="dbusmenu-server-new" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-new">
+<ANCHOR id="dbusmenu-server-set-root" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-set-root">
+<ANCHOR id="DbusmenuMenuitemProxy" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html">
+<ANCHOR id="DbusmenuMenuitemProxy.synopsis" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy.synopsis">
+<ANCHOR id="DbusmenuMenuitemProxy.object-hierarchy" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy.object-hierarchy">
+<ANCHOR id="DbusmenuMenuitemProxy.properties" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy.properties">
+<ANCHOR id="DbusmenuMenuitemProxy.description" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy.description">
+<ANCHOR id="DbusmenuMenuitemProxy.details" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy.details">
+<ANCHOR id="DbusmenuMenuitemProxy-struct" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy-struct">
+<ANCHOR id="DbusmenuMenuitemProxyClass" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxyClass">
+<ANCHOR id="dbusmenu-menuitem-proxy-new" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-new">
+<ANCHOR id="dbusmenu-menuitem-proxy-get-wrapped" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-get-wrapped">
+<ANCHOR id="DbusmenuMenuitemProxy.property-details" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy.property-details">
+<ANCHOR id="DbusmenuMenuitemProxy--menu-item" href="libdbusmenu-glib/DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy--menu-item">
+<ANCHOR id="DbusmenuMenuitem" href="libdbusmenu-glib/DbusmenuMenuitem.html">
+<ANCHOR id="DbusmenuMenuitem.stability-level" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.stability-level">
+<ANCHOR id="DbusmenuMenuitem.synopsis" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.synopsis">
+<ANCHOR id="DbusmenuMenuitem.object-hierarchy" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.object-hierarchy">
+<ANCHOR id="DbusmenuMenuitem.properties" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.properties">
+<ANCHOR id="DbusmenuMenuitem.signals" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.signals">
+<ANCHOR id="DbusmenuMenuitem.description" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.description">
+<ANCHOR id="DbusmenuMenuitem.details" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.details">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-TYPE:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TYPE:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ENABLED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-LABEL:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-LABEL:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS">
+<ANCHOR id="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS" href="libdbusmenu-glib/DbusmenuMenuitem.html#DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS">
+<ANCHOR id="DbusmenuMenuitem-struct" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-struct">
+<ANCHOR id="dbusmenu-menuitem-about-to-show-cb" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb">
+<ANCHOR id="dbusmenu-menuitem-buildxml-slot-t" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t">
+<ANCHOR id="DbusmenuMenuitemClass" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitemClass">
+<ANCHOR id="dbusmenu-menuitem-new" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-new">
+<ANCHOR id="dbusmenu-menuitem-new-with-id" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-new-with-id">
+<ANCHOR id="dbusmenu-menuitem-get-id" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-get-id">
+<ANCHOR id="dbusmenu-menuitem-get-children" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-get-children">
+<ANCHOR id="dbusmenu-menuitem-take-children" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-take-children">
+<ANCHOR id="dbusmenu-menuitem-get-position" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-get-position">
+<ANCHOR id="dbusmenu-menuitem-get-position-realized" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-get-position-realized">
+<ANCHOR id="dbusmenu-menuitem-child-append" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-child-append">
+<ANCHOR id="dbusmenu-menuitem-child-prepend" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-child-prepend">
+<ANCHOR id="dbusmenu-menuitem-child-delete" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-child-delete">
+<ANCHOR id="dbusmenu-menuitem-child-add-position" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-child-add-position">
+<ANCHOR id="dbusmenu-menuitem-child-reorder" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-child-reorder">
+<ANCHOR id="dbusmenu-menuitem-child-find" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-child-find">
+<ANCHOR id="dbusmenu-menuitem-find-id" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-find-id">
+<ANCHOR id="dbusmenu-menuitem-property-set" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-set">
+<ANCHOR id="dbusmenu-menuitem-property-set-value" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-value">
+<ANCHOR id="dbusmenu-menuitem-property-set-bool" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-bool">
+<ANCHOR id="dbusmenu-menuitem-property-set-int" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-int">
+<ANCHOR id="dbusmenu-menuitem-property-get" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-get">
+<ANCHOR id="dbusmenu-menuitem-property-get-value" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-value">
+<ANCHOR id="dbusmenu-menuitem-property-get-bool" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-bool">
+<ANCHOR id="dbusmenu-menuitem-property-get-int" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-int">
+<ANCHOR id="dbusmenu-menuitem-property-exist" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-exist">
+<ANCHOR id="dbusmenu-menuitem-properties-list" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-properties-list">
+<ANCHOR id="dbusmenu-menuitem-properties-copy" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-properties-copy">
+<ANCHOR id="dbusmenu-menuitem-property-remove" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-property-remove">
+<ANCHOR id="dbusmenu-menuitem-set-root" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-set-root">
+<ANCHOR id="dbusmenu-menuitem-get-root" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-get-root">
+<ANCHOR id="dbusmenu-menuitem-foreach" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-foreach">
+<ANCHOR id="dbusmenu-menuitem-handle-event" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event">
+<ANCHOR id="dbusmenu-menuitem-send-about-to-show" href="libdbusmenu-glib/DbusmenuMenuitem.html#dbusmenu-menuitem-send-about-to-show">
+<ANCHOR id="DbusmenuMenuitem.property-details" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.property-details">
+<ANCHOR id="DbusmenuMenuitem--id" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem--id">
+<ANCHOR id="DbusmenuMenuitem.signal-details" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem.signal-details">
+<ANCHOR id="DbusmenuMenuitem-child-added" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-child-added">
+<ANCHOR id="DbusmenuMenuitem-child-moved" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved">
+<ANCHOR id="DbusmenuMenuitem-child-removed" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed">
+<ANCHOR id="DbusmenuMenuitem-item-activated" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated">
+<ANCHOR id="DbusmenuMenuitem-property-changed" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed">
+<ANCHOR id="DbusmenuMenuitem-realized" href="libdbusmenu-glib/DbusmenuMenuitem.html#DbusmenuMenuitem-realized">
+<ANCHOR id="libdbusmenu-glib-DbusmenuClient" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html">
+<ANCHOR id="libdbusmenu-glib-DbusmenuClient.stability-level" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#libdbusmenu-glib-DbusmenuClient.stability-level">
+<ANCHOR id="libdbusmenu-glib-DbusmenuClient.synopsis" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#libdbusmenu-glib-DbusmenuClient.synopsis">
+<ANCHOR id="libdbusmenu-glib-DbusmenuClient.description" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#libdbusmenu-glib-DbusmenuClient.description">
+<ANCHOR id="libdbusmenu-glib-DbusmenuClient.details" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#libdbusmenu-glib-DbusmenuClient.details">
+<ANCHOR id="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS">
+<ANCHOR id="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-IMAGE:CAPS">
+<ANCHOR id="DbusmenuClientClass" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass">
+<ANCHOR id="DbusmenuClientTypeHandler" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler">
+<ANCHOR id="dbusmenu-client-new" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-new">
+<ANCHOR id="dbusmenu-client-get-root" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-get-root">
+<ANCHOR id="dbusmenu-client-add-type-handler" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-add-type-handler">
+<ANCHOR id="dbusmenu-client-send-event" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-event">
+<ANCHOR id="dbusmenu-client-send-about-to-show" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-about-to-show">
+<ANCHOR id="DbusmenuClientMenuitem" href="libdbusmenu-glib/DbusmenuClientMenuitem.html">
+<ANCHOR id="DbusmenuClientMenuitem.synopsis" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DbusmenuClientMenuitem.synopsis">
+<ANCHOR id="DbusmenuClientMenuitem.object-hierarchy" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DbusmenuClientMenuitem.object-hierarchy">
+<ANCHOR id="DbusmenuClientMenuitem.description" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DbusmenuClientMenuitem.description">
+<ANCHOR id="DbusmenuClientMenuitem.details" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DbusmenuClientMenuitem.details">
+<ANCHOR id="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS">
+<ANCHOR id="DbusmenuClientMenuitem-struct" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DbusmenuClientMenuitem-struct">
+<ANCHOR id="DbusmenuClientMenuitemClass" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#DbusmenuClientMenuitemClass">
+<ANCHOR id="dbusmenu-client-menuitem-new" href="libdbusmenu-glib/DbusmenuClientMenuitem.html#dbusmenu-client-menuitem-new">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-client" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-client.synopsis" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#libdbusmenu-glib-dbusmenu-client.synopsis">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-client.description" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#libdbusmenu-glib-dbusmenu-client.description">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-client.details" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#libdbusmenu-glib-dbusmenu-client.details">
+<ANCHOR id="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu">
+<ANCHOR id="org-ayatana-dbusmenu-get-layout" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout">
+<ANCHOR id="org-ayatana-dbusmenu-get-layout-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply">
+<ANCHOR id="org-ayatana-dbusmenu-get-layout-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-async">
+<ANCHOR id="dbus-g-proxy-begin-call" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#dbus-g-proxy-begin-call">
+<ANCHOR id="org-ayatana-dbusmenu-get-group-properties" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties">
+<ANCHOR id="org-ayatana-dbusmenu-get-group-properties-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply">
+<ANCHOR id="org-ayatana-dbusmenu-get-group-properties-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-async">
+<ANCHOR id="org-ayatana-dbusmenu-get-children" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children">
+<ANCHOR id="org-ayatana-dbusmenu-get-children-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply">
+<ANCHOR id="org-ayatana-dbusmenu-get-children-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-async">
+<ANCHOR id="org-ayatana-dbusmenu-get-property" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property">
+<ANCHOR id="org-ayatana-dbusmenu-get-property-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply">
+<ANCHOR id="org-ayatana-dbusmenu-get-property-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-async">
+<ANCHOR id="org-ayatana-dbusmenu-get-properties" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties">
+<ANCHOR id="org-ayatana-dbusmenu-get-properties-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply">
+<ANCHOR id="org-ayatana-dbusmenu-get-properties-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-async">
+<ANCHOR id="org-ayatana-dbusmenu-event" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event">
+<ANCHOR id="org-ayatana-dbusmenu-event-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply">
+<ANCHOR id="org-ayatana-dbusmenu-event-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-async">
+<ANCHOR id="org-ayatana-dbusmenu-about-to-show" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show">
+<ANCHOR id="org-ayatana-dbusmenu-about-to-show-reply" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply">
+<ANCHOR id="org-ayatana-dbusmenu-about-to-show-async" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-async">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-server" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-server.synopsis" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#libdbusmenu-glib-dbusmenu-server.synopsis">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-server.description" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#libdbusmenu-glib-dbusmenu-server.description">
+<ANCHOR id="libdbusmenu-glib-dbusmenu-server.details" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#libdbusmenu-glib-dbusmenu-server.details">
+<ANCHOR id="g-marshal-value-peek-boolean" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boolean">
+<ANCHOR id="g-marshal-value-peek-char" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-char">
+<ANCHOR id="g-marshal-value-peek-uchar" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uchar">
+<ANCHOR id="g-marshal-value-peek-int" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int">
+<ANCHOR id="g-marshal-value-peek-uint" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint">
+<ANCHOR id="g-marshal-value-peek-long" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-long">
+<ANCHOR id="g-marshal-value-peek-ulong" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-ulong">
+<ANCHOR id="g-marshal-value-peek-int64" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int64">
+<ANCHOR id="g-marshal-value-peek-uint64" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint64">
+<ANCHOR id="g-marshal-value-peek-enum" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-enum">
+<ANCHOR id="g-marshal-value-peek-flags" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-flags">
+<ANCHOR id="g-marshal-value-peek-float" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-float">
+<ANCHOR id="g-marshal-value-peek-double" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-double">
+<ANCHOR id="g-marshal-value-peek-string" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-string">
+<ANCHOR id="g-marshal-value-peek-param" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-param">
+<ANCHOR id="g-marshal-value-peek-boxed" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boxed">
+<ANCHOR id="g-marshal-value-peek-pointer" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-pointer">
+<ANCHOR id="g-marshal-value-peek-object" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-object">
+<ANCHOR id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER">
+<ANCHOR id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER">
+<ANCHOR id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER">
+<ANCHOR id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER">
+<ANCHOR id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER">
+<ANCHOR id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER" href="libdbusmenu-glib/libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER">
+<ANCHOR id="annotation-glossterm-array" href="libdbusmenu-glib/annotation-glossary.html#annotation-glossterm-array">
+<ANCHOR id="annotation-glossterm-element-type" href="libdbusmenu-glib/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-inout" href="libdbusmenu-glib/annotation-glossary.html#annotation-glossterm-inout">
+<ANCHOR id="annotation-glossterm-in" href="libdbusmenu-glib/annotation-glossary.html#annotation-glossterm-in">
+<ANCHOR id="annotation-glossterm-transfer full" href="libdbusmenu-glib/annotation-glossary.html#annotation-glossterm-transfer full">
+<ANCHOR id="annotation-glossterm-transfer none" href="libdbusmenu-glib/annotation-glossary.html#annotation-glossterm-transfer none">
diff --git a/docs/libdbusmenu-glib/reference/html/left.png b/docs/libdbusmenu-glib/reference/html/left.png
new file mode 100644
index 0000000..2d05b3d
Binary files /dev/null and b/docs/libdbusmenu-glib/reference/html/left.png differ
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html
new file mode 100644
index 0000000..5289772
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html
@@ -0,0 +1,452 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuClient</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">
+<link rel="next" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="DbusmenuMenuitem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="DbusmenuClientMenuitem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-glib-DbusmenuClient.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-glib-DbusmenuClient.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuClient">
+<a name="libdbusmenu-glib-DbusmenuClient"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-glib-DbusmenuClient.top_of_page"></a>DbusmenuClient</span></h2>
+<p>DbusmenuClient — The catcher of all the server traffic</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1" title="Stability Level">
+<a name="libdbusmenu-glib-DbusmenuClient.stability-level"></a><h2>Stability Level</h2>
+Unstable, unless otherwise indicated
+</div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-glib-DbusmenuClient.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">
+#include &lt;libdbusmenu-glib/client.h&gt;
+
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS" title="DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED">DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS" title="DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED">DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS" title="DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM">DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS" title="DBUSMENU_CLIENT_PROP_DBUS_NAME">DBUSMENU_CLIENT_PROP_DBUS_NAME</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS" title="DBUSMENU_CLIENT_PROP_DBUS_OBJECT">DBUSMENU_CLIENT_PROP_DBUS_OBJECT</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS" title="DBUSMENU_CLIENT_TYPES_DEFAULT">DBUSMENU_CLIENT_TYPES_DEFAULT</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS" title="DBUSMENU_CLIENT_TYPES_SEPARATOR">DBUSMENU_CLIENT_TYPES_SEPARATOR</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-IMAGE:CAPS" title="DBUSMENU_CLIENT_TYPES_IMAGE">DBUSMENU_CLIENT_TYPES_IMAGE</a>
+                    <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass" title="DbusmenuClientClass">DbusmenuClientClass</a>;
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (<a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler" title="DbusmenuClientTypeHandler ()">*DbusmenuClientTypeHandler</a>)        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *newitem</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);
+<span class="returnvalue">DbusmenuClient</span> *    <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-new" title="dbusmenu_client_new ()">dbusmenu_client_new</a>                 (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *object</code></em>);
+<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-get-root" title="dbusmenu_client_get_root ()">dbusmenu_client_get_root</a>            (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-add-type-handler" title="dbusmenu_client_add_type_handler ()">dbusmenu_client_add_type_handler</a>    (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *type</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler" title="DbusmenuClientTypeHandler ()"><span class="type">DbusmenuClientTypeHandler</span></a> newfunc</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-event" title="dbusmenu_client_send_event ()">dbusmenu_client_send_event</a>          (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timestamp</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-about-to-show" title="dbusmenu_client_send_about_to_show ()">dbusmenu_client_send_about_to_show</a>  (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> (cbgpointer user_data) ()</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> cb_data</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-glib-DbusmenuClient.description"></a><h2>Description</h2>
+<p>
+The client exists as a mirror to the server.  For most folks
+	all they will do with a client is set it up to connect to
+	a server and then watch as the menu items on their side
+	of the bus change.  This is all they should need to know about
+	the client, that it magically makes their menuitems dance.
+</p>
+<p>
+	It does this by setting up signal watchers and adjusting
+	the menuitems appropriately.  Most users should watch the
+	menu items and the signal <span class="type">"layout-changed"</span> for
+	larger events so that they can be optimized.  It is possible
+	with that signal that even the root node would change.  If
+	that doesn't happen the normal signals on the individual
+	nodes should be enough for most users.
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-glib-DbusmenuClient.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED">
+<a name="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS"></a><h3>DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED  "layout-updated"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED">
+<a name="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS"></a><h3>DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED    "root-changed"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM">
+<a name="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS"></a><h3>DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM    "new-menuitem"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_PROP_DBUS_NAME">
+<a name="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS"></a><h3>DBUSMENU_CLIENT_PROP_DBUS_NAME</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_PROP_DBUS_NAME     "dbus-name"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_PROP_DBUS_OBJECT">
+<a name="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS"></a><h3>DBUSMENU_CLIENT_PROP_DBUS_OBJECT</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_PROP_DBUS_OBJECT   "dbus-object"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_TYPES_DEFAULT">
+<a name="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS"></a><h3>DBUSMENU_CLIENT_TYPES_DEFAULT</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_TYPES_DEFAULT      "standard"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_TYPES_SEPARATOR">
+<a name="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS"></a><h3>DBUSMENU_CLIENT_TYPES_SEPARATOR</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_TYPES_SEPARATOR    "separator"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_CLIENT_TYPES_IMAGE">
+<a name="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS"></a><h3>DBUSMENU_CLIENT_TYPES_IMAGE</h3>
+<pre class="programlisting">#define DBUSMENU_CLIENT_TYPES_IMAGE        "standard"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuClientClass">
+<a name="DbusmenuClientClass"></a><h3>DbusmenuClientClass</h3>
+<pre class="programlisting">typedef struct {
+	GObjectClass parent_class;
+
+	void (*layout_updated)(void);
+	void (*root_changed) (DbusmenuMenuitem * newroot);
+	void (*new_menuitem) (DbusmenuMenuitem * newitem);
+
+	/* Reserved for future use */
+	void (*reserved1) (void);
+	void (*reserved2) (void);
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+} DbusmenuClientClass;
+</pre>
+<p>
+A simple class that takes all of the information from a
+	<span class="type">DbusmenuServer</span> over DBus and makes the same set of 
+	<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects appear on the other side.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="DbusmenuClientClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>
+<a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.layout-updated"></a>layout_updated</code></em> ()</span></p></td>
+<td>Slot for <span class="type">"layout-updated"</span>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.root-changed"></a>root_changed</code></em> ()</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.new-menuitem"></a>new_menuitem</code></em> ()</span></p></td>
+<td>Slot for <span class="type">"new-menuitem"</span>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.reserved1"></a>reserved1</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.reserved2"></a>reserved2</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.reserved3"></a>reserved3</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuClientClass.reserved4"></a>reserved4</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuClientTypeHandler ()">
+<a name="DbusmenuClientTypeHandler"></a><h3>DbusmenuClientTypeHandler ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (*DbusmenuClientTypeHandler)        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *newitem</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>newitem</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_client_new ()">
+<a name="dbusmenu-client-new"></a><h3>dbusmenu_client_new ()</h3>
+<pre class="programlisting"><span class="returnvalue">DbusmenuClient</span> *    dbusmenu_client_new                 (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *object</code></em>);</pre>
+<p>
+This function creates a new client that connects to a specific
+	server on DBus.  That server is at a specific location sharing
+	a known object.  The interface is assumed by the code to be 
+	the DBus menu interface.  The newly created client will start
+	sending out events as it syncs up with the server.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>The DBus name for the server to connect to
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
+<td>The object on the server to monitor
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A brand new <span class="type">DbusmenuClient</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_client_get_root ()">
+<a name="dbusmenu-client-get-root"></a><h3>dbusmenu_client_get_root ()</h3>
+<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_client_get_root            (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);</pre>
+<p>
+Grabs the root node for the specified client <em class="parameter"><code>client</code></em>.  This
+	function may block.  It will block if there is currently a
+	call to update the layout, it will block on that layout 
+	updated and then return the newly updated layout.  Chances
+	are that this update is in the queue for the mainloop as
+	it would have been requested some time ago, but in theory
+	it could block longer.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenuClient</span> to get the root node from
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> representing the root of
+		menu on the server.  If there is no server or there is
+		an error receiving its layout it'll return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_client_add_type_handler ()">
+<a name="dbusmenu-client-add-type-handler"></a><h3>dbusmenu_client_add_type_handler ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_client_add_type_handler    (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *type</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler" title="DbusmenuClientTypeHandler ()"><span class="type">DbusmenuClientTypeHandler</span></a> newfunc</code></em>);</pre>
+<p>
+This function connects into the type handling of the <span class="type">DbusmenuClient</span>.
+	Every new menuitem that comes in immediately gets asked for it's
+	properties.  When we get those properties we check the 'type'
+	property and look to see if it matches a handler that is known
+	by the client.  If so, the <em class="parameter"><code>newfunc</code></em> function is executed on that
+	<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.  If not, then the DbusmenuClient::new-menuitem
+	signal is sent.
+</p>
+<p>
+	In the future the known types will be sent to the server so that it
+	can make choices about the menu item types availble.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>Client where we're getting types coming in
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
+<td>A text string that will be matched with the 'type'
+	    property on incoming menu items
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>newfunc</code></em> :</span></p></td>
+<td>The function that will be executed with those new
+	    items when they come in.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> If registering the new type was successful.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_client_send_event ()">
+<a name="dbusmenu-client-send-event"></a><h3>dbusmenu_client_send_event ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_client_send_event          (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timestamp</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_client_send_about_to_show ()">
+<a name="dbusmenu-client-send-about-to-show"></a><h3>dbusmenu_client_send_about_to_show ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_client_send_about_to_show  (<em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> (cbgpointer user_data) ()</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> cb_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>
+<em class="parameter"><code>gpointer</code></em> user_data:
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>cb_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html
new file mode 100644
index 0000000..ec2fbbd
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuServer</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="ch01.html" title="API">
+<link rel="next" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="DbusmenuMenuitemProxy.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-glib-DbusmenuServer.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-glib-DbusmenuServer.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuServer">
+<a name="libdbusmenu-glib-DbusmenuServer"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-glib-DbusmenuServer.top_of_page"></a>DbusmenuServer</span></h2>
+<p>DbusmenuServer</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-glib-DbusmenuServer.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS" title="DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE">DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS" title="DBUSMENU_SERVER_SIGNAL_ID_UPDATE">DBUSMENU_SERVER_SIGNAL_ID_UPDATE</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS" title="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS" title="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS" title="DBUSMENU_SERVER_PROP_DBUS_OBJECT">DBUSMENU_SERVER_PROP_DBUS_OBJECT</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS" title="DBUSMENU_SERVER_PROP_ROOT_NODE">DBUSMENU_SERVER_PROP_ROOT_NODE</a>
+#define             <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-VERSION:CAPS" title="DBUSMENU_SERVER_PROP_VERSION">DBUSMENU_SERVER_PROP_VERSION</a>
+                    <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#DbusmenuServerClass" title="DbusmenuServerClass">DbusmenuServerClass</a>;
+<span class="returnvalue">DbusmenuServer</span> *    <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-new" title="dbusmenu_server_new ()">dbusmenu_server_new</a>                 (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *object</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-set-root" title="dbusmenu_server_set_root ()">dbusmenu_server_set_root</a>            (<em class="parameter"><code><span class="type">DbusmenuServer</span> *server</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *root</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-glib-DbusmenuServer.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-glib-DbusmenuServer.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE">
+<a name="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS"></a><h3>DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE  "item-property-updated"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_SERVER_SIGNAL_ID_UPDATE">
+<a name="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS"></a><h3>DBUSMENU_SERVER_SIGNAL_ID_UPDATE</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_SIGNAL_ID_UPDATE       "item-updated"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED">
+<a name="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS"></a><h3>DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED  "layout-updated"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE">
+<a name="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS"></a><h3>DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE   DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_SERVER_PROP_DBUS_OBJECT">
+<a name="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS"></a><h3>DBUSMENU_SERVER_PROP_DBUS_OBJECT</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_PROP_DBUS_OBJECT       "dbus-object"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_SERVER_PROP_ROOT_NODE">
+<a name="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS"></a><h3>DBUSMENU_SERVER_PROP_ROOT_NODE</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_PROP_ROOT_NODE         "root-node"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_SERVER_PROP_VERSION">
+<a name="DBUSMENU-SERVER-PROP-VERSION:CAPS"></a><h3>DBUSMENU_SERVER_PROP_VERSION</h3>
+<pre class="programlisting">#define DBUSMENU_SERVER_PROP_VERSION           "version"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuServerClass">
+<a name="DbusmenuServerClass"></a><h3>DbusmenuServerClass</h3>
+<pre class="programlisting">typedef struct {
+	GObjectClass parent_class;
+
+	/* Signals */
+	void (*id_prop_update)(gint id, gchar * property, gchar * value);
+	void (*id_update)(gint id);
+	void (*layout_updated)(gint revision);
+
+	/* Reserved */
+	void (*dbusmenu_server_reserved1)(void);
+	void (*dbusmenu_server_reserved2)(void);
+	void (*dbusmenu_server_reserved3)(void);
+	void (*dbusmenu_server_reserved4)(void);
+} DbusmenuServerClass;
+</pre>
+<p>
+The class implementing the virtual functions for <span class="type">DbusmenuServer</span>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="DbusmenuServerClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>
+<a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.id-prop-update"></a>id_prop_update</code></em> ()</span></p></td>
+<td>Slot for <span class="type">"id-prop-update"</span>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.id-update"></a>id_update</code></em> ()</span></p></td>
+<td>Slot for <span class="type">"id-update"</span>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.layout-updated"></a>layout_updated</code></em> ()</span></p></td>
+<td>Slot for <span class="type">"layout-update"</span>.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved1"></a>dbusmenu_server_reserved1</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved2"></a>dbusmenu_server_reserved2</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved3"></a>dbusmenu_server_reserved3</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved4"></a>dbusmenu_server_reserved4</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_server_new ()">
+<a name="dbusmenu-server-new"></a><h3>dbusmenu_server_new ()</h3>
+<pre class="programlisting"><span class="returnvalue">DbusmenuServer</span> *    dbusmenu_server_new                 (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *object</code></em>);</pre>
+<p>
+Creates a new <span class="type">DbusmenuServer</span> object with a specific object
+	path on DBus.  If <em class="parameter"><code>object</code></em> is set to NULL the default object
+	name of "/org/ayatana/dbusmenu" will be used.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
+<td>The object name to show for this menu structure
+		on DBus.  May be NULL.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A brand new <span class="type">DbusmenuServer</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_server_set_root ()">
+<a name="dbusmenu-server-set-root"></a><h3>dbusmenu_server_set_root ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_server_set_root            (<em class="parameter"><code><span class="type">DbusmenuServer</span> *server</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *root</code></em>);</pre>
+<p>
+This function contains all of the <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> wrapping
+	required to set the property <span class="type">"root-node"</span>
+	on the server <em class="parameter"><code>self</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>server</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>root</code></em> :</span></p></td>
+<td>The new root <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> tree
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html
new file mode 100644
index 0000000..b8088e2
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html
@@ -0,0 +1,1001 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>dbusmenu-client</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">
+<link rel="next" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="DbusmenuClientMenuitem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-glib-dbusmenu-server.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-glib-dbusmenu-client.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-glib-dbusmenu-client.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="dbusmenu-client">
+<a name="libdbusmenu-glib-dbusmenu-client"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-glib-dbusmenu-client.top_of_page"></a>dbusmenu-client</span></h2>
+<p>dbusmenu-client</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-glib-dbusmenu-client.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu" title="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu">DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</a>
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout" title="org_ayatana_dbusmenu_get_layout ()">org_ayatana_dbusmenu_get_layout</a>     (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *OUT_revision</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **OUT_layout</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()">*org_ayatana_dbusmenu_get_layout_reply</a>)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> OUT_revision</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> *OUT_layout</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-async" title="org_ayatana_dbusmenu_get_layout_async ()">org_ayatana_dbusmenu_get_layout_async</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()"><span class="type">org_ayatana_dbusmenu_get_layout_reply</span></a> callback</code></em>);
+<span class="returnvalue">return</span>              <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()">dbus_g_proxy_begin_call</a>             (<em class="parameter"><code><span class="type">proxy</span> Param1</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties" title="org_ayatana_dbusmenu_get_group_properties ()">org_ayatana_dbusmenu_get_group_properties</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()">*org_ayatana_dbusmenu_get_group_properties_reply</a>)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-async" title="org_ayatana_dbusmenu_get_group_properties_async ()">org_ayatana_dbusmenu_get_group_properties_async</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_group_properties_reply</span></a> callback</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children" title="org_ayatana_dbusmenu_get_children ()">org_ayatana_dbusmenu_get_children</a>   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()">*org_ayatana_dbusmenu_get_children_reply</a>)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-async" title="org_ayatana_dbusmenu_get_children_async ()">org_ayatana_dbusmenu_get_children_async</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()"><span class="type">org_ayatana_dbusmenu_get_children_reply</span></a> callback</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property" title="org_ayatana_dbusmenu_get_property ()">org_ayatana_dbusmenu_get_property</a>   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *OUT_value</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()">*org_ayatana_dbusmenu_get_property_reply</a>)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> OUT_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-async" title="org_ayatana_dbusmenu_get_property_async ()">org_ayatana_dbusmenu_get_property_async</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()"><span class="type">org_ayatana_dbusmenu_get_property_reply</span></a> callback</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties" title="org_ayatana_dbusmenu_get_properties ()">org_ayatana_dbusmenu_get_properties</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **OUT_properties</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()">*org_ayatana_dbusmenu_get_properties_reply</a>)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *OUT_properties</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-async" title="org_ayatana_dbusmenu_get_properties_async ()">org_ayatana_dbusmenu_get_properties_async</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_properties_reply</span></a> callback</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event" title="org_ayatana_dbusmenu_event ()">org_ayatana_dbusmenu_event</a>          (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()">*org_ayatana_dbusmenu_event_reply</a>) (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-async" title="org_ayatana_dbusmenu_event_async ()">org_ayatana_dbusmenu_event_async</a>    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()"><span class="type">org_ayatana_dbusmenu_event_reply</span></a> callback</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show" title="org_ayatana_dbusmenu_about_to_show ()">org_ayatana_dbusmenu_about_to_show</a>  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *OUT_needUpdate</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()">*org_ayatana_dbusmenu_about_to_show_reply</a>)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> OUT_needUpdate</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-async" title="org_ayatana_dbusmenu_about_to_show_async ()">org_ayatana_dbusmenu_about_to_show_async</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()"><span class="type">org_ayatana_dbusmenu_about_to_show_reply</span></a> callback</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-glib-dbusmenu-client.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-glib-dbusmenu-client.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu">
+<a name="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"></a><h3>DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</h3>
+<pre class="programlisting">#define DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_layout ()">
+<a name="org-ayatana-dbusmenu-get-layout"></a><h3>org_ayatana_dbusmenu_get_layout ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_layout     (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *OUT_revision</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **OUT_layout</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_parentId</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_revision</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_layout</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_layout_reply ()">
+<a name="org-ayatana-dbusmenu-get-layout-reply"></a><h3>org_ayatana_dbusmenu_get_layout_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_layout_reply)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> OUT_revision</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> *OUT_layout</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_revision</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_layout</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_layout_async ()">
+<a name="org-ayatana-dbusmenu-get-layout-async"></a><h3>org_ayatana_dbusmenu_get_layout_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_layout_async
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()"><span class="type">org_ayatana_dbusmenu_get_layout_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_parentId</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_g_proxy_begin_call ()">
+<a name="dbus-g-proxy-begin-call"></a><h3>dbus_g_proxy_begin_call ()</h3>
+<pre class="programlisting"><span class="returnvalue">return</span>              dbus_g_proxy_begin_call             (<em class="parameter"><code><span class="type">proxy</span> Param1</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>Param1</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_group_properties ()">
+<a name="org-ayatana-dbusmenu-get-group-properties"></a><h3>org_ayatana_dbusmenu_get_group_properties ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_group_properties
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_ids</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_group_properties_reply ()">
+<a name="org-ayatana-dbusmenu-get-group-properties-reply"></a><h3>org_ayatana_dbusmenu_get_group_properties_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_group_properties_reply)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_group_properties_async ()">
+<a name="org-ayatana-dbusmenu-get-group-properties-async"></a><h3>org_ayatana_dbusmenu_get_group_properties_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_group_properties_async
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_group_properties_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_ids</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_children ()">
+<a name="org-ayatana-dbusmenu-get-children"></a><h3>org_ayatana_dbusmenu_get_children ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_children   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_children_reply ()">
+<a name="org-ayatana-dbusmenu-get-children-reply"></a><h3>org_ayatana_dbusmenu_get_children_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_children_reply)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_children_async ()">
+<a name="org-ayatana-dbusmenu-get-children-async"></a><h3>org_ayatana_dbusmenu_get_children_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_children_async
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()"><span class="type">org_ayatana_dbusmenu_get_children_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_property ()">
+<a name="org-ayatana-dbusmenu-get-property"></a><h3>org_ayatana_dbusmenu_get_property ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_property   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *OUT_value</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_name</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_property_reply ()">
+<a name="org-ayatana-dbusmenu-get-property-reply"></a><h3>org_ayatana_dbusmenu_get_property_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_property_reply)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> OUT_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_property_async ()">
+<a name="org-ayatana-dbusmenu-get-property-async"></a><h3>org_ayatana_dbusmenu_get_property_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_property_async
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()"><span class="type">org_ayatana_dbusmenu_get_property_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_name</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_properties ()">
+<a name="org-ayatana-dbusmenu-get-properties"></a><h3>org_ayatana_dbusmenu_get_properties ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_properties (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **OUT_properties</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_properties_reply ()">
+<a name="org-ayatana-dbusmenu-get-properties-reply"></a><h3>org_ayatana_dbusmenu_get_properties_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_properties_reply)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *OUT_properties</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_get_properties_async ()">
+<a name="org-ayatana-dbusmenu-get-properties-async"></a><h3>org_ayatana_dbusmenu_get_properties_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_properties_async
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_properties_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_event ()">
+<a name="org-ayatana-dbusmenu-event"></a><h3>org_ayatana_dbusmenu_event ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_event          (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_eventId</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_timestamp</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_event_reply ()">
+<a name="org-ayatana-dbusmenu-event-reply"></a><h3>org_ayatana_dbusmenu_event_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_event_reply) (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_event_async ()">
+<a name="org-ayatana-dbusmenu-event-async"></a><h3>org_ayatana_dbusmenu_event_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_event_async    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()"><span class="type">org_ayatana_dbusmenu_event_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_eventId</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_timestamp</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_about_to_show ()">
+<a name="org-ayatana-dbusmenu-about-to-show"></a><h3>org_ayatana_dbusmenu_about_to_show ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_about_to_show  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *OUT_needUpdate</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_needUpdate</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_about_to_show_reply ()">
+<a name="org-ayatana-dbusmenu-about-to-show-reply"></a><h3>org_ayatana_dbusmenu_about_to_show_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_about_to_show_reply)
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> OUT_needUpdate</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>OUT_needUpdate</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="org_ayatana_dbusmenu_about_to_show_async ()">
+<a name="org-ayatana-dbusmenu-about-to-show-async"></a><h3>org_ayatana_dbusmenu_about_to_show_async ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_about_to_show_async
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()"><span class="type">org_ayatana_dbusmenu_about_to_show_reply</span></a> callback</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html
new file mode 100644
index 0000000..fed6be3
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html
@@ -0,0 +1,672 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>dbusmenu-server</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">
+<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-glib-dbusmenu-client.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-glib-dbusmenu-server.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-glib-dbusmenu-server.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="dbusmenu-server">
+<a name="libdbusmenu-glib-dbusmenu-server"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-glib-dbusmenu-server.top_of_page"></a>dbusmenu-server</span></h2>
+<p>dbusmenu-server</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-glib-dbusmenu-server.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boolean" title="g_marshal_value_peek_boolean()">g_marshal_value_peek_boolean</a>        (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-char" title="g_marshal_value_peek_char()">g_marshal_value_peek_char</a>           (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uchar" title="g_marshal_value_peek_uchar()">g_marshal_value_peek_uchar</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int" title="g_marshal_value_peek_int()">g_marshal_value_peek_int</a>            (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint" title="g_marshal_value_peek_uint()">g_marshal_value_peek_uint</a>           (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-long" title="g_marshal_value_peek_long()">g_marshal_value_peek_long</a>           (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-ulong" title="g_marshal_value_peek_ulong()">g_marshal_value_peek_ulong</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int64" title="g_marshal_value_peek_int64()">g_marshal_value_peek_int64</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint64" title="g_marshal_value_peek_uint64()">g_marshal_value_peek_uint64</a>         (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-enum" title="g_marshal_value_peek_enum()">g_marshal_value_peek_enum</a>           (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-flags" title="g_marshal_value_peek_flags()">g_marshal_value_peek_flags</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-float" title="g_marshal_value_peek_float()">g_marshal_value_peek_float</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-double" title="g_marshal_value_peek_double()">g_marshal_value_peek_double</a>         (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-string" title="g_marshal_value_peek_string()">g_marshal_value_peek_string</a>         (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-param" title="g_marshal_value_peek_param()">g_marshal_value_peek_param</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boxed" title="g_marshal_value_peek_boxed()">g_marshal_value_peek_boxed</a>          (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-pointer" title="g_marshal_value_peek_pointer()">g_marshal_value_peek_pointer</a>        (v)
+#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-object" title="g_marshal_value_peek_object()">g_marshal_value_peek_object</a>         (v)
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-glib-dbusmenu-server.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-glib-dbusmenu-server.details"></a><h2>Details</h2>
+<div class="refsect2" title="g_marshal_value_peek_boolean()">
+<a name="g-marshal-value-peek-boolean"></a><h3>g_marshal_value_peek_boolean()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_boolean(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_char()">
+<a name="g-marshal-value-peek-char"></a><h3>g_marshal_value_peek_char()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_char(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_uchar()">
+<a name="g-marshal-value-peek-uchar"></a><h3>g_marshal_value_peek_uchar()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_uchar(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_int()">
+<a name="g-marshal-value-peek-int"></a><h3>g_marshal_value_peek_int()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_int(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_uint()">
+<a name="g-marshal-value-peek-uint"></a><h3>g_marshal_value_peek_uint()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_uint(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_long()">
+<a name="g-marshal-value-peek-long"></a><h3>g_marshal_value_peek_long()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_long(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_ulong()">
+<a name="g-marshal-value-peek-ulong"></a><h3>g_marshal_value_peek_ulong()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_ulong(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_int64()">
+<a name="g-marshal-value-peek-int64"></a><h3>g_marshal_value_peek_int64()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_int64(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_uint64()">
+<a name="g-marshal-value-peek-uint64"></a><h3>g_marshal_value_peek_uint64()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_uint64(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_enum()">
+<a name="g-marshal-value-peek-enum"></a><h3>g_marshal_value_peek_enum()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_enum(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_flags()">
+<a name="g-marshal-value-peek-flags"></a><h3>g_marshal_value_peek_flags()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_flags(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_float()">
+<a name="g-marshal-value-peek-float"></a><h3>g_marshal_value_peek_float()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_float(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_double()">
+<a name="g-marshal-value-peek-double"></a><h3>g_marshal_value_peek_double()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_double(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_string()">
+<a name="g-marshal-value-peek-string"></a><h3>g_marshal_value_peek_string()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_string(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_param()">
+<a name="g-marshal-value-peek-param"></a><h3>g_marshal_value_peek_param()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_param(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_boxed()">
+<a name="g-marshal-value-peek-boxed"></a><h3>g_marshal_value_peek_boxed()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_boxed(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_pointer()">
+<a name="g-marshal-value-peek-pointer"></a><h3>g_marshal_value_peek_pointer()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_pointer(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="g_marshal_value_peek_object()">
+<a name="g-marshal-value-peek-object"></a><h3>g_marshal_value_peek_object()</h3>
+<pre class="programlisting">#define             g_marshal_value_peek_object(v)</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()">
+<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()">
+<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()">
+<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()">
+<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()">
+<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()">
+<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp
new file mode 100644
index 0000000..a9515a5
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<book xmlns="http://www.devhelp.net/book" title="libdbusmenu-glib Reference Manual" link="index.html" author="" name="libdbusmenu-glib">
+  <chapters>
+    <sub name="API" link="ch01.html">
+      <sub name="DbusmenuServer" link="libdbusmenu-glib-DbusmenuServer.html"/>
+      <sub name="DbusmenuMenuitemProxy" link="DbusmenuMenuitemProxy.html"/>
+      <sub name="DbusmenuMenuitem" link="DbusmenuMenuitem.html"/>
+      <sub name="DbusmenuClient" link="libdbusmenu-glib-DbusmenuClient.html"/>
+      <sub name="DbusmenuClientMenuitem" link="DbusmenuClientMenuitem.html"/>
+      <sub name="dbusmenu-client" link="libdbusmenu-glib-dbusmenu-client.html"/>
+      <sub name="dbusmenu-server" link="libdbusmenu-glib-dbusmenu-server.html"/>
+    </sub>
+    <sub name="Object Hierarchy" link="object-tree.html"/>
+    <sub name="API Index" link="api-index-full.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
+  </chapters>
+  <functions>
+    <function name="DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS"/>
+    <function name="DBUSMENU_SERVER_SIGNAL_ID_UPDATE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS"/>
+    <function name="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS"/>
+    <function name="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS"/>
+    <function name="DBUSMENU_SERVER_PROP_DBUS_OBJECT" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS"/>
+    <function name="DBUSMENU_SERVER_PROP_ROOT_NODE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS"/>
+    <function name="DBUSMENU_SERVER_PROP_VERSION" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-VERSION:CAPS"/>
+    <function name="DbusmenuServerClass" link="libdbusmenu-glib-DbusmenuServer.html#DbusmenuServerClass"/>
+    <function name="dbusmenu_server_new ()" link="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-new"/>
+    <function name="dbusmenu_server_set_root ()" link="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-set-root"/>
+    <function name="DbusmenuMenuitemProxy" link="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy-struct"/>
+    <function name="DbusmenuMenuitemProxyClass" link="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxyClass"/>
+    <function name="dbusmenu_menuitem_proxy_new ()" link="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-new"/>
+    <function name="dbusmenu_menuitem_proxy_get_wrapped ()" link="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-get-wrapped"/>
+    <function name="The &quot;menu-item&quot; property" link="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy--menu-item"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_REALIZED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_TYPE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TYPE:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_VISIBLE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_ENABLED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ENABLED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_LABEL" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-LABEL:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_ICON_NAME" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_ICON_DATA" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_TOGGLE_CHECK" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_TOGGLE_RADIO" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS"/>
+    <function name="DBUSMENU_MENUITEM_ICON_NAME_BLANK" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS"/>
+    <function name="DbusmenuMenuitem" link="DbusmenuMenuitem.html#DbusmenuMenuitem-struct"/>
+    <function name="dbusmenu_menuitem_about_to_show_cb ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>
+    <function name="dbusmenu_menuitem_buildxml_slot_t ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t"/>
+    <function name="DbusmenuMenuitemClass" link="DbusmenuMenuitem.html#DbusmenuMenuitemClass"/>
+    <function name="dbusmenu_menuitem_new ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-new"/>
+    <function name="dbusmenu_menuitem_new_with_id ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-new-with-id"/>
+    <function name="dbusmenu_menuitem_get_id ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-id"/>
+    <function name="dbusmenu_menuitem_get_children ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-children"/>
+    <function name="dbusmenu_menuitem_take_children ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-take-children"/>
+    <function name="dbusmenu_menuitem_get_position ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position"/>
+    <function name="dbusmenu_menuitem_get_position_realized ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position-realized"/>
+    <function name="dbusmenu_menuitem_child_append ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-append"/>
+    <function name="dbusmenu_menuitem_child_prepend ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-prepend"/>
+    <function name="dbusmenu_menuitem_child_delete ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-delete"/>
+    <function name="dbusmenu_menuitem_child_add_position ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-add-position"/>
+    <function name="dbusmenu_menuitem_child_reorder ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-reorder"/>
+    <function name="dbusmenu_menuitem_child_find ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-find"/>
+    <function name="dbusmenu_menuitem_find_id ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-find-id"/>
+    <function name="dbusmenu_menuitem_property_set ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set"/>
+    <function name="dbusmenu_menuitem_property_set_value ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-value"/>
+    <function name="dbusmenu_menuitem_property_set_bool ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-bool"/>
+    <function name="dbusmenu_menuitem_property_set_int ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-int"/>
+    <function name="dbusmenu_menuitem_property_get ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get"/>
+    <function name="dbusmenu_menuitem_property_get_value ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-value"/>
+    <function name="dbusmenu_menuitem_property_get_bool ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-bool"/>
+    <function name="dbusmenu_menuitem_property_get_int ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-int"/>
+    <function name="dbusmenu_menuitem_property_exist ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-exist"/>
+    <function name="dbusmenu_menuitem_properties_list ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-list"/>
+    <function name="dbusmenu_menuitem_properties_copy ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-copy"/>
+    <function name="dbusmenu_menuitem_property_remove ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-remove"/>
+    <function name="dbusmenu_menuitem_set_root ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-set-root"/>
+    <function name="dbusmenu_menuitem_get_root ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-root"/>
+    <function name="dbusmenu_menuitem_foreach ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-foreach"/>
+    <function name="dbusmenu_menuitem_handle_event ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event"/>
+    <function name="dbusmenu_menuitem_send_about_to_show ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-send-about-to-show"/>
+    <function name="The &quot;id&quot; property" link="DbusmenuMenuitem.html#DbusmenuMenuitem--id"/>
+    <function name="The &quot;child-added&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added"/>
+    <function name="The &quot;child-moved&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved"/>
+    <function name="The &quot;child-removed&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed"/>
+    <function name="The &quot;item-activated&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated"/>
+    <function name="The &quot;property-changed&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed"/>
+    <function name="The &quot;realized&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-realized"/>
+    <function name="DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS"/>
+    <function name="DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS"/>
+    <function name="DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS"/>
+    <function name="DBUSMENU_CLIENT_PROP_DBUS_NAME" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS"/>
+    <function name="DBUSMENU_CLIENT_PROP_DBUS_OBJECT" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS"/>
+    <function name="DBUSMENU_CLIENT_TYPES_DEFAULT" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS"/>
+    <function name="DBUSMENU_CLIENT_TYPES_SEPARATOR" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS"/>
+    <function name="DBUSMENU_CLIENT_TYPES_IMAGE" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-IMAGE:CAPS"/>
+    <function name="DbusmenuClientClass" link="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass"/>
+    <function name="DbusmenuClientTypeHandler ()" link="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler"/>
+    <function name="dbusmenu_client_new ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-new"/>
+    <function name="dbusmenu_client_get_root ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-get-root"/>
+    <function name="dbusmenu_client_add_type_handler ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-add-type-handler"/>
+    <function name="dbusmenu_client_send_event ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-event"/>
+    <function name="dbusmenu_client_send_about_to_show ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-about-to-show"/>
+    <function name="DBUSMENU_CLIENT_MENUITEM_TYPE" link="DbusmenuClientMenuitem.html#DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS"/>
+    <function name="DbusmenuClientMenuitem" link="DbusmenuClientMenuitem.html#DbusmenuClientMenuitem-struct"/>
+    <function name="DbusmenuClientMenuitemClass" link="DbusmenuClientMenuitem.html#DbusmenuClientMenuitemClass"/>
+    <function name="dbusmenu_client_menuitem_new ()" link="DbusmenuClientMenuitem.html#dbusmenu-client-menuitem-new"/>
+    <function name="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu" link="libdbusmenu-glib-dbusmenu-client.html#DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"/>
+    <function name="org_ayatana_dbusmenu_get_layout ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout"/>
+    <function name="org_ayatana_dbusmenu_get_layout_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply"/>
+    <function name="org_ayatana_dbusmenu_get_layout_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-async"/>
+    <function name="dbus_g_proxy_begin_call ()" link="libdbusmenu-glib-dbusmenu-client.html#dbus-g-proxy-begin-call"/>
+    <function name="org_ayatana_dbusmenu_get_group_properties ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties"/>
+    <function name="org_ayatana_dbusmenu_get_group_properties_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply"/>
+    <function name="org_ayatana_dbusmenu_get_group_properties_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-async"/>
+    <function name="org_ayatana_dbusmenu_get_children ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children"/>
+    <function name="org_ayatana_dbusmenu_get_children_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply"/>
+    <function name="org_ayatana_dbusmenu_get_children_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-async"/>
+    <function name="org_ayatana_dbusmenu_get_property ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property"/>
+    <function name="org_ayatana_dbusmenu_get_property_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply"/>
+    <function name="org_ayatana_dbusmenu_get_property_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-async"/>
+    <function name="org_ayatana_dbusmenu_get_properties ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties"/>
+    <function name="org_ayatana_dbusmenu_get_properties_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply"/>
+    <function name="org_ayatana_dbusmenu_get_properties_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-async"/>
+    <function name="org_ayatana_dbusmenu_event ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event"/>
+    <function name="org_ayatana_dbusmenu_event_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply"/>
+    <function name="org_ayatana_dbusmenu_event_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-async"/>
+    <function name="org_ayatana_dbusmenu_about_to_show ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show"/>
+    <function name="org_ayatana_dbusmenu_about_to_show_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply"/>
+    <function name="org_ayatana_dbusmenu_about_to_show_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-async"/>
+    <function name="g_marshal_value_peek_boolean()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boolean"/>
+    <function name="g_marshal_value_peek_char()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-char"/>
+    <function name="g_marshal_value_peek_uchar()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uchar"/>
+    <function name="g_marshal_value_peek_int()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int"/>
+    <function name="g_marshal_value_peek_uint()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint"/>
+    <function name="g_marshal_value_peek_long()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-long"/>
+    <function name="g_marshal_value_peek_ulong()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-ulong"/>
+    <function name="g_marshal_value_peek_int64()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int64"/>
+    <function name="g_marshal_value_peek_uint64()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint64"/>
+    <function name="g_marshal_value_peek_enum()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-enum"/>
+    <function name="g_marshal_value_peek_flags()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-flags"/>
+    <function name="g_marshal_value_peek_float()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-float"/>
+    <function name="g_marshal_value_peek_double()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-double"/>
+    <function name="g_marshal_value_peek_string()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-string"/>
+    <function name="g_marshal_value_peek_param()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-param"/>
+    <function name="g_marshal_value_peek_boxed()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boxed"/>
+    <function name="g_marshal_value_peek_pointer()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-pointer"/>
+    <function name="g_marshal_value_peek_object()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-object"/>
+    <function name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"/>
+    <function name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"/>
+    <function name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"/>
+    <function name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"/>
+    <function name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"/>
+    <function name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"/>
+  </functions>
+</book>
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2
new file mode 100644
index 0000000..ac68fb0
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<book xmlns="http://www.devhelp.net/book" title="libdbusmenu-glib Reference Manual" link="index.html" author="" name="libdbusmenu-glib" version="2" language="c">
+  <chapters>
+    <sub name="API" link="ch01.html">
+      <sub name="DbusmenuServer" link="libdbusmenu-glib-DbusmenuServer.html"/>
+      <sub name="DbusmenuMenuitemProxy" link="DbusmenuMenuitemProxy.html"/>
+      <sub name="DbusmenuMenuitem" link="DbusmenuMenuitem.html"/>
+      <sub name="DbusmenuClient" link="libdbusmenu-glib-DbusmenuClient.html"/>
+      <sub name="DbusmenuClientMenuitem" link="DbusmenuClientMenuitem.html"/>
+      <sub name="dbusmenu-client" link="libdbusmenu-glib-dbusmenu-client.html"/>
+      <sub name="dbusmenu-server" link="libdbusmenu-glib-dbusmenu-server.html"/>
+    </sub>
+    <sub name="Object Hierarchy" link="object-tree.html"/>
+    <sub name="API Index" link="api-index-full.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
+  </chapters>
+  <functions>
+    <keyword type="macro" name="DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_SERVER_SIGNAL_ID_UPDATE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_SERVER_PROP_DBUS_OBJECT" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_SERVER_PROP_ROOT_NODE" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_SERVER_PROP_VERSION" link="libdbusmenu-glib-DbusmenuServer.html#DBUSMENU-SERVER-PROP-VERSION:CAPS"/>
+    <keyword type="struct" name="DbusmenuServerClass" link="libdbusmenu-glib-DbusmenuServer.html#DbusmenuServerClass"/>
+    <keyword type="function" name="dbusmenu_server_new ()" link="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-new"/>
+    <keyword type="function" name="dbusmenu_server_set_root ()" link="libdbusmenu-glib-DbusmenuServer.html#dbusmenu-server-set-root"/>
+    <keyword type="struct" name="DbusmenuMenuitemProxy" link="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy-struct"/>
+    <keyword type="struct" name="DbusmenuMenuitemProxyClass" link="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxyClass"/>
+    <keyword type="function" name="dbusmenu_menuitem_proxy_new ()" link="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-new"/>
+    <keyword type="function" name="dbusmenu_menuitem_proxy_get_wrapped ()" link="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-get-wrapped"/>
+    <keyword type="property" name="The &quot;menu-item&quot; property" link="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy--menu-item"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_REALIZED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_TYPE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TYPE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_VISIBLE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_ENABLED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ENABLED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_LABEL" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-LABEL:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_ICON_NAME" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_ICON_DATA" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_TOGGLE_CHECK" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_TOGGLE_RADIO" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_MENUITEM_ICON_NAME_BLANK" link="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS"/>
+    <keyword type="struct" name="DbusmenuMenuitem" link="DbusmenuMenuitem.html#DbusmenuMenuitem-struct"/>
+    <keyword type="function" name="dbusmenu_menuitem_about_to_show_cb ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>
+    <keyword type="function" name="dbusmenu_menuitem_buildxml_slot_t ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t"/>
+    <keyword type="struct" name="DbusmenuMenuitemClass" link="DbusmenuMenuitem.html#DbusmenuMenuitemClass"/>
+    <keyword type="function" name="dbusmenu_menuitem_new ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-new"/>
+    <keyword type="function" name="dbusmenu_menuitem_new_with_id ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-new-with-id"/>
+    <keyword type="function" name="dbusmenu_menuitem_get_id ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-id"/>
+    <keyword type="function" name="dbusmenu_menuitem_get_children ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-children"/>
+    <keyword type="function" name="dbusmenu_menuitem_take_children ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-take-children"/>
+    <keyword type="function" name="dbusmenu_menuitem_get_position ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position"/>
+    <keyword type="function" name="dbusmenu_menuitem_get_position_realized ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position-realized"/>
+    <keyword type="function" name="dbusmenu_menuitem_child_append ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-append"/>
+    <keyword type="function" name="dbusmenu_menuitem_child_prepend ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-prepend"/>
+    <keyword type="function" name="dbusmenu_menuitem_child_delete ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-delete"/>
+    <keyword type="function" name="dbusmenu_menuitem_child_add_position ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-add-position"/>
+    <keyword type="function" name="dbusmenu_menuitem_child_reorder ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-reorder"/>
+    <keyword type="function" name="dbusmenu_menuitem_child_find ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-child-find"/>
+    <keyword type="function" name="dbusmenu_menuitem_find_id ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-find-id"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_set ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_set_value ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-value"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_set_bool ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-bool"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_set_int ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-int"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_get ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_get_value ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-value"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_get_bool ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-bool"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_get_int ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-int"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_exist ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-exist"/>
+    <keyword type="function" name="dbusmenu_menuitem_properties_list ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-list"/>
+    <keyword type="function" name="dbusmenu_menuitem_properties_copy ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-copy"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_remove ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-property-remove"/>
+    <keyword type="function" name="dbusmenu_menuitem_set_root ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-set-root"/>
+    <keyword type="function" name="dbusmenu_menuitem_get_root ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-get-root"/>
+    <keyword type="function" name="dbusmenu_menuitem_foreach ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-foreach"/>
+    <keyword type="function" name="dbusmenu_menuitem_handle_event ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event"/>
+    <keyword type="function" name="dbusmenu_menuitem_send_about_to_show ()" link="DbusmenuMenuitem.html#dbusmenu-menuitem-send-about-to-show"/>
+    <keyword type="property" name="The &quot;id&quot; property" link="DbusmenuMenuitem.html#DbusmenuMenuitem--id"/>
+    <keyword type="signal" name="The &quot;child-added&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added"/>
+    <keyword type="signal" name="The &quot;child-moved&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved"/>
+    <keyword type="signal" name="The &quot;child-removed&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed"/>
+    <keyword type="signal" name="The &quot;item-activated&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated"/>
+    <keyword type="signal" name="The &quot;property-changed&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed"/>
+    <keyword type="signal" name="The &quot;realized&quot; signal" link="DbusmenuMenuitem.html#DbusmenuMenuitem-realized"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_PROP_DBUS_NAME" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_PROP_DBUS_OBJECT" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_TYPES_DEFAULT" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_TYPES_SEPARATOR" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_TYPES_IMAGE" link="libdbusmenu-glib-DbusmenuClient.html#DBUSMENU-CLIENT-TYPES-IMAGE:CAPS"/>
+    <keyword type="struct" name="DbusmenuClientClass" link="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass"/>
+    <keyword type="function" name="DbusmenuClientTypeHandler ()" link="libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientTypeHandler"/>
+    <keyword type="function" name="dbusmenu_client_new ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-new"/>
+    <keyword type="function" name="dbusmenu_client_get_root ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-get-root"/>
+    <keyword type="function" name="dbusmenu_client_add_type_handler ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-add-type-handler"/>
+    <keyword type="function" name="dbusmenu_client_send_event ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-event"/>
+    <keyword type="function" name="dbusmenu_client_send_about_to_show ()" link="libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-send-about-to-show"/>
+    <keyword type="macro" name="DBUSMENU_CLIENT_MENUITEM_TYPE" link="DbusmenuClientMenuitem.html#DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS"/>
+    <keyword type="struct" name="DbusmenuClientMenuitem" link="DbusmenuClientMenuitem.html#DbusmenuClientMenuitem-struct"/>
+    <keyword type="struct" name="DbusmenuClientMenuitemClass" link="DbusmenuClientMenuitem.html#DbusmenuClientMenuitemClass"/>
+    <keyword type="function" name="dbusmenu_client_menuitem_new ()" link="DbusmenuClientMenuitem.html#dbusmenu-client-menuitem-new"/>
+    <keyword type="macro" name="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu" link="libdbusmenu-glib-dbusmenu-client.html#DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_layout ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_layout_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_layout_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-async"/>
+    <keyword type="function" name="dbus_g_proxy_begin_call ()" link="libdbusmenu-glib-dbusmenu-client.html#dbus-g-proxy-begin-call"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_group_properties ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_group_properties_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_group_properties_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-async"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_children ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_children_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_children_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-async"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_property ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_property_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_property_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-async"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_properties ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_properties_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_get_properties_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-async"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_event ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_event_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_event_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-async"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_about_to_show ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_about_to_show_reply ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply"/>
+    <keyword type="function" name="org_ayatana_dbusmenu_about_to_show_async ()" link="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-async"/>
+    <keyword type="macro" name="g_marshal_value_peek_boolean()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boolean"/>
+    <keyword type="macro" name="g_marshal_value_peek_char()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-char"/>
+    <keyword type="macro" name="g_marshal_value_peek_uchar()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uchar"/>
+    <keyword type="macro" name="g_marshal_value_peek_int()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int"/>
+    <keyword type="macro" name="g_marshal_value_peek_uint()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint"/>
+    <keyword type="macro" name="g_marshal_value_peek_long()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-long"/>
+    <keyword type="macro" name="g_marshal_value_peek_ulong()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-ulong"/>
+    <keyword type="macro" name="g_marshal_value_peek_int64()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int64"/>
+    <keyword type="macro" name="g_marshal_value_peek_uint64()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint64"/>
+    <keyword type="macro" name="g_marshal_value_peek_enum()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-enum"/>
+    <keyword type="macro" name="g_marshal_value_peek_flags()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-flags"/>
+    <keyword type="macro" name="g_marshal_value_peek_float()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-float"/>
+    <keyword type="macro" name="g_marshal_value_peek_double()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-double"/>
+    <keyword type="macro" name="g_marshal_value_peek_string()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-string"/>
+    <keyword type="macro" name="g_marshal_value_peek_param()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-param"/>
+    <keyword type="macro" name="g_marshal_value_peek_boxed()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boxed"/>
+    <keyword type="macro" name="g_marshal_value_peek_pointer()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-pointer"/>
+    <keyword type="macro" name="g_marshal_value_peek_object()" link="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-object"/>
+    <keyword type="function" name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"/>
+    <keyword type="function" name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"/>
+    <keyword type="function" name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"/>
+    <keyword type="function" name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"/>
+    <keyword type="function" name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"/>
+    <keyword type="function" name="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()" link="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"/>
+  </functions>
+</book>
diff --git a/docs/libdbusmenu-glib/reference/html/object-tree.html b/docs/libdbusmenu-glib/reference/html/object-tree.html
new file mode 100644
index 0000000..ec60194
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/object-tree.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Object Hierarchy</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual">
+<link rel="prev" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">
+<link rel="next" href="api-index-full.html" title="API Index">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-glib-dbusmenu-server.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
+<td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter" title="Object Hierarchy">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
+<pre class="screen">
+    <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+        <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
+            <a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
+            <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
+</pre>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/right.png b/docs/libdbusmenu-glib/reference/html/right.png
new file mode 100644
index 0000000..92832e3
Binary files /dev/null and b/docs/libdbusmenu-glib/reference/html/right.png differ
diff --git a/docs/libdbusmenu-glib/reference/html/style.css b/docs/libdbusmenu-glib/reference/html/style.css
new file mode 100644
index 0000000..82115eb
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/html/style.css
@@ -0,0 +1,257 @@
+.synopsis, .classsynopsis
+{
+  /* tango:aluminium 1/2 */
+  background: #eeeeec;
+  border: solid 1px #d3d7cf;
+  padding: 0.5em;
+}
+.programlisting
+{
+  /* tango:sky blue 0/1 */
+  background: #e6f3ff;
+  border: solid 1px #729fcf;
+  padding: 0.5em;
+}
+.variablelist
+{
+  padding: 4px;
+  margin-left: 3em;
+}
+.variablelist td:first-child
+{
+  vertical-align: top;
+}
+
+@media screen {
+  sup a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+    
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    position: relative;
+    padding-top:4.5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 3.2em;
+    padding-bottom: 20em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+    z-index: 10;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:scarlet red 3 */
+    color: #a40000;
+  }
+  .navigation a:hover
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+  }
+  td.shortcuts
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
+.navigation .title
+{
+  font-size: 200%;
+}
+
+div.gallery-float
+{
+  float: left;
+  padding: 10px;
+}
+div.gallery-float img
+{
+  border-style: none;
+}
+div.gallery-spacer
+{
+  clear: both;
+}
+
+a, a:visited
+{
+  text-decoration: none;
+  /* tango:sky blue 2 */
+  color: #3465a4;
+}
+a:hover
+{
+  text-decoration: underline;
+  /* tango:sky blue 1 */
+  color: #729fcf;
+}
+
+div.table table
+{
+  border-collapse: collapse;
+  border-spacing: 0px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+}
+
+div.table table td, div.table table th
+{
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+  padding: 3px;
+  vertical-align: top;
+}
+
+div.table table th
+{
+  /* tango:aluminium 2 */
+  background-color: #d3d7cf;
+}
+
+hr
+{
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  background: #babdb6;
+  border: none 0px;
+  height: 1px;
+  clear: both;
+}
+
+.footer
+{
+  padding-top: 3.5em;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  text-align: center;
+  font-size: 80%;
+}
+
+.warning
+{
+  /* tango:orange 0/1 */
+  background: #ffeed9;
+  border-color: #ffb04f;
+}
+.note
+{
+  /* tango:chameleon 0/0.5 */
+  background: #d8ffb2;
+  border-color: #abf562;
+}
+.note, .warning
+{
+  padding: 0.5em;
+  border-width: 1px;
+  border-style: solid;
+}
+.note h3, .warning h3
+{
+  margin-top: 0.0em
+}
+.note p, .warning p
+{
+  margin-bottom: 0.0em
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+  float: right;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+/* code listings */
+
+.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal     { color: #000000; }
+.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
+.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type       { color: #000000; }
+.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+
+.listing_frame {
+  /* tango:sky blue 1 */
+  border: solid 1px #729fcf;
+  padding: 0px;
+}
+
+.listing_lines, .listing_code {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding: 0.5em;
+}
+.listing_lines {
+  /* tango:sky blue 0.5 */
+  background: #a6c5e3;
+  /* tango:aluminium 6 */
+  color: #2e3436;
+}
+.listing_code {
+  /* tango:sky blue 0 */
+  background: #e6f3ff;
+}
+.listing_code .programlisting {
+  /* override from previous */
+  border: none 0px;
+  padding: 0px;
+}
+.listing_lines pre, .listing_code pre {
+  margin: 0px;
+}
+
diff --git a/docs/libdbusmenu-glib/reference/html/up.png b/docs/libdbusmenu-glib/reference/html/up.png
new file mode 100644
index 0000000..85b3e2a
Binary files /dev/null and b/docs/libdbusmenu-glib/reference/html/up.png differ
diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt
new file mode 100644
index 0000000..c8d5db6
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt
@@ -0,0 +1,208 @@
+<SECTION>
+<FILE>client</FILE>
+<TITLE>DbusmenuClient</TITLE>
+DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED
+DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED
+DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM
+DBUSMENU_CLIENT_PROP_DBUS_NAME
+DBUSMENU_CLIENT_PROP_DBUS_OBJECT
+DBUSMENU_CLIENT_TYPES_DEFAULT
+DBUSMENU_CLIENT_TYPES_SEPARATOR
+DBUSMENU_CLIENT_TYPES_IMAGE
+DbusmenuClientClass
+DbusmenuClientTypeHandler
+dbusmenu_client_new
+dbusmenu_client_get_root
+dbusmenu_client_add_type_handler
+dbusmenu_client_send_event
+dbusmenu_client_send_about_to_show
+<SUBSECTION Standard>
+DBUSMENU_CLIENT
+DBUSMENU_IS_CLIENT
+DBUSMENU_TYPE_CLIENT
+dbusmenu_client_get_type
+DBUSMENU_CLIENT_CLASS
+DBUSMENU_IS_CLIENT_CLASS
+DBUSMENU_CLIENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>menuitem</FILE>
+<TITLE>DbusmenuMenuitem</TITLE>
+DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED
+DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED
+DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED
+DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED
+DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED
+DBUSMENU_MENUITEM_SIGNAL_REALIZED
+DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID
+DBUSMENU_MENUITEM_PROP_TYPE
+DBUSMENU_MENUITEM_PROP_VISIBLE
+DBUSMENU_MENUITEM_PROP_ENABLED
+DBUSMENU_MENUITEM_PROP_LABEL
+DBUSMENU_MENUITEM_PROP_ICON_NAME
+DBUSMENU_MENUITEM_PROP_ICON_DATA
+DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE
+DBUSMENU_MENUITEM_PROP_TOGGLE_STATE
+DBUSMENU_MENUITEM_TOGGLE_CHECK
+DBUSMENU_MENUITEM_TOGGLE_RADIO
+DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED
+DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED
+DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN
+DBUSMENU_MENUITEM_ICON_NAME_BLANK
+DbusmenuMenuitem
+dbusmenu_menuitem_about_to_show_cb
+dbusmenu_menuitem_buildxml_slot_t
+DbusmenuMenuitemClass
+dbusmenu_menuitem_new
+dbusmenu_menuitem_new_with_id
+dbusmenu_menuitem_get_id
+dbusmenu_menuitem_get_children
+dbusmenu_menuitem_take_children
+dbusmenu_menuitem_get_position
+dbusmenu_menuitem_get_position_realized
+dbusmenu_menuitem_child_append
+dbusmenu_menuitem_child_prepend
+dbusmenu_menuitem_child_delete
+dbusmenu_menuitem_child_add_position
+dbusmenu_menuitem_child_reorder
+dbusmenu_menuitem_child_find
+dbusmenu_menuitem_find_id
+dbusmenu_menuitem_property_set
+dbusmenu_menuitem_property_set_value
+dbusmenu_menuitem_property_set_bool
+dbusmenu_menuitem_property_set_int
+dbusmenu_menuitem_property_get
+dbusmenu_menuitem_property_get_value
+dbusmenu_menuitem_property_get_bool
+dbusmenu_menuitem_property_get_int
+dbusmenu_menuitem_property_exist
+dbusmenu_menuitem_properties_list
+dbusmenu_menuitem_properties_copy
+dbusmenu_menuitem_property_remove
+dbusmenu_menuitem_set_root
+dbusmenu_menuitem_get_root
+dbusmenu_menuitem_foreach
+dbusmenu_menuitem_handle_event
+dbusmenu_menuitem_send_about_to_show
+<SUBSECTION Standard>
+DBUSMENU_MENUITEM
+DBUSMENU_IS_MENUITEM
+DBUSMENU_TYPE_MENUITEM
+dbusmenu_menuitem_get_type
+DBUSMENU_MENUITEM_CLASS
+DBUSMENU_IS_MENUITEM_CLASS
+DBUSMENU_MENUITEM_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>server</FILE>
+<TITLE>DbusmenuServer</TITLE>
+DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE
+DBUSMENU_SERVER_SIGNAL_ID_UPDATE
+DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED
+DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE
+DBUSMENU_SERVER_PROP_DBUS_OBJECT
+DBUSMENU_SERVER_PROP_ROOT_NODE
+DBUSMENU_SERVER_PROP_VERSION
+DbusmenuServerClass
+dbusmenu_server_new
+dbusmenu_server_set_root
+<SUBSECTION Standard>
+DBUSMENU_SERVER
+DBUSMENU_IS_SERVER
+DBUSMENU_TYPE_SERVER
+dbusmenu_server_get_type
+DBUSMENU_SERVER_CLASS
+DBUSMENU_IS_SERVER_CLASS
+DBUSMENU_SERVER_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>client-menuitem</FILE>
+<TITLE>DbusmenuClientMenuitem</TITLE>
+DBUSMENU_CLIENT_MENUITEM_TYPE
+DbusmenuClientMenuitem
+DbusmenuClientMenuitemClass
+dbusmenu_client_menuitem_new
+<SUBSECTION Standard>
+DBUSMENU_CLIENT_MENUITEM
+DBUSMENU_IS_CLIENT_MENUITEM
+dbusmenu_client_menuitem_get_type
+DBUSMENU_CLIENT_MENUITEM_CLASS
+DBUSMENU_IS_CLIENT_MENUITEM_CLASS
+DBUSMENU_CLIENT_MENUITEM_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>menuitem-proxy</FILE>
+<TITLE>DbusmenuMenuitemProxy</TITLE>
+DbusmenuMenuitemProxy
+DbusmenuMenuitemProxyClass
+dbusmenu_menuitem_proxy_new
+dbusmenu_menuitem_proxy_get_wrapped
+<SUBSECTION Standard>
+DBUSMENU_MENUITEM_PROXY
+DBUSMENU_IS_MENUITEM_PROXY
+DBUSMENU_TYPE_MENUITEM_PROXY
+dbusmenu_menuitem_proxy_get_type
+DBUSMENU_MENUITEM_PROXY_CLASS
+DBUSMENU_IS_MENUITEM_PROXY_CLASS
+DBUSMENU_MENUITEM_PROXY_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>dbusmenu-client</FILE>
+DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu
+org_ayatana_dbusmenu_get_layout
+org_ayatana_dbusmenu_get_layout_reply
+org_ayatana_dbusmenu_get_layout_async
+dbus_g_proxy_begin_call
+org_ayatana_dbusmenu_get_group_properties
+org_ayatana_dbusmenu_get_group_properties_reply
+org_ayatana_dbusmenu_get_group_properties_async
+org_ayatana_dbusmenu_get_children
+org_ayatana_dbusmenu_get_children_reply
+org_ayatana_dbusmenu_get_children_async
+org_ayatana_dbusmenu_get_property
+org_ayatana_dbusmenu_get_property_reply
+org_ayatana_dbusmenu_get_property_async
+org_ayatana_dbusmenu_get_properties
+org_ayatana_dbusmenu_get_properties_reply
+org_ayatana_dbusmenu_get_properties_async
+org_ayatana_dbusmenu_event
+org_ayatana_dbusmenu_event_reply
+org_ayatana_dbusmenu_event_async
+org_ayatana_dbusmenu_about_to_show
+org_ayatana_dbusmenu_about_to_show_reply
+org_ayatana_dbusmenu_about_to_show_async
+</SECTION>
+
+<SECTION>
+<FILE>dbusmenu-server</FILE>
+g_marshal_value_peek_boolean
+g_marshal_value_peek_char
+g_marshal_value_peek_uchar
+g_marshal_value_peek_int
+g_marshal_value_peek_uint
+g_marshal_value_peek_long
+g_marshal_value_peek_ulong
+g_marshal_value_peek_int64
+g_marshal_value_peek_uint64
+g_marshal_value_peek_enum
+g_marshal_value_peek_flags
+g_marshal_value_peek_float
+g_marshal_value_peek_double
+g_marshal_value_peek_string
+g_marshal_value_peek_param
+g_marshal_value_peek_boxed
+g_marshal_value_peek_pointer
+g_marshal_value_peek_object
+dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER
+dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER
+dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER
+dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER
+dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER
+dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER
+</SECTION>
+
diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib.types b/docs/libdbusmenu-glib/reference/libdbusmenu-glib.types
new file mode 100644
index 0000000..a1b7aea
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib.types
@@ -0,0 +1,5 @@
+dbusmenu_client_get_type
+dbusmenu_client_menuitem_get_type
+dbusmenu_menuitem_get_type
+dbusmenu_menuitem_proxy_get_type
+dbusmenu_server_get_type
diff --git a/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml b/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml
new file mode 100644
index 0000000..5b04578
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml
@@ -0,0 +1,54 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuClientMenuitem
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_MENUITEM_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DbusmenuClientMenuitem ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT DbusmenuClientMenuitemClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+
+<!-- ##### FUNCTION dbusmenu_client_menuitem_new ##### -->
+<para>
+
+</para>
+
+@id: 
+@client: 
+@Returns: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/tmpl/client.sgml b/docs/libdbusmenu-glib/reference/tmpl/client.sgml
new file mode 100644
index 0000000..93b203a
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/client.sgml
@@ -0,0 +1,158 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuClient
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_PROP_DBUS_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_PROP_DBUS_OBJECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_TYPES_DEFAULT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_TYPES_SEPARATOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_CLIENT_TYPES_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DbusmenuClientClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+@layout_updated: 
+@root_changed: 
+@new_menuitem: 
+@reserved1: 
+@reserved2: 
+@reserved3: 
+@reserved4: 
+
+<!-- ##### USER_FUNCTION DbusmenuClientTypeHandler ##### -->
+<para>
+
+</para>
+
+@newitem: 
+@parent: 
+@client: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_client_new ##### -->
+<para>
+
+</para>
+
+@name: 
+@object: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_client_get_root ##### -->
+<para>
+
+</para>
+
+@client: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_client_add_type_handler ##### -->
+<para>
+
+</para>
+
+@client: 
+@type: 
+@newfunc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_client_send_event ##### -->
+<para>
+
+</para>
+
+@client: 
+@id: 
+@name: 
+@value: 
+@timestamp: 
+
+
+<!-- ##### FUNCTION dbusmenu_client_send_about_to_show ##### -->
+<para>
+
+</para>
+
+@client: 
+@id: 
+@gpointer user_data: 
+@cb_data: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml b/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml
new file mode 100644
index 0000000..dd0e9d1
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml
@@ -0,0 +1,285 @@
+<!-- ##### SECTION Title ##### -->
+dbusmenu-client
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_layout ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_parentId: 
+@OUT_revision: 
+@OUT_layout: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_layout_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@OUT_revision: 
+@OUT_layout: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_layout_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_parentId: 
+@callback: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
+<para>
+
+</para>
+
+@Param1: 
+@Returns: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_group_properties ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_ids: 
+@IN_propertyNames: 
+@OUT_properties: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_group_properties_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@OUT_properties: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_group_properties_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_ids: 
+@IN_propertyNames: 
+@callback: 
+@Returns: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_children ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_propertyNames: 
+@OUT_properties: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_children_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@OUT_properties: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_children_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_propertyNames: 
+@callback: 
+@Returns: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_property ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_name: 
+@OUT_value: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_property_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@OUT_value: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_property_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_name: 
+@callback: 
+@Returns: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_properties ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_propertyNames: 
+@OUT_properties: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_properties_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@OUT_properties: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_get_properties_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_propertyNames: 
+@callback: 
+@Returns: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_event ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_eventId: 
+@IN_data: 
+@IN_timestamp: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_event_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_event_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@IN_eventId: 
+@IN_data: 
+@IN_timestamp: 
+@callback: 
+@Returns: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_about_to_show ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@OUT_needUpdate: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_about_to_show_reply ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@OUT_needUpdate: 
+@error: 
+@userdata: 
+
+
+<!-- ##### FUNCTION org_ayatana_dbusmenu_about_to_show_async ##### -->
+<para>
+
+</para>
+
+@proxy: 
+@IN_id: 
+@callback: 
+@Returns: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml b/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml
new file mode 100644
index 0000000..a08ae24
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml
@@ -0,0 +1,246 @@
+<!-- ##### SECTION Title ##### -->
+dbusmenu-server
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_char ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_int ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_long ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_float ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_double ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_string ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_param ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### MACRO g_marshal_value_peek_object ##### -->
+<para>
+
+</para>
+
+@v: 
+
+
+<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/tmpl/libdbusmenu-glib-unused.sgml b/docs/libdbusmenu-glib/reference/tmpl/libdbusmenu-glib-unused.sgml
new file mode 100644
index 0000000..e69de29
diff --git a/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml b/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml
new file mode 100644
index 0000000..acaeec5
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml
@@ -0,0 +1,60 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuMenuitemProxy
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT DbusmenuMenuitemProxy ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG DbusmenuMenuitemProxy:menu-item ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT DbusmenuMenuitemProxyClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+
+<!-- ##### FUNCTION dbusmenu_menuitem_proxy_new ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_proxy_get_wrapped ##### -->
+<para>
+
+</para>
+
+@pmi: 
+@Returns: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml b/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml
new file mode 100644
index 0000000..2b094e8
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml
@@ -0,0 +1,575 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuMenuitem
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_REALIZED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_VISIBLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_ENABLED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_LABEL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_ICON_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_ICON_DATA ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_PROP_TOGGLE_STATE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_TOGGLE_CHECK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_TOGGLE_RADIO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_MENUITEM_ICON_NAME_BLANK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DbusmenuMenuitem ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL DbusmenuMenuitem::child-added ##### -->
+<para>
+
+</para>
+
+@dbusmenumenuitem: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL DbusmenuMenuitem::child-moved ##### -->
+<para>
+
+</para>
+
+@dbusmenumenuitem: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
+<!-- ##### SIGNAL DbusmenuMenuitem::child-removed ##### -->
+<para>
+
+</para>
+
+@dbusmenumenuitem: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL DbusmenuMenuitem::item-activated ##### -->
+<para>
+
+</para>
+
+@dbusmenumenuitem: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL DbusmenuMenuitem::property-changed ##### -->
+<para>
+
+</para>
+
+@dbusmenumenuitem: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL DbusmenuMenuitem::realized ##### -->
+<para>
+
+</para>
+
+@dbusmenumenuitem: the object which received the signal.
+
+<!-- ##### ARG DbusmenuMenuitem:id ##### -->
+<para>
+
+</para>
+
+<!-- ##### USER_FUNCTION dbusmenu_menuitem_about_to_show_cb ##### -->
+<para>
+
+</para>
+
+@mi: 
+@user_data: 
+
+
+<!-- ##### USER_FUNCTION dbusmenu_menuitem_buildxml_slot_t ##### -->
+<para>
+
+</para>
+
+@mi: 
+@stringarray: 
+
+
+<!-- ##### STRUCT DbusmenuMenuitemClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+@property_changed: 
+@item_activated: 
+@child_added: 
+@child_removed: 
+@child_moved: 
+@realized: 
+@buildxml: 
+@handle_event: 
+@send_about_to_show: 
+@reserved1: 
+
+<!-- ##### FUNCTION dbusmenu_menuitem_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_new_with_id ##### -->
+<para>
+
+</para>
+
+@id: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_get_id ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_get_children ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_take_children ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_get_position ##### -->
+<para>
+
+</para>
+
+@mi: 
+@parent: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_get_position_realized ##### -->
+<para>
+
+</para>
+
+@mi: 
+@parent: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_child_append ##### -->
+<para>
+
+</para>
+
+@mi: 
+@child: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_child_prepend ##### -->
+<para>
+
+</para>
+
+@mi: 
+@child: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_child_delete ##### -->
+<para>
+
+</para>
+
+@mi: 
+@child: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_child_add_position ##### -->
+<para>
+
+</para>
+
+@mi: 
+@child: 
+@position: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_child_reorder ##### -->
+<para>
+
+</para>
+
+@mi: 
+@child: 
+@position: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_child_find ##### -->
+<para>
+
+</para>
+
+@mi: 
+@id: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_find_id ##### -->
+<para>
+
+</para>
+
+@mi: 
+@id: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_set ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_set_value ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_set_bool ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_set_int ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_get ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_get_value ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_get_bool ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_get_int ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_exist ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_properties_list ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_properties_copy ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_remove ##### -->
+<para>
+
+</para>
+
+@mi: 
+@property: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_set_root ##### -->
+<para>
+
+</para>
+
+@mi: 
+@root: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_get_root ##### -->
+<para>
+
+</para>
+
+@mi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_foreach ##### -->
+<para>
+
+</para>
+
+@mi: 
+@DbusmenuMenuitem * mi, gpointer data: 
+@data: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_handle_event ##### -->
+<para>
+
+</para>
+
+@mi: 
+@name: 
+@value: 
+@timestamp: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_send_about_to_show ##### -->
+<para>
+
+</para>
+
+@mi: 
+@cb: 
+@cb_data: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/tmpl/server.sgml b/docs/libdbusmenu-glib/reference/tmpl/server.sgml
new file mode 100644
index 0000000..cd8ecc7
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/tmpl/server.sgml
@@ -0,0 +1,105 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuServer
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_SIGNAL_ID_UPDATE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_PROP_DBUS_OBJECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_PROP_ROOT_NODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_SERVER_PROP_VERSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DbusmenuServerClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+@id_prop_update: 
+@id_update: 
+@layout_updated: 
+@dbusmenu_server_reserved1: 
+@dbusmenu_server_reserved2: 
+@dbusmenu_server_reserved3: 
+@dbusmenu_server_reserved4: 
+
+<!-- ##### FUNCTION dbusmenu_server_new ##### -->
+<para>
+
+</para>
+
+@object: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_server_set_root ##### -->
+<para>
+
+</para>
+
+@server: 
+@root: 
+
+
diff --git a/docs/libdbusmenu-glib/reference/version.xml b/docs/libdbusmenu-glib/reference/version.xml
new file mode 100644
index 0000000..9e11b32
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/version.xml
@@ -0,0 +1 @@
+0.3.1
diff --git a/docs/libdbusmenu-glib/reference/xml/annotation-glossary.xml b/docs/libdbusmenu-glib/reference/xml/annotation-glossary.xml
new file mode 100644
index 0000000..2dfb261
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/annotation-glossary.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+
+<glossary id="annotation-glossary">
+  <title>Annotation Glossary</title>
+<glossdiv><title>A</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-array"/>array</glossterm>
+      <glossdef>
+        <para>Parameter points to an array of items.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+<glossdiv><title>E</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-element-type"/>element-type</glossterm>
+      <glossdef>
+        <para>Generics and defining elements of containers and arrays.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+<glossdiv><title>I</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-inout"/>inout</glossterm>
+      <glossdef>
+        <para>Parameter for input and for returning results. Default is <acronym>transfer full</acronym>.</para>
+      </glossdef>
+    </glossentry>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-in"/>in</glossterm>
+      <glossdef>
+        <para>Parameter for input. Default is <acronym>transfer none</acronym>.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+<glossdiv><title>T</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-transfer full"/>transfer full</glossterm>
+      <glossdef>
+        <para>Free data after the code is done.</para>
+      </glossdef>
+    </glossentry>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-transfer none"/>transfer none</glossterm>
+      <glossdef>
+        <para>Don't free data after the code is done.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+</glossary>
diff --git a/docs/libdbusmenu-glib/reference/xml/api-index-deprecated.xml b/docs/libdbusmenu-glib/reference/xml/api-index-deprecated.xml
new file mode 100644
index 0000000..8ec0fe4
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/api-index-deprecated.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<indexdiv>
+</indexdiv>
diff --git a/docs/libdbusmenu-glib/reference/xml/api-index-full.xml b/docs/libdbusmenu-glib/reference/xml/api-index-full.xml
new file mode 100644
index 0000000..84ae6cb
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/api-index-full.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<indexdiv>
+<indexdiv><title>G</title>
+<indexentry><primaryie linkends="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"><link linkend="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu">DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"><link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"><link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"><link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"><link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"><link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"><link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-boolean"><link linkend="g-marshal-value-peek-boolean">g_marshal_value_peek_boolean</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-boxed"><link linkend="g-marshal-value-peek-boxed">g_marshal_value_peek_boxed</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-char"><link linkend="g-marshal-value-peek-char">g_marshal_value_peek_char</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-double"><link linkend="g-marshal-value-peek-double">g_marshal_value_peek_double</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-enum"><link linkend="g-marshal-value-peek-enum">g_marshal_value_peek_enum</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-flags"><link linkend="g-marshal-value-peek-flags">g_marshal_value_peek_flags</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-float"><link linkend="g-marshal-value-peek-float">g_marshal_value_peek_float</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-int"><link linkend="g-marshal-value-peek-int">g_marshal_value_peek_int</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-int64"><link linkend="g-marshal-value-peek-int64">g_marshal_value_peek_int64</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-long"><link linkend="g-marshal-value-peek-long">g_marshal_value_peek_long</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-object"><link linkend="g-marshal-value-peek-object">g_marshal_value_peek_object</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-param"><link linkend="g-marshal-value-peek-param">g_marshal_value_peek_param</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-pointer"><link linkend="g-marshal-value-peek-pointer">g_marshal_value_peek_pointer</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-string"><link linkend="g-marshal-value-peek-string">g_marshal_value_peek_string</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-uchar"><link linkend="g-marshal-value-peek-uchar">g_marshal_value_peek_uchar</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-uint"><link linkend="g-marshal-value-peek-uint">g_marshal_value_peek_uint</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-uint64"><link linkend="g-marshal-value-peek-uint64">g_marshal_value_peek_uint64</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="g-marshal-value-peek-ulong"><link linkend="g-marshal-value-peek-ulong">g_marshal_value_peek_ulong</link>, macro in <link linkend="libdbusmenu-glib-dbusmenu-server">dbusmenu-server</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbus-g-proxy-begin-call"><link linkend="dbus-g-proxy-begin-call">dbus_g_proxy_begin_call</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>M</title>
+<indexentry><primaryie linkends="DbusmenuClientClass"><link linkend="DbusmenuClientClass">DbusmenuClientClass</link>, struct in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuClientMenuitem-struct"><link linkend="DbusmenuClientMenuitem-struct">DbusmenuClientMenuitem</link>, struct in <link linkend="DbusmenuClientMenuitem">DbusmenuClientMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuClientMenuitemClass"><link linkend="DbusmenuClientMenuitemClass">DbusmenuClientMenuitemClass</link>, struct in <link linkend="DbusmenuClientMenuitem">DbusmenuClientMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuClientTypeHandler"><link linkend="DbusmenuClientTypeHandler">DbusmenuClientTypeHandler</link>, user_function in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-struct"><link linkend="DbusmenuMenuitem-struct">DbusmenuMenuitem</link>, struct in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-child-added"><link linkend="DbusmenuMenuitem-child-added">DbusmenuMenuitem::child-added</link>, object signal in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-child-moved"><link linkend="DbusmenuMenuitem-child-moved">DbusmenuMenuitem::child-moved</link>, object signal in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-child-removed"><link linkend="DbusmenuMenuitem-child-removed">DbusmenuMenuitem::child-removed</link>, object signal in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-item-activated"><link linkend="DbusmenuMenuitem-item-activated">DbusmenuMenuitem::item-activated</link>, object signal in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-property-changed"><link linkend="DbusmenuMenuitem-property-changed">DbusmenuMenuitem::property-changed</link>, object signal in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem-realized"><link linkend="DbusmenuMenuitem-realized">DbusmenuMenuitem::realized</link>, object signal in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitem--id"><link linkend="DbusmenuMenuitem--id">DbusmenuMenuitem:id</link>, object property in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitemClass"><link linkend="DbusmenuMenuitemClass">DbusmenuMenuitemClass</link>, struct in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitemProxy-struct"><link linkend="DbusmenuMenuitemProxy-struct">DbusmenuMenuitemProxy</link>, struct in <link linkend="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitemProxy--menu-item"><link linkend="DbusmenuMenuitemProxy--menu-item">DbusmenuMenuitemProxy:menu-item</link>, object property in <link linkend="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuMenuitemProxyClass"><link linkend="DbusmenuMenuitemProxyClass">DbusmenuMenuitemProxyClass</link>, struct in <link linkend="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuServerClass"><link linkend="DbusmenuServerClass">DbusmenuServerClass</link>, struct in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-client-add-type-handler"><link linkend="dbusmenu-client-add-type-handler">dbusmenu_client_add_type_handler</link>, function in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-client-get-root"><link linkend="dbusmenu-client-get-root">dbusmenu_client_get_root</link>, function in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-client-menuitem-new"><link linkend="dbusmenu-client-menuitem-new">dbusmenu_client_menuitem_new</link>, function in <link linkend="DbusmenuClientMenuitem">DbusmenuClientMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS"><link linkend="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS">DBUSMENU_CLIENT_MENUITEM_TYPE</link>, macro in <link linkend="DbusmenuClientMenuitem">DbusmenuClientMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-client-new"><link linkend="dbusmenu-client-new">dbusmenu_client_new</link>, function in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS"><link linkend="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS">DBUSMENU_CLIENT_PROP_DBUS_NAME</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS"><link linkend="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS">DBUSMENU_CLIENT_PROP_DBUS_OBJECT</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-client-send-about-to-show"><link linkend="dbusmenu-client-send-about-to-show">dbusmenu_client_send_about_to_show</link>, function in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-client-send-event"><link linkend="dbusmenu-client-send-event">dbusmenu_client_send_event</link>, function in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS"><link linkend="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS">DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS"><link linkend="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS">DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS"><link linkend="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS">DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS"><link linkend="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS">DBUSMENU_CLIENT_TYPES_DEFAULT</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS"><link linkend="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS">DBUSMENU_CLIENT_TYPES_IMAGE</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS"><link linkend="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS">DBUSMENU_CLIENT_TYPES_SEPARATOR</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuClient">DbusmenuClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-about-to-show-cb"><link linkend="dbusmenu-menuitem-about-to-show-cb">dbusmenu_menuitem_about_to_show_cb</link>, user_function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-buildxml-slot-t"><link linkend="dbusmenu-menuitem-buildxml-slot-t">dbusmenu_menuitem_buildxml_slot_t</link>, user_function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-child-add-position"><link linkend="dbusmenu-menuitem-child-add-position">dbusmenu_menuitem_child_add_position</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-child-append"><link linkend="dbusmenu-menuitem-child-append">dbusmenu_menuitem_child_append</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-child-delete"><link linkend="dbusmenu-menuitem-child-delete">dbusmenu_menuitem_child_delete</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-child-find"><link linkend="dbusmenu-menuitem-child-find">dbusmenu_menuitem_child_find</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-child-prepend"><link linkend="dbusmenu-menuitem-child-prepend">dbusmenu_menuitem_child_prepend</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-child-reorder"><link linkend="dbusmenu-menuitem-child-reorder">dbusmenu_menuitem_child_reorder</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-find-id"><link linkend="dbusmenu-menuitem-find-id">dbusmenu_menuitem_find_id</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-foreach"><link linkend="dbusmenu-menuitem-foreach">dbusmenu_menuitem_foreach</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-get-children"><link linkend="dbusmenu-menuitem-get-children">dbusmenu_menuitem_get_children</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-get-id"><link linkend="dbusmenu-menuitem-get-id">dbusmenu_menuitem_get_id</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-get-position"><link linkend="dbusmenu-menuitem-get-position">dbusmenu_menuitem_get_position</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-get-position-realized"><link linkend="dbusmenu-menuitem-get-position-realized">dbusmenu_menuitem_get_position_realized</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-get-root"><link linkend="dbusmenu-menuitem-get-root">dbusmenu_menuitem_get_root</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-handle-event"><link linkend="dbusmenu-menuitem-handle-event">dbusmenu_menuitem_handle_event</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS"><link linkend="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS">DBUSMENU_MENUITEM_ICON_NAME_BLANK</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-new"><link linkend="dbusmenu-menuitem-new">dbusmenu_menuitem_new</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-new-with-id"><link linkend="dbusmenu-menuitem-new-with-id">dbusmenu_menuitem_new_with_id</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-properties-copy"><link linkend="dbusmenu-menuitem-properties-copy">dbusmenu_menuitem_properties_copy</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-properties-list"><link linkend="dbusmenu-menuitem-properties-list">dbusmenu_menuitem_properties_list</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-exist"><link linkend="dbusmenu-menuitem-property-exist">dbusmenu_menuitem_property_exist</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-get"><link linkend="dbusmenu-menuitem-property-get">dbusmenu_menuitem_property_get</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-get-bool"><link linkend="dbusmenu-menuitem-property-get-bool">dbusmenu_menuitem_property_get_bool</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-get-int"><link linkend="dbusmenu-menuitem-property-get-int">dbusmenu_menuitem_property_get_int</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-get-value"><link linkend="dbusmenu-menuitem-property-get-value">dbusmenu_menuitem_property_get_value</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-remove"><link linkend="dbusmenu-menuitem-property-remove">dbusmenu_menuitem_property_remove</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-set"><link linkend="dbusmenu-menuitem-property-set">dbusmenu_menuitem_property_set</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-bool"><link linkend="dbusmenu-menuitem-property-set-bool">dbusmenu_menuitem_property_set_bool</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-int"><link linkend="dbusmenu-menuitem-property-set-int">dbusmenu_menuitem_property_set_int</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-value"><link linkend="dbusmenu-menuitem-property-set-value">dbusmenu_menuitem_property_set_value</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS">DBUSMENU_MENUITEM_PROP_ENABLED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS">DBUSMENU_MENUITEM_PROP_ICON_DATA</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS">DBUSMENU_MENUITEM_PROP_ICON_NAME</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-LABEL:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-LABEL:CAPS">DBUSMENU_MENUITEM_PROP_LABEL</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS">DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS">DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-TYPE:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-TYPE:CAPS">DBUSMENU_MENUITEM_PROP_TYPE</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS"><link linkend="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS">DBUSMENU_MENUITEM_PROP_VISIBLE</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-proxy-get-wrapped"><link linkend="dbusmenu-menuitem-proxy-get-wrapped">dbusmenu_menuitem_proxy_get_wrapped</link>, function in <link linkend="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-proxy-new"><link linkend="dbusmenu-menuitem-proxy-new">dbusmenu_menuitem_proxy_new</link>, function in <link linkend="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-send-about-to-show"><link linkend="dbusmenu-menuitem-send-about-to-show">dbusmenu_menuitem_send_about_to_show</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-set-root"><link linkend="dbusmenu-menuitem-set-root">dbusmenu_menuitem_set_root</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS">DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS">DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS">DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS">DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS">DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS">DBUSMENU_MENUITEM_SIGNAL_REALIZED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS"><link linkend="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS">DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-take-children"><link linkend="dbusmenu-menuitem-take-children">dbusmenu_menuitem_take_children</link>, function in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS"><link linkend="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS">DBUSMENU_MENUITEM_TOGGLE_CHECK</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS"><link linkend="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS">DBUSMENU_MENUITEM_TOGGLE_RADIO</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS"><link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS"><link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS"><link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</link>, macro in <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-server-new"><link linkend="dbusmenu-server-new">dbusmenu_server_new</link>, function in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS"><link linkend="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS">DBUSMENU_SERVER_PROP_DBUS_OBJECT</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS"><link linkend="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS">DBUSMENU_SERVER_PROP_ROOT_NODE</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-PROP-VERSION:CAPS"><link linkend="DBUSMENU-SERVER-PROP-VERSION:CAPS">DBUSMENU_SERVER_PROP_VERSION</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-server-set-root"><link linkend="dbusmenu-server-set-root">dbusmenu_server_set_root</link>, function in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS"><link linkend="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS">DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS"><link linkend="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS">DBUSMENU_SERVER_SIGNAL_ID_UPDATE</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS"><link linkend="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS"><link linkend="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuServer">DbusmenuServer</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>O</title>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-about-to-show"><link linkend="org-ayatana-dbusmenu-about-to-show">org_ayatana_dbusmenu_about_to_show</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-about-to-show-async"><link linkend="org-ayatana-dbusmenu-about-to-show-async">org_ayatana_dbusmenu_about_to_show_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-about-to-show-reply"><link linkend="org-ayatana-dbusmenu-about-to-show-reply">org_ayatana_dbusmenu_about_to_show_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-event"><link linkend="org-ayatana-dbusmenu-event">org_ayatana_dbusmenu_event</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-event-async"><link linkend="org-ayatana-dbusmenu-event-async">org_ayatana_dbusmenu_event_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-event-reply"><link linkend="org-ayatana-dbusmenu-event-reply">org_ayatana_dbusmenu_event_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-children"><link linkend="org-ayatana-dbusmenu-get-children">org_ayatana_dbusmenu_get_children</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-children-async"><link linkend="org-ayatana-dbusmenu-get-children-async">org_ayatana_dbusmenu_get_children_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-children-reply"><link linkend="org-ayatana-dbusmenu-get-children-reply">org_ayatana_dbusmenu_get_children_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-group-properties"><link linkend="org-ayatana-dbusmenu-get-group-properties">org_ayatana_dbusmenu_get_group_properties</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-group-properties-async"><link linkend="org-ayatana-dbusmenu-get-group-properties-async">org_ayatana_dbusmenu_get_group_properties_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-group-properties-reply"><link linkend="org-ayatana-dbusmenu-get-group-properties-reply">org_ayatana_dbusmenu_get_group_properties_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-layout"><link linkend="org-ayatana-dbusmenu-get-layout">org_ayatana_dbusmenu_get_layout</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-layout-async"><link linkend="org-ayatana-dbusmenu-get-layout-async">org_ayatana_dbusmenu_get_layout_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-layout-reply"><link linkend="org-ayatana-dbusmenu-get-layout-reply">org_ayatana_dbusmenu_get_layout_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-properties"><link linkend="org-ayatana-dbusmenu-get-properties">org_ayatana_dbusmenu_get_properties</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-properties-async"><link linkend="org-ayatana-dbusmenu-get-properties-async">org_ayatana_dbusmenu_get_properties_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-properties-reply"><link linkend="org-ayatana-dbusmenu-get-properties-reply">org_ayatana_dbusmenu_get_properties_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-property"><link linkend="org-ayatana-dbusmenu-get-property">org_ayatana_dbusmenu_get_property</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-property-async"><link linkend="org-ayatana-dbusmenu-get-property-async">org_ayatana_dbusmenu_get_property_async</link>, function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+<indexentry><primaryie linkends="org-ayatana-dbusmenu-get-property-reply"><link linkend="org-ayatana-dbusmenu-get-property-reply">org_ayatana_dbusmenu_get_property_reply</link>, user_function in <link linkend="libdbusmenu-glib-dbusmenu-client">dbusmenu-client</link></primaryie></indexentry>
+</indexdiv>
+</indexdiv>
diff --git a/docs/libdbusmenu-glib/reference/xml/client-menuitem.xml b/docs/libdbusmenu-glib/reference/xml/client-menuitem.xml
new file mode 100644
index 0000000..06208c9
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/client-menuitem.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="DbusmenuClientMenuitem">
+<refmeta>
+<refentrytitle role="top_of_page" id="DbusmenuClientMenuitem.top_of_page">DbusmenuClientMenuitem</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuClientMenuitem</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="DbusmenuClientMenuitem.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS">DBUSMENU_CLIENT_MENUITEM_TYPE</link>
+                    <link linkend="DbusmenuClientMenuitem-struct">DbusmenuClientMenuitem</link>;
+                    <link linkend="DbusmenuClientMenuitemClass">DbusmenuClientMenuitemClass</link>;
+<link linkend="DbusmenuClientMenuitem"><returnvalue>DbusmenuClientMenuitem</returnvalue></link> * <link linkend="dbusmenu-client-menuitem-new">dbusmenu_client_menuitem_new</link>   (<parameter><link linkend="gint"><type>gint</type></link> id</parameter>,
+                                                         <parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>);
+</synopsis>
+</refsynopsisdiv>
+<refsect1 id="DbusmenuClientMenuitem.object-hierarchy" role="object_hierarchy">
+<title role="object_hierarchy.title">Object Hierarchy</title>
+<synopsis>
+  <link linkend="GObject">GObject</link>
+   +----<link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>
+         +----DbusmenuClientMenuitem
+</synopsis>
+</refsect1>
+
+<refsect1 id="DbusmenuClientMenuitem.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="DbusmenuClientMenuitem.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_MENUITEM_TYPE</title>
+<indexterm zone="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS"><primary>DBUSMENU_CLIENT_MENUITEM_TYPE</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_MENUITEM_TYPE            (dbusmenu_client_menuitem_get_type ())
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuClientMenuitem-struct" role="struct">
+<title>DbusmenuClientMenuitem</title>
+<indexterm zone="DbusmenuClientMenuitem-struct"><primary>DbusmenuClientMenuitem</primary></indexterm>
+<programlisting>typedef struct _DbusmenuClientMenuitem DbusmenuClientMenuitem;</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuClientMenuitemClass" role="struct">
+<title>DbusmenuClientMenuitemClass</title>
+<indexterm zone="DbusmenuClientMenuitemClass"><primary>DbusmenuClientMenuitemClass</primary></indexterm>
+<programlisting>typedef struct {
+	DbusmenuMenuitemClass parent_class;
+} DbusmenuClientMenuitemClass;
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="dbusmenu-client-menuitem-new" role="function">
+<title>dbusmenu_client_menuitem_new ()</title>
+<indexterm zone="dbusmenu-client-menuitem-new"><primary>dbusmenu_client_menuitem_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuClientMenuitem"><returnvalue>DbusmenuClientMenuitem</returnvalue></link> * dbusmenu_client_menuitem_new   (<parameter><link linkend="gint"><type>gint</type></link> id</parameter>,
+                                                         <parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/client.xml b/docs/libdbusmenu-glib/reference/xml/client.xml
new file mode 100644
index 0000000..a8d62bf
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/client.xml
@@ -0,0 +1,336 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-glib-DbusmenuClient">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-glib-DbusmenuClient.top_of_page">DbusmenuClient</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuClient</refname>
+<refpurpose>The catcher of all the server traffic</refpurpose>
+</refnamediv>
+<refsect1 id="libdbusmenu-glib-DbusmenuClient.stability-level">
+<title>Stability Level</title>
+Unstable, unless otherwise indicated
+</refsect1>
+
+<refsynopsisdiv id="libdbusmenu-glib-DbusmenuClient.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>
+#include &lt;libdbusmenu-glib/client.h&gt;
+
+#define             <link linkend="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS">DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</link>
+#define             <link linkend="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS">DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</link>
+#define             <link linkend="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS">DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</link>
+#define             <link linkend="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS">DBUSMENU_CLIENT_PROP_DBUS_NAME</link>
+#define             <link linkend="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS">DBUSMENU_CLIENT_PROP_DBUS_OBJECT</link>
+#define             <link linkend="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS">DBUSMENU_CLIENT_TYPES_DEFAULT</link>
+#define             <link linkend="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS">DBUSMENU_CLIENT_TYPES_SEPARATOR</link>
+#define             <link linkend="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS">DBUSMENU_CLIENT_TYPES_IMAGE</link>
+                    <link linkend="DbusmenuClientClass">DbusmenuClientClass</link>;
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            (<link linkend="DbusmenuClientTypeHandler">*DbusmenuClientTypeHandler</link>)        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *newitem</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>,
+                                                         <parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>);
+<link linkend="DbusmenuClient"><returnvalue>DbusmenuClient</returnvalue></link> *    <link linkend="dbusmenu-client-new">dbusmenu_client_new</link>                 (<parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *object</parameter>);
+<link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-client-get-root">dbusmenu_client_get_root</link>            (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-client-add-type-handler">dbusmenu_client_add_type_handler</link>    (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *type</parameter>,
+                                                         <parameter><link linkend="DbusmenuClientTypeHandler"><type>DbusmenuClientTypeHandler</type></link> newfunc</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-client-send-event">dbusmenu_client_send_event</link>          (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> timestamp</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-client-send-about-to-show">dbusmenu_client_send_about_to_show</link>  (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (cbgpointer user_data) ()</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> cb_data</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-glib-DbusmenuClient.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+The client exists as a mirror to the server.  For most folks
+	all they will do with a client is set it up to connect to
+	a server and then watch as the menu items on their side
+	of the bus change.  This is all they should need to know about
+	the client, that it magically makes their menuitems dance.
+</para>
+<para>
+	It does this by setting up signal watchers and adjusting
+	the menuitems appropriately.  Most users should watch the
+	menu items and the signal <link linkend="DbusmenuClient-layout-changed"><type>"layout-changed"</type></link> for
+	larger events so that they can be optimized.  It is possible
+	with that signal that even the root node would change.  If
+	that doesn't happen the normal signals on the individual
+	nodes should be enough for most users.
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-glib-DbusmenuClient.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</title>
+<indexterm zone="DBUSMENU-CLIENT-SIGNAL-LAYOUT-UPDATED:CAPS"><primary>DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED  "layout-updated"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</title>
+<indexterm zone="DBUSMENU-CLIENT-SIGNAL-ROOT-CHANGED:CAPS"><primary>DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED    "root-changed"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</title>
+<indexterm zone="DBUSMENU-CLIENT-SIGNAL-NEW-MENUITEM:CAPS"><primary>DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM    "new-menuitem"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_PROP_DBUS_NAME</title>
+<indexterm zone="DBUSMENU-CLIENT-PROP-DBUS-NAME:CAPS"><primary>DBUSMENU_CLIENT_PROP_DBUS_NAME</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_PROP_DBUS_NAME     "dbus-name"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_PROP_DBUS_OBJECT</title>
+<indexterm zone="DBUSMENU-CLIENT-PROP-DBUS-OBJECT:CAPS"><primary>DBUSMENU_CLIENT_PROP_DBUS_OBJECT</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_PROP_DBUS_OBJECT   "dbus-object"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_TYPES_DEFAULT</title>
+<indexterm zone="DBUSMENU-CLIENT-TYPES-DEFAULT:CAPS"><primary>DBUSMENU_CLIENT_TYPES_DEFAULT</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_TYPES_DEFAULT      "standard"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_TYPES_SEPARATOR</title>
+<indexterm zone="DBUSMENU-CLIENT-TYPES-SEPARATOR:CAPS"><primary>DBUSMENU_CLIENT_TYPES_SEPARATOR</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_TYPES_SEPARATOR    "separator"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS" role="macro">
+<title>DBUSMENU_CLIENT_TYPES_IMAGE</title>
+<indexterm zone="DBUSMENU-CLIENT-TYPES-IMAGE:CAPS"><primary>DBUSMENU_CLIENT_TYPES_IMAGE</primary></indexterm>
+<programlisting>#define DBUSMENU_CLIENT_TYPES_IMAGE        "standard"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuClientClass" role="struct">
+<title>DbusmenuClientClass</title>
+<indexterm zone="DbusmenuClientClass"><primary>DbusmenuClientClass</primary></indexterm>
+<programlisting>typedef struct {
+	GObjectClass parent_class;
+
+	void (*layout_updated)(void);
+	void (*root_changed) (DbusmenuMenuitem * newroot);
+	void (*new_menuitem) (DbusmenuMenuitem * newitem);
+
+	/* Reserved for future use */
+	void (*reserved1) (void);
+	void (*reserved2) (void);
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+} DbusmenuClientClass;
+</programlisting>
+<para>
+A simple class that takes all of the information from a
+	<link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> over DBus and makes the same set of 
+	<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects appear on the other side.
+</para><variablelist role="struct">
+<varlistentry><term><link linkend="GObjectClass"><type>GObjectClass</type></link>&#160;<structfield id="DbusmenuClientClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara><link linkend="GObjectClass"><type>GObjectClass</type></link>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.layout-updated">layout_updated</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuClient-layout-updated"><type>"layout-updated"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.root-changed">root_changed</structfield>&#160;()</term>
+<listitem><simpara>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.new-menuitem">new_menuitem</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuClient-new-menuitem"><type>"new-menuitem"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.reserved1">reserved1</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.reserved2">reserved2</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.reserved3">reserved3</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuClientClass.reserved4">reserved4</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="DbusmenuClientTypeHandler" role="function">
+<title>DbusmenuClientTypeHandler ()</title>
+<indexterm zone="DbusmenuClientTypeHandler"><primary>DbusmenuClientTypeHandler</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            (*DbusmenuClientTypeHandler)        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *newitem</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>,
+                                                         <parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>newitem</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-client-new" role="function">
+<title>dbusmenu_client_new ()</title>
+<indexterm zone="dbusmenu-client-new"><primary>dbusmenu_client_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuClient"><returnvalue>DbusmenuClient</returnvalue></link> *    dbusmenu_client_new                 (<parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *object</parameter>);</programlisting>
+<para>
+This function creates a new client that connects to a specific
+	server on DBus.  That server is at a specific location sharing
+	a known object.  The interface is assumed by the code to be 
+	the DBus menu interface.  The newly created client will start
+	sending out events as it syncs up with the server.
+</para><variablelist role="params">
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
+<listitem><simpara>The DBus name for the server to connect to
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>object</parameter>&#160;:</term>
+<listitem><simpara>The object on the server to monitor
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A brand new <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-client-get-root" role="function">
+<title>dbusmenu_client_get_root ()</title>
+<indexterm zone="dbusmenu-client-get-root"><primary>dbusmenu_client_get_root</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  dbusmenu_client_get_root            (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>);</programlisting>
+<para>
+Grabs the root node for the specified client <parameter>client</parameter>.  This
+	function may block.  It will block if there is currently a
+	call to update the layout, it will block on that layout 
+	updated and then return the newly updated layout.  Chances
+	are that this update is in the queue for the mainloop as
+	it would have been requested some time ago, but in theory
+	it could block longer.
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> to get the root node from
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> representing the root of
+		menu on the server.  If there is no server or there is
+		an error receiving its layout it'll return <link linkend="NULL:CAPS"><type>NULL</type></link>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-client-add-type-handler" role="function">
+<title>dbusmenu_client_add_type_handler ()</title>
+<indexterm zone="dbusmenu-client-add-type-handler"><primary>dbusmenu_client_add_type_handler</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_client_add_type_handler    (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *type</parameter>,
+                                                         <parameter><link linkend="DbusmenuClientTypeHandler"><type>DbusmenuClientTypeHandler</type></link> newfunc</parameter>);</programlisting>
+<para>
+This function connects into the type handling of the <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link>.
+	Every new menuitem that comes in immediately gets asked for it's
+	properties.  When we get those properties we check the 'type'
+	property and look to see if it matches a handler that is known
+	by the client.  If so, the <parameter>newfunc</parameter> function is executed on that
+	<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.  If not, then the DbusmenuClient::new-menuitem
+	signal is sent.
+</para>
+<para>
+	In the future the known types will be sent to the server so that it
+	can make choices about the menu item types availble.
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>Client where we're getting types coming in
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
+<listitem><simpara>A text string that will be matched with the 'type'
+	    property on incoming menu items
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>newfunc</parameter>&#160;:</term>
+<listitem><simpara>The function that will be executed with those new
+	    items when they come in.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> If registering the new type was successful.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-client-send-event" role="function">
+<title>dbusmenu_client_send_event ()</title>
+<indexterm zone="dbusmenu-client-send-event"><primary>dbusmenu_client_send_event</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_client_send_event          (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> timestamp</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-client-send-about-to-show" role="function">
+<title>dbusmenu_client_send_about_to_show ()</title>
+<indexterm zone="dbusmenu-client-send-about-to-show"><primary>dbusmenu_client_send_about_to_show</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_client_send_about_to_show  (<parameter><link linkend="DbusmenuClient"><type>DbusmenuClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (cbgpointer user_data) ()</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> cb_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
+<listitem><simpara>
+<parameter>gpointer</parameter> user_data:
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>cb_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml b/docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml
new file mode 100644
index 0000000..f7244f7
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml
@@ -0,0 +1,657 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-glib-dbusmenu-client">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-glib-dbusmenu-client.top_of_page">dbusmenu-client</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>dbusmenu-client</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="libdbusmenu-glib-dbusmenu-client.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu">DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</link>
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-layout">org_ayatana_dbusmenu_get_layout</link>     (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> *OUT_revision</parameter>,
+                                                         <parameter><link linkend="char"><type>char</type></link> **OUT_layout</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-layout-reply">*org_ayatana_dbusmenu_get_layout_reply</link>)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> OUT_revision</parameter>,
+                                                         <parameter><link linkend="char"><type>char</type></link> *OUT_layout</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-layout-async">org_ayatana_dbusmenu_get_layout_async</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-layout-reply"><type>org_ayatana_dbusmenu_get_layout_reply</type></link> callback</parameter>);
+<link linkend="return"><returnvalue>return</returnvalue></link>              <link linkend="dbus-g-proxy-begin-call">dbus_g_proxy_begin_call</link>             (<parameter><link linkend="proxy"><type>proxy</type></link> Param1</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-group-properties">org_ayatana_dbusmenu_get_group_properties</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-group-properties-reply">*org_ayatana_dbusmenu_get_group_properties_reply</link>)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-group-properties-async">org_ayatana_dbusmenu_get_group_properties_async</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-group-properties-reply"><type>org_ayatana_dbusmenu_get_group_properties_reply</type></link> callback</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-children">org_ayatana_dbusmenu_get_children</link>   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-children-reply">*org_ayatana_dbusmenu_get_children_reply</link>)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-children-async">org_ayatana_dbusmenu_get_children_async</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-children-reply"><type>org_ayatana_dbusmenu_get_children_reply</type></link> callback</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-property">org_ayatana_dbusmenu_get_property</link>   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *OUT_value</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-property-reply">*org_ayatana_dbusmenu_get_property_reply</link>)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> OUT_value</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-property-async">org_ayatana_dbusmenu_get_property_async</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-property-reply"><type>org_ayatana_dbusmenu_get_property_reply</type></link> callback</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-properties">org_ayatana_dbusmenu_get_properties</link> (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> **OUT_properties</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-properties-reply">*org_ayatana_dbusmenu_get_properties_reply</link>)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> *OUT_properties</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-properties-async">org_ayatana_dbusmenu_get_properties_async</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-properties-reply"><type>org_ayatana_dbusmenu_get_properties_reply</type></link> callback</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-event">org_ayatana_dbusmenu_event</link>          (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
+                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-event-reply">*org_ayatana_dbusmenu_event_reply</link>) (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-event-async">org_ayatana_dbusmenu_event_async</link>    (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
+                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-event-reply"><type>org_ayatana_dbusmenu_event_reply</type></link> callback</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-about-to-show">org_ayatana_dbusmenu_about_to_show</link>  (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> *OUT_needUpdate</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-about-to-show-reply">*org_ayatana_dbusmenu_about_to_show_reply</link>)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> OUT_needUpdate</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
+<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-about-to-show-async">org_ayatana_dbusmenu_about_to_show_async</link>
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-about-to-show-reply"><type>org_ayatana_dbusmenu_about_to_show_reply</type></link> callback</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-glib-dbusmenu-client.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-glib-dbusmenu-client.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu" role="macro">
+<title>DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</title>
+<indexterm zone="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"><primary>DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</primary></indexterm>
+<programlisting>#define DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-layout" role="function">
+<title>org_ayatana_dbusmenu_get_layout ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-layout"><primary>org_ayatana_dbusmenu_get_layout</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_layout     (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> *OUT_revision</parameter>,
+                                                         <parameter><link linkend="char"><type>char</type></link> **OUT_layout</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_parentId</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_revision</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_layout</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-layout-reply" role="function">
+<title>org_ayatana_dbusmenu_get_layout_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-layout-reply"><primary>org_ayatana_dbusmenu_get_layout_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_layout_reply)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> OUT_revision</parameter>,
+                                                         <parameter><link linkend="char"><type>char</type></link> *OUT_layout</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_revision</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_layout</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-layout-async" role="function">
+<title>org_ayatana_dbusmenu_get_layout_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-layout-async"><primary>org_ayatana_dbusmenu_get_layout_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_layout_async
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-layout-reply"><type>org_ayatana_dbusmenu_get_layout_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_parentId</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-g-proxy-begin-call" role="function">
+<title>dbus_g_proxy_begin_call ()</title>
+<indexterm zone="dbus-g-proxy-begin-call"><primary>dbus_g_proxy_begin_call</primary></indexterm>
+<programlisting><link linkend="return"><returnvalue>return</returnvalue></link>              dbus_g_proxy_begin_call             (<parameter><link linkend="proxy"><type>proxy</type></link> Param1</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>Param1</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-group-properties" role="function">
+<title>org_ayatana_dbusmenu_get_group_properties ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-group-properties"><primary>org_ayatana_dbusmenu_get_group_properties</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_group_properties
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_ids</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-group-properties-reply" role="function">
+<title>org_ayatana_dbusmenu_get_group_properties_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-group-properties-reply"><primary>org_ayatana_dbusmenu_get_group_properties_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_group_properties_reply)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-group-properties-async" role="function">
+<title>org_ayatana_dbusmenu_get_group_properties_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-group-properties-async"><primary>org_ayatana_dbusmenu_get_group_properties_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_group_properties_async
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-group-properties-reply"><type>org_ayatana_dbusmenu_get_group_properties_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_ids</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-children" role="function">
+<title>org_ayatana_dbusmenu_get_children ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-children"><primary>org_ayatana_dbusmenu_get_children</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_children   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-children-reply" role="function">
+<title>org_ayatana_dbusmenu_get_children_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-children-reply"><primary>org_ayatana_dbusmenu_get_children_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_children_reply)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-children-async" role="function">
+<title>org_ayatana_dbusmenu_get_children_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-children-async"><primary>org_ayatana_dbusmenu_get_children_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_children_async
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-children-reply"><type>org_ayatana_dbusmenu_get_children_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-property" role="function">
+<title>org_ayatana_dbusmenu_get_property ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-property"><primary>org_ayatana_dbusmenu_get_property</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_property   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *OUT_value</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_name</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-property-reply" role="function">
+<title>org_ayatana_dbusmenu_get_property_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-property-reply"><primary>org_ayatana_dbusmenu_get_property_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_property_reply)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> OUT_value</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-property-async" role="function">
+<title>org_ayatana_dbusmenu_get_property_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-property-async"><primary>org_ayatana_dbusmenu_get_property_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_property_async
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-property-reply"><type>org_ayatana_dbusmenu_get_property_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_name</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-properties" role="function">
+<title>org_ayatana_dbusmenu_get_properties ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-properties"><primary>org_ayatana_dbusmenu_get_properties</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_properties (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> **OUT_properties</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-properties-reply" role="function">
+<title>org_ayatana_dbusmenu_get_properties_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-properties-reply"><primary>org_ayatana_dbusmenu_get_properties_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_properties_reply)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> *OUT_properties</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-get-properties-async" role="function">
+<title>org_ayatana_dbusmenu_get_properties_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-get-properties-async"><primary>org_ayatana_dbusmenu_get_properties_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_properties_async
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-properties-reply"><type>org_ayatana_dbusmenu_get_properties_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-event" role="function">
+<title>org_ayatana_dbusmenu_event ()</title>
+<indexterm zone="org-ayatana-dbusmenu-event"><primary>org_ayatana_dbusmenu_event</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_event          (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
+                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_eventId</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_timestamp</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-event-reply" role="function">
+<title>org_ayatana_dbusmenu_event_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-event-reply"><primary>org_ayatana_dbusmenu_event_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_event_reply) (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-event-async" role="function">
+<title>org_ayatana_dbusmenu_event_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-event-async"><primary>org_ayatana_dbusmenu_event_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_event_async    (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
+                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-event-reply"><type>org_ayatana_dbusmenu_event_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_eventId</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_timestamp</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-about-to-show" role="function">
+<title>org_ayatana_dbusmenu_about_to_show ()</title>
+<indexterm zone="org-ayatana-dbusmenu-about-to-show"><primary>org_ayatana_dbusmenu_about_to_show</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_about_to_show  (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> *OUT_needUpdate</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_needUpdate</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-about-to-show-reply" role="function">
+<title>org_ayatana_dbusmenu_about_to_show_reply ()</title>
+<indexterm zone="org-ayatana-dbusmenu-about-to-show-reply"><primary>org_ayatana_dbusmenu_about_to_show_reply</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_about_to_show_reply)
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> OUT_needUpdate</parameter>,
+                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>OUT_needUpdate</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="org-ayatana-dbusmenu-about-to-show-async" role="function">
+<title>org_ayatana_dbusmenu_about_to_show_async ()</title>
+<indexterm zone="org-ayatana-dbusmenu-about-to-show-async"><primary>org_ayatana_dbusmenu_about_to_show_async</primary></indexterm>
+<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_about_to_show_async
+                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
+                                                         <parameter><link linkend="org-ayatana-dbusmenu-about-to-show-reply"><type>org_ayatana_dbusmenu_about_to_show_reply</type></link> callback</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml b/docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml
new file mode 100644
index 0000000..836e1d6
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml
@@ -0,0 +1,462 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-glib-dbusmenu-server">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-glib-dbusmenu-server.top_of_page">dbusmenu-server</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>dbusmenu-server</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="libdbusmenu-glib-dbusmenu-server.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="g-marshal-value-peek-boolean">g_marshal_value_peek_boolean</link>        (v)
+#define             <link linkend="g-marshal-value-peek-char">g_marshal_value_peek_char</link>           (v)
+#define             <link linkend="g-marshal-value-peek-uchar">g_marshal_value_peek_uchar</link>          (v)
+#define             <link linkend="g-marshal-value-peek-int">g_marshal_value_peek_int</link>            (v)
+#define             <link linkend="g-marshal-value-peek-uint">g_marshal_value_peek_uint</link>           (v)
+#define             <link linkend="g-marshal-value-peek-long">g_marshal_value_peek_long</link>           (v)
+#define             <link linkend="g-marshal-value-peek-ulong">g_marshal_value_peek_ulong</link>          (v)
+#define             <link linkend="g-marshal-value-peek-int64">g_marshal_value_peek_int64</link>          (v)
+#define             <link linkend="g-marshal-value-peek-uint64">g_marshal_value_peek_uint64</link>         (v)
+#define             <link linkend="g-marshal-value-peek-enum">g_marshal_value_peek_enum</link>           (v)
+#define             <link linkend="g-marshal-value-peek-flags">g_marshal_value_peek_flags</link>          (v)
+#define             <link linkend="g-marshal-value-peek-float">g_marshal_value_peek_float</link>          (v)
+#define             <link linkend="g-marshal-value-peek-double">g_marshal_value_peek_double</link>         (v)
+#define             <link linkend="g-marshal-value-peek-string">g_marshal_value_peek_string</link>         (v)
+#define             <link linkend="g-marshal-value-peek-param">g_marshal_value_peek_param</link>          (v)
+#define             <link linkend="g-marshal-value-peek-boxed">g_marshal_value_peek_boxed</link>          (v)
+#define             <link linkend="g-marshal-value-peek-pointer">g_marshal_value_peek_pointer</link>        (v)
+#define             <link linkend="g-marshal-value-peek-object">g_marshal_value_peek_object</link>         (v)
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</link>
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</link>
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</link>
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</link>
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</link>
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</link>
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-glib-dbusmenu-server.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-glib-dbusmenu-server.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="g-marshal-value-peek-boolean" role="macro">
+<title>g_marshal_value_peek_boolean()</title>
+<indexterm zone="g-marshal-value-peek-boolean"><primary>g_marshal_value_peek_boolean</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_boolean(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-char" role="macro">
+<title>g_marshal_value_peek_char()</title>
+<indexterm zone="g-marshal-value-peek-char"><primary>g_marshal_value_peek_char</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_char(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-uchar" role="macro">
+<title>g_marshal_value_peek_uchar()</title>
+<indexterm zone="g-marshal-value-peek-uchar"><primary>g_marshal_value_peek_uchar</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_uchar(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-int" role="macro">
+<title>g_marshal_value_peek_int()</title>
+<indexterm zone="g-marshal-value-peek-int"><primary>g_marshal_value_peek_int</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_int(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-uint" role="macro">
+<title>g_marshal_value_peek_uint()</title>
+<indexterm zone="g-marshal-value-peek-uint"><primary>g_marshal_value_peek_uint</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_uint(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-long" role="macro">
+<title>g_marshal_value_peek_long()</title>
+<indexterm zone="g-marshal-value-peek-long"><primary>g_marshal_value_peek_long</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_long(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-ulong" role="macro">
+<title>g_marshal_value_peek_ulong()</title>
+<indexterm zone="g-marshal-value-peek-ulong"><primary>g_marshal_value_peek_ulong</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_ulong(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-int64" role="macro">
+<title>g_marshal_value_peek_int64()</title>
+<indexterm zone="g-marshal-value-peek-int64"><primary>g_marshal_value_peek_int64</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_int64(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-uint64" role="macro">
+<title>g_marshal_value_peek_uint64()</title>
+<indexterm zone="g-marshal-value-peek-uint64"><primary>g_marshal_value_peek_uint64</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_uint64(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-enum" role="macro">
+<title>g_marshal_value_peek_enum()</title>
+<indexterm zone="g-marshal-value-peek-enum"><primary>g_marshal_value_peek_enum</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_enum(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-flags" role="macro">
+<title>g_marshal_value_peek_flags()</title>
+<indexterm zone="g-marshal-value-peek-flags"><primary>g_marshal_value_peek_flags</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_flags(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-float" role="macro">
+<title>g_marshal_value_peek_float()</title>
+<indexterm zone="g-marshal-value-peek-float"><primary>g_marshal_value_peek_float</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_float(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-double" role="macro">
+<title>g_marshal_value_peek_double()</title>
+<indexterm zone="g-marshal-value-peek-double"><primary>g_marshal_value_peek_double</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_double(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-string" role="macro">
+<title>g_marshal_value_peek_string()</title>
+<indexterm zone="g-marshal-value-peek-string"><primary>g_marshal_value_peek_string</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_string(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-param" role="macro">
+<title>g_marshal_value_peek_param()</title>
+<indexterm zone="g-marshal-value-peek-param"><primary>g_marshal_value_peek_param</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_param(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-boxed" role="macro">
+<title>g_marshal_value_peek_boxed()</title>
+<indexterm zone="g-marshal-value-peek-boxed"><primary>g_marshal_value_peek_boxed</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_boxed(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-pointer" role="macro">
+<title>g_marshal_value_peek_pointer()</title>
+<indexterm zone="g-marshal-value-peek-pointer"><primary>g_marshal_value_peek_pointer</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_pointer(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-marshal-value-peek-object" role="macro">
+<title>g_marshal_value_peek_object()</title>
+<indexterm zone="g-marshal-value-peek-object"><primary>g_marshal_value_peek_object</primary></indexterm>
+<programlisting>#define             g_marshal_value_peek_object(v)</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>v</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER" role="function">
+<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()</title>
+<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER" role="function">
+<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()</title>
+<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER" role="function">
+<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()</title>
+<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER" role="function">
+<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()</title>
+<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER" role="function">
+<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()</title>
+<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER" role="function">
+<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()</title>
+<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER
+                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
+                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/menuitem-proxy.xml b/docs/libdbusmenu-glib/reference/xml/menuitem-proxy.xml
new file mode 100644
index 0000000..7d8b431
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/menuitem-proxy.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="DbusmenuMenuitemProxy">
+<refmeta>
+<refentrytitle role="top_of_page" id="DbusmenuMenuitemProxy.top_of_page">DbusmenuMenuitemProxy</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuMenuitemProxy</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="DbusmenuMenuitemProxy.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>                    <link linkend="DbusmenuMenuitemProxy-struct">DbusmenuMenuitemProxy</link>;
+                    <link linkend="DbusmenuMenuitemProxyClass">DbusmenuMenuitemProxyClass</link>;
+<link linkend="DbusmenuMenuitemProxy"><returnvalue>DbusmenuMenuitemProxy</returnvalue></link> * <link linkend="dbusmenu-menuitem-proxy-new">dbusmenu_menuitem_proxy_new</link>     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-proxy-get-wrapped">dbusmenu_menuitem_proxy_get_wrapped</link> (<parameter><link linkend="DbusmenuMenuitemProxy"><type>DbusmenuMenuitemProxy</type></link> *pmi</parameter>);
+</synopsis>
+</refsynopsisdiv>
+<refsect1 id="DbusmenuMenuitemProxy.object-hierarchy" role="object_hierarchy">
+<title role="object_hierarchy.title">Object Hierarchy</title>
+<synopsis>
+  <link linkend="GObject">GObject</link>
+   +----<link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>
+         +----DbusmenuMenuitemProxy
+</synopsis>
+</refsect1>
+<refsect1 id="DbusmenuMenuitemProxy.properties" role="properties">
+<title role="properties.title">Properties</title>
+<synopsis>
+  &quot;<link linkend="DbusmenuMenuitemProxy--menu-item">menu-item</link>&quot;                <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>*     : Read / Write / Construct Only
+</synopsis>
+</refsect1>
+
+<refsect1 id="DbusmenuMenuitemProxy.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="DbusmenuMenuitemProxy.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DbusmenuMenuitemProxy-struct" role="struct">
+<title>DbusmenuMenuitemProxy</title>
+<indexterm zone="DbusmenuMenuitemProxy-struct"><primary>DbusmenuMenuitemProxy</primary></indexterm>
+<programlisting>typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy;</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuMenuitemProxyClass" role="struct">
+<title>DbusmenuMenuitemProxyClass</title>
+<indexterm zone="DbusmenuMenuitemProxyClass"><primary>DbusmenuMenuitemProxyClass</primary></indexterm>
+<programlisting>typedef struct {
+	DbusmenuMenuitemClass parent_class;
+} DbusmenuMenuitemProxyClass;
+</programlisting>
+<para>
+Functions and signal slots for <link linkend="DbusmenuMenuitemProxy"><type>DbusmenuMenuitemProxy</type></link>.
+</para><variablelist role="struct">
+<varlistentry><term><link linkend="DbusmenuMenuitemClass"><type>DbusmenuMenuitemClass</type></link>&#160;<structfield id="DbusmenuMenuitemProxyClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara>The Class of <link linkend="DbusmeneMenuitem"><type>DbusmeneMenuitem</type></link>
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-proxy-new" role="function">
+<title>dbusmenu_menuitem_proxy_new ()</title>
+<indexterm zone="dbusmenu-menuitem-proxy-new"><primary>dbusmenu_menuitem_proxy_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitemProxy"><returnvalue>DbusmenuMenuitemProxy</returnvalue></link> * dbusmenu_menuitem_proxy_new     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+Builds a new <link linkend="DbusmenuMenuitemProxy"><type>DbusmenuMenuitemProxy</type></link> object that proxies
+	all of the values for <parameter>mi</parameter>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to proxy
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A new <link linkend="DbusmenuMenuitemProxy"><type>DbusmenuMenuitemProxy</type></link> object.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-proxy-get-wrapped" role="function">
+<title>dbusmenu_menuitem_proxy_get_wrapped ()</title>
+<indexterm zone="dbusmenu-menuitem-proxy-get-wrapped"><primary>dbusmenu_menuitem_proxy_get_wrapped</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  dbusmenu_menuitem_proxy_get_wrapped (<parameter><link linkend="DbusmenuMenuitemProxy"><type>DbusmenuMenuitemProxy</type></link> *pmi</parameter>);</programlisting>
+<para>
+Accesses the private variable of which <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>
+	we are doing the proxying for.
+</para><variablelist role="params">
+<varlistentry><term><parameter>pmi</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitemProxy"><type>DbusmenuMenuitemProxy</type></link> to look into
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> object or a <link linkend="NULL:CAPS"><type>NULL</type></link> if we
+		don't have one or there is an error.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+<refsect1 id="DbusmenuMenuitemProxy.property-details" role="property_details">
+<title role="property_details.title">Property Details</title>
+<refsect2 id="DbusmenuMenuitemProxy--menu-item" role="property"><title>The <literal>&quot;menu-item&quot;</literal> property</title>
+<indexterm zone="DbusmenuMenuitemProxy--menu-item"><primary>DbusmenuMenuitemProxy:menu-item</primary></indexterm>
+<programlisting>  &quot;menu-item&quot;                <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>*     : Read / Write / Construct Only</programlisting>
+<para>An instance of the DbusmenuMenuitem class that this menuitem will mimic.</para></refsect2>
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/menuitem.xml b/docs/libdbusmenu-glib/reference/xml/menuitem.xml
new file mode 100644
index 0000000..75f77d6
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/menuitem.xml
@@ -0,0 +1,1166 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="DbusmenuMenuitem">
+<refmeta>
+<refentrytitle role="top_of_page" id="DbusmenuMenuitem.top_of_page">DbusmenuMenuitem</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuMenuitem</refname>
+<refpurpose>A lowlevel represenation of a menuitem</refpurpose>
+</refnamediv>
+<refsect1 id="DbusmenuMenuitem.stability-level">
+<title>Stability Level</title>
+Unstable, unless otherwise indicated
+</refsect1>
+
+<refsynopsisdiv id="DbusmenuMenuitem.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>
+#include &lt;libdbusmenu-glib/menuitem.h&gt;
+
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS">DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS">DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS">DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS">DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS">DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS">DBUSMENU_MENUITEM_SIGNAL_REALIZED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS">DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-TYPE:CAPS">DBUSMENU_MENUITEM_PROP_TYPE</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS">DBUSMENU_MENUITEM_PROP_VISIBLE</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS">DBUSMENU_MENUITEM_PROP_ENABLED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-LABEL:CAPS">DBUSMENU_MENUITEM_PROP_LABEL</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS">DBUSMENU_MENUITEM_PROP_ICON_NAME</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS">DBUSMENU_MENUITEM_PROP_ICON_DATA</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS">DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</link>
+#define             <link linkend="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS">DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</link>
+#define             <link linkend="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS">DBUSMENU_MENUITEM_TOGGLE_CHECK</link>
+#define             <link linkend="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS">DBUSMENU_MENUITEM_TOGGLE_RADIO</link>
+#define             <link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</link>
+#define             <link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</link>
+#define             <link linkend="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS">DBUSMENU_MENUITEM_ICON_NAME_BLANK</link>
+                    <link linkend="DbusmenuMenuitem-struct">DbusmenuMenuitem</link>;
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="dbusmenu-menuitem-about-to-show-cb">*dbusmenu_menuitem_about_to_show_cb</link>)
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> user_data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="dbusmenu-menuitem-buildxml-slot-t">*dbusmenu_menuitem_buildxml_slot_t</link>)
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *stringarray</parameter>);
+                    <link linkend="DbusmenuMenuitemClass">DbusmenuMenuitemClass</link>;
+<link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-new">dbusmenu_menuitem_new</link>               (<parameter><type>void</type></parameter>);
+<link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-new-with-id">dbusmenu_menuitem_new_with_id</link>       (<parameter><link linkend="gint"><type>gint</type></link> id</parameter>);
+<link linkend="gint"><returnvalue>gint</returnvalue></link>                <link linkend="dbusmenu-menuitem-get-id">dbusmenu_menuitem_get_id</link>            (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="GList"><returnvalue>GList</returnvalue></link> *             <link linkend="dbusmenu-menuitem-get-children">dbusmenu_menuitem_get_children</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="GList"><returnvalue>GList</returnvalue></link> *             <link linkend="dbusmenu-menuitem-take-children">dbusmenu_menuitem_take_children</link>     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="guint"><returnvalue>guint</returnvalue></link>               <link linkend="dbusmenu-menuitem-get-position">dbusmenu_menuitem_get_position</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);
+<link linkend="guint"><returnvalue>guint</returnvalue></link>               <link linkend="dbusmenu-menuitem-get-position-realized">dbusmenu_menuitem_get_position_realized</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-child-append">dbusmenu_menuitem_child_append</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-child-prepend">dbusmenu_menuitem_child_prepend</link>     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-child-delete">dbusmenu_menuitem_child_delete</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-child-add-position">dbusmenu_menuitem_child_add_position</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> position</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-child-reorder">dbusmenu_menuitem_child_reorder</link>     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> position</parameter>);
+<link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-child-find">dbusmenu_menuitem_child_find</link>        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>);
+<link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-find-id">dbusmenu_menuitem_find_id</link>           (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set">dbusmenu_menuitem_property_set</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *value</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-value">dbusmenu_menuitem_property_set_value</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *value</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-bool">dbusmenu_menuitem_property_set_bool</link> (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="gboolean"><type>gboolean</type></link> value</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-int">dbusmenu_menuitem_property_set_int</link>  (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> value</parameter>);
+const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *       <link linkend="dbusmenu-menuitem-property-get">dbusmenu_menuitem_property_get</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+const <link linkend="GValue"><returnvalue>GValue</returnvalue></link> *      <link linkend="dbusmenu-menuitem-property-get-value">dbusmenu_menuitem_property_get_value</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-get-bool">dbusmenu_menuitem_property_get_bool</link> (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+<link linkend="gint"><returnvalue>gint</returnvalue></link>                <link linkend="dbusmenu-menuitem-property-get-int">dbusmenu_menuitem_property_get_int</link>  (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-exist">dbusmenu_menuitem_property_exist</link>    (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+<link linkend="GList"><returnvalue>GList</returnvalue></link> *             <link linkend="dbusmenu-menuitem-properties-list">dbusmenu_menuitem_properties_list</link>   (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="GHashTable"><returnvalue>GHashTable</returnvalue></link> *        <link linkend="dbusmenu-menuitem-properties-copy">dbusmenu_menuitem_properties_copy</link>   (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-property-remove">dbusmenu_menuitem_property_remove</link>   (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-set-root">dbusmenu_menuitem_set_root</link>          (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> root</parameter>);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-get-root">dbusmenu_menuitem_get_root</link>          (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-foreach">dbusmenu_menuitem_foreach</link>           (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (funcDbusmenuMenuitem * mi, gpointer data) ()</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-handle-event">dbusmenu_menuitem_handle_event</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> timestamp</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-send-about-to-show">dbusmenu_menuitem_send_about_to_show</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="dbusmenu-menuitem-about-to-show-cb"><type>dbusmenu_menuitem_about_to_show_cb</type></link> cb</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> cb_data</parameter>);
+</synopsis>
+</refsynopsisdiv>
+<refsect1 id="DbusmenuMenuitem.object-hierarchy" role="object_hierarchy">
+<title role="object_hierarchy.title">Object Hierarchy</title>
+<synopsis>
+  <link linkend="GObject">GObject</link>
+   +----DbusmenuMenuitem
+         +----<link linkend="DbusmenuClientMenuitem">DbusmenuClientMenuitem</link>
+         +----<link linkend="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</link>
+</synopsis>
+</refsect1>
+<refsect1 id="DbusmenuMenuitem.properties" role="properties">
+<title role="properties.title">Properties</title>
+<synopsis>
+  &quot;<link linkend="DbusmenuMenuitem--id">id</link>&quot;                       <link linkend="gint"><type>gint</type></link>                  : Read / Write / Construct Only
+</synopsis>
+</refsect1>
+<refsect1 id="DbusmenuMenuitem.signals" role="signal_proto">
+<title role="signal_proto.title">Signals</title>
+<synopsis>
+  &quot;<link linkend="DbusmenuMenuitem-child-added">child-added</link>&quot;                                    : Run Last
+  &quot;<link linkend="DbusmenuMenuitem-child-moved">child-moved</link>&quot;                                    : Run Last
+  &quot;<link linkend="DbusmenuMenuitem-child-removed">child-removed</link>&quot;                                  : Run Last
+  &quot;<link linkend="DbusmenuMenuitem-item-activated">item-activated</link>&quot;                                 : Run Last
+  &quot;<link linkend="DbusmenuMenuitem-property-changed">property-changed</link>&quot;                               : Run Last
+  &quot;<link linkend="DbusmenuMenuitem-realized">realized</link>&quot;                                       : Run Last
+</synopsis>
+</refsect1>
+
+<refsect1 id="DbusmenuMenuitem.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+A <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> is the lowest level of represenation of a
+single item in a menu.  It gets created on the server side
+and copied over to the client side where it gets rendered.  As
+the server starts to change it, and grow it, and do all kinds
+of fun stuff that information is transfered over DBus and the
+client updates it's understanding of the object model.
+</para>
+<para>
+Most people using either the client or the server should be
+able to deal mostly with <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.  These
+are simple, but then they can be attached to more complex
+objects and handled appropriately.
+</para>
+</refsect1>
+<refsect1 id="DbusmenuMenuitem.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED    "property-changed"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED      "item-activated"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED         "child-added"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED       "child-removed"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED         "child-moved"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_REALIZED</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_REALIZED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</title>
+<indexterm zone="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS"><primary>DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-TYPE:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_TYPE</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-TYPE:CAPS"><primary>DBUSMENU_MENUITEM_PROP_TYPE</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_TYPE                  "type"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_VISIBLE</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS"><primary>DBUSMENU_MENUITEM_PROP_VISIBLE</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_VISIBLE               "visible"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_ENABLED</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS"><primary>DBUSMENU_MENUITEM_PROP_ENABLED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_ENABLED               "enabled"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-LABEL:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_LABEL</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-LABEL:CAPS"><primary>DBUSMENU_MENUITEM_PROP_LABEL</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_LABEL                 "label"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_ICON_NAME</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS"><primary>DBUSMENU_MENUITEM_PROP_ICON_NAME</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_ICON_NAME             "icon-name"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_ICON_DATA</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS"><primary>DBUSMENU_MENUITEM_PROP_ICON_DATA</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_ICON_DATA             "icon-data"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS"><primary>DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE           "toggle-type"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</title>
+<indexterm zone="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS"><primary>DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE          "toggle-state"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_TOGGLE_CHECK</title>
+<indexterm zone="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS"><primary>DBUSMENU_MENUITEM_TOGGLE_CHECK</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_TOGGLE_CHECK               "checkmark"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_TOGGLE_RADIO</title>
+<indexterm zone="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS"><primary>DBUSMENU_MENUITEM_TOGGLE_RADIO</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_TOGGLE_RADIO               "radio"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</title>
+<indexterm zone="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS"><primary>DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED     0
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</title>
+<indexterm zone="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS"><primary>DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED       1
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</title>
+<indexterm zone="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS"><primary>DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN       -1
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS" role="macro">
+<title>DBUSMENU_MENUITEM_ICON_NAME_BLANK</title>
+<indexterm zone="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS"><primary>DBUSMENU_MENUITEM_ICON_NAME_BLANK</primary></indexterm>
+<programlisting>#define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuMenuitem-struct" role="struct">
+<title>DbusmenuMenuitem</title>
+<indexterm zone="DbusmenuMenuitem-struct"><primary>DbusmenuMenuitem</primary></indexterm>
+<programlisting>typedef struct _DbusmenuMenuitem DbusmenuMenuitem;</programlisting>
+<para>
+This is the <link linkend="GObject"><type>GObject</type></link> based object that represents a menu
+item.  It gets created the same on both the client and
+the server side and libdbusmenu-glib does the work of making
+this object model appear on both sides of DBus.  Simple
+really, though through updates and people coming on and off
+the bus it can lead to lots of fun complex scenarios.
+</para></refsect2>
+<refsect2 id="dbusmenu-menuitem-about-to-show-cb" role="function">
+<title>dbusmenu_menuitem_about_to_show_cb ()</title>
+<indexterm zone="dbusmenu-menuitem-about-to-show-cb"><primary>dbusmenu_menuitem_about_to_show_cb</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*dbusmenu_menuitem_about_to_show_cb)
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> user_data</parameter>);</programlisting>
+<para>
+Callback prototype for a callback that is called when the
+menu should be shown.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>Menu item that should be shown
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara> Extra user data sent with the function. closure</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-buildxml-slot-t" role="function">
+<title>dbusmenu_menuitem_buildxml_slot_t ()</title>
+<indexterm zone="dbusmenu-menuitem-buildxml-slot-t"><primary>dbusmenu_menuitem_buildxml_slot_t</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*dbusmenu_menuitem_buildxml_slot_t)
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *stringarray</parameter>);</programlisting>
+<para>
+This is the function that is called to represent this menu item
+as an XML fragment.  Should call it's own children.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara> Menu item that should be built from. <acronym>in</acronym>. </simpara></listitem></varlistentry>
+<varlistentry><term><parameter>stringarray</parameter>&#160;:</term>
+<listitem><simpara> An array of strings that can be combined into an XML file.. <acronym>inout</acronym>. <acronym>transfer none</acronym>. <acronym>array</acronym>. <acronym>element-type</acronym> utf8. </simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="DbusmenuMenuitemClass" role="struct">
+<title>DbusmenuMenuitemClass</title>
+<indexterm zone="DbusmenuMenuitemClass"><primary>DbusmenuMenuitemClass</primary></indexterm>
+<programlisting>typedef struct {
+	GObjectClass parent_class;
+
+	/* Signals */
+	void (*property_changed) (gchar * property, GValue * value);
+	void (*item_activated) (guint timestamp);
+	void (*child_added) (DbusmenuMenuitem * child, guint position);
+	void (*child_removed) (DbusmenuMenuitem * child);
+	void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint oldpos);
+	void (*realized) (void);
+
+	/* Virtual functions */
+	dbusmenu_menuitem_buildxml_slot_t buildxml;
+	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+	void (*send_about_to_show) (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
+
+	void (*reserved1) (void);
+	/* void (*reserved2) (void); */
+	/* void (*reserved3) (void); */
+	/* void (*reserved4) (void); -- realized, realloc when bumping lib version */
+} DbusmenuMenuitemClass;
+</programlisting>
+<variablelist role="struct">
+<varlistentry><term><link linkend="GObjectClass"><type>GObjectClass</type></link>&#160;<structfield id="DbusmenuMenuitemClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.property-changed">property_changed</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-property-changed"><type>"property-changed"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.item-activated">item_activated</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-item-activated"><type>"item-activated"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.child-added">child_added</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-added"><type>"child-added"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.child-removed">child_removed</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-removed"><type>"child-removed"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.child-moved">child_moved</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-moved"><type>"child-moved"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.realized">realized</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-realized"><type>"realized"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><link linkend="dbusmenu-menuitem-buildxml-slot-t"><type>dbusmenu_menuitem_buildxml_slot_t</type></link>&#160;<structfield id="DbusmenuMenuitemClass.buildxml">buildxml</structfield>;</term>
+<listitem><simpara>Virtual function that appends the strings required to represent this menu item in the menu XML file.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.handle-event">handle_event</structfield>&#160;()</term>
+<listitem><simpara>This function is to override how events are handled by subclasses.  Look at <link linkend="dbusmenu-menuitem-handle-event"><type>dbusmenu_menuitem_handle_event</type></link> for lots of good information.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.send-about-to-show">send_about_to_show</structfield>&#160;()</term>
+<listitem><simpara>Virtual function that notifies server that the client is about to show a menu.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved1">reserved1</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-new" role="function">
+<title>dbusmenu_menuitem_new ()</title>
+<indexterm zone="dbusmenu-menuitem-new"><primary>dbusmenu_menuitem_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  dbusmenu_menuitem_new               (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+Create a new <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with all default values.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A newly allocated <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-new-with-id" role="function">
+<title>dbusmenu_menuitem_new_with_id ()</title>
+<indexterm zone="dbusmenu-menuitem-new-with-id"><primary>dbusmenu_menuitem_new_with_id</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  dbusmenu_menuitem_new_with_id       (<parameter><link linkend="gint"><type>gint</type></link> id</parameter>);</programlisting>
+<para>
+This creates a blank <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with a specific ID.
+</para><variablelist role="params">
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
+<listitem><simpara>ID to use for this menuitem
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A newly allocated <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-get-id" role="function">
+<title>dbusmenu_menuitem_get_id ()</title>
+<indexterm zone="dbusmenu-menuitem-get-id"><primary>dbusmenu_menuitem_get_id</primary></indexterm>
+<programlisting><link linkend="gint"><returnvalue>gint</returnvalue></link>                dbusmenu_menuitem_get_id            (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+Gets the unique ID for <parameter>mi</parameter>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to query.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The ID of the <parameter>mi</parameter>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-get-children" role="function">
+<title>dbusmenu_menuitem_get_children ()</title>
+<indexterm zone="dbusmenu-menuitem-get-children"><primary>dbusmenu_menuitem_get_children</primary></indexterm>
+<programlisting><link linkend="GList"><returnvalue>GList</returnvalue></link> *             dbusmenu_menuitem_get_children      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+Returns simply the list of children that this menu item
+	has.  The list is valid until another child related function
+	is called, where it might be changed.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to query.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-take-children" role="function">
+<title>dbusmenu_menuitem_take_children ()</title>
+<indexterm zone="dbusmenu-menuitem-take-children"><primary>dbusmenu_menuitem_take_children</primary></indexterm>
+<programlisting><link linkend="GList"><returnvalue>GList</returnvalue></link> *             dbusmenu_menuitem_take_children     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+While the name sounds devious that's exactly what this function
+	does.  It takes the list of children from the <parameter>mi</parameter> and clears the
+	internal list.  The calling function is now in charge of the ref's
+	on the children it has taken.  A lot of responsibility involved
+	in taking children.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> to take the children from.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-get-position" role="function">
+<title>dbusmenu_menuitem_get_position ()</title>
+<indexterm zone="dbusmenu-menuitem-get-position"><primary>dbusmenu_menuitem_get_position</primary></indexterm>
+<programlisting><link linkend="guint"><returnvalue>guint</returnvalue></link>               dbusmenu_menuitem_get_position      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);</programlisting>
+<para>
+This function returns the position of the menu item <parameter>mi</parameter>
+	in the children of <parameter>parent</parameter>.  It will return zero if the
+	menu item can't be found.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to find the position of
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children contain <parameter>mi</parameter>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The position of <parameter>mi</parameter> in the children of <parameter>parent</parameter>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-get-position-realized" role="function">
+<title>dbusmenu_menuitem_get_position_realized ()</title>
+<indexterm zone="dbusmenu-menuitem-get-position-realized"><primary>dbusmenu_menuitem_get_position_realized</primary></indexterm>
+<programlisting><link linkend="guint"><returnvalue>guint</returnvalue></link>               dbusmenu_menuitem_get_position_realized
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);</programlisting>
+<para>
+This function is very similar to <link linkend="dbusmenu-menuitem-get-position"><type>dbusmenu_menuitem_get_position</type></link>
+	except that it only counts in the children that have been realized.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to find the position of
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children contain <parameter>mi</parameter>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The position of <parameter>mi</parameter> in the realized children of <parameter>parent</parameter>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-child-append" role="function">
+<title>dbusmenu_menuitem_child_append ()</title>
+<indexterm zone="dbusmenu-menuitem-child-append"><primary>dbusmenu_menuitem_child_append</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_child_append      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>);</programlisting>
+<para>
+This function adds <parameter>child</parameter> to the list of children on <parameter>mi</parameter> at
+	the end of that list.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which will become a new parent
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>child</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> that will be a child
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the child has been added successfully.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-child-prepend" role="function">
+<title>dbusmenu_menuitem_child_prepend ()</title>
+<indexterm zone="dbusmenu-menuitem-child-prepend"><primary>dbusmenu_menuitem_child_prepend</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_child_prepend     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>);</programlisting>
+<para>
+This function adds <parameter>child</parameter> to the list of children on <parameter>mi</parameter> at
+	the beginning of that list.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which will become a new parent
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>child</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> that will be a child
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the child has been added successfully.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-child-delete" role="function">
+<title>dbusmenu_menuitem_child_delete ()</title>
+<indexterm zone="dbusmenu-menuitem-child-delete"><primary>dbusmenu_menuitem_child_delete</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_child_delete      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>);</programlisting>
+<para>
+This function removes <parameter>child</parameter> from the children list of <parameter>mi</parameter>.  It does
+	not call <link linkend="g-object-unref"><type>g_object_unref</type></link> on <parameter>child</parameter>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which has <parameter>child</parameter> as a child
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>child</parameter>&#160;:</term>
+<listitem><simpara>The child <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that you want to no longer
+	    be a child of <parameter>mi</parameter>.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> If we were able to delete <parameter>child</parameter>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-child-add-position" role="function">
+<title>dbusmenu_menuitem_child_add_position ()</title>
+<indexterm zone="dbusmenu-menuitem-child-add-position"><primary>dbusmenu_menuitem_child_add_position</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_child_add_position
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> position</parameter>);</programlisting>
+<para>
+Puts <parameter>child</parameter> in the list of children for <parameter>mi</parameter> at the location
+	specified in <parameter>position</parameter>.  If there is not enough entires available
+	then <parameter>child</parameter> will be placed at the end of the list.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that we're adding the child <parameter>child</parameter> to.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>child</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to make a child of <parameter>mi</parameter>.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>position</parameter>&#160;:</term>
+<listitem><simpara>Where in <parameter>mi</parameter> object's list of chidren <parameter>child</parameter> should be placed.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether <parameter>child</parameter> was added successfully.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-child-reorder" role="function">
+<title>dbusmenu_menuitem_child_reorder ()</title>
+<indexterm zone="dbusmenu-menuitem-child-reorder"><primary>dbusmenu_menuitem_child_reorder</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_child_reorder     (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *child</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> position</parameter>);</programlisting>
+<para>
+This function moves a child on the list of children.  It is
+	for a child that is already in the list, but simply needs a 
+	new location.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>child</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that is a child needing to be moved
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>position</parameter>&#160;:</term>
+<listitem><simpara>The position in the list to place it in
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the move was successful.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-child-find" role="function">
+<title>dbusmenu_menuitem_child_find ()</title>
+<indexterm zone="dbusmenu-menuitem-child-find"><primary>dbusmenu_menuitem_child_find</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  dbusmenu_menuitem_child_find        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>);</programlisting>
+<para>
+Search the children of <parameter>mi</parameter> to find one with the ID of <parameter>id</parameter>.
+	If it doesn't exist then we return <link linkend="NULL:CAPS"><type>NULL</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children to look on
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
+<listitem><simpara>The ID of the child that we're looking for.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The menu item with the ID <parameter>id</parameter> or <link linkend="NULL:CAPS"><type>NULL</type></link> if it
+	   can't be found.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-find-id" role="function">
+<title>dbusmenu_menuitem_find_id ()</title>
+<indexterm zone="dbusmenu-menuitem-find-id"><primary>dbusmenu_menuitem_find_id</primary></indexterm>
+<programlisting><link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  dbusmenu_menuitem_find_id           (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gint"><type>gint</type></link> id</parameter>);</programlisting>
+<para>
+This function searchs the whole tree of children that
+	are attached to <parameter>mi</parameter>.  This could be quite a few nodes, all
+	the way down the tree.  It is a depth first search.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> at the top of the tree to search
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
+<listitem><simpara>ID of the <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to search for
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with the ID of <parameter>id</parameter>
+		or <link linkend="NULL:CAPS"><type>NULL</type></link> if there isn't such a menu item in the tree
+		represented by <parameter>mi</parameter>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-set" role="function">
+<title>dbusmenu_menuitem_property_set ()</title>
+<indexterm zone="dbusmenu-menuitem-property-set"><primary>dbusmenu_menuitem_property_set</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *value</parameter>);</programlisting>
+<para>
+Takes the pair of <parameter>property</parameter> and <parameter>value</parameter> and places them as a
+	property on <parameter>mi</parameter>.  If a property already exists by that name,
+	then the value is set to the new value.  If not, the property
+	is added.  If the value is changed or the property was previously
+	unset then the signal <link linkend="DbusmenuMenuitem-prop-changed"><type>"prop-changed"</type></link> will be
+	emitted by this function.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>Name of the property to set.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara>The value of the property.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>  A boolean representing if the property value was set.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-set-value" role="function">
+<title>dbusmenu_menuitem_property_set_value ()</title>
+<indexterm zone="dbusmenu-menuitem-property-set-value"><primary>dbusmenu_menuitem_property_set_value</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_value
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *value</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-set-bool" role="function">
+<title>dbusmenu_menuitem_property_set_bool ()</title>
+<indexterm zone="dbusmenu-menuitem-property-set-bool"><primary>dbusmenu_menuitem_property_set_bool</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_bool (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="gboolean"><type>gboolean</type></link> value</parameter>);</programlisting>
+<para>
+Takes a boolean <parameter>value</parameter> and sets it on <parameter>property</parameter> as a
+	property on <parameter>mi</parameter>.  If a property already exists by that name,
+	then the value is set to the new value.  If not, the property
+	is added.  If the value is changed or the property was previously
+	unset then the signal <link linkend="DbusmenuMenuitem-prop-changed"><type>"prop-changed"</type></link> will be
+	emitted by this function.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>Name of the property to set.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara>The value of the property.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>  A boolean representing if the property value was set.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-set-int" role="function">
+<title>dbusmenu_menuitem_property_set_int ()</title>
+<indexterm zone="dbusmenu-menuitem-property-set-int"><primary>dbusmenu_menuitem_property_set_int</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_int  (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="gint"><type>gint</type></link> value</parameter>);</programlisting>
+<para>
+Takes a boolean <parameter>value</parameter> and sets it on <parameter>property</parameter> as a
+	property on <parameter>mi</parameter>.  If a property already exists by that name,
+	then the value is set to the new value.  If not, the property
+	is added.  If the value is changed or the property was previously
+	unset then the signal <link linkend="DbusmenuMenuitem-prop-changed"><type>"prop-changed"</type></link> will be
+	emitted by this function.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>Name of the property to set.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara>The value of the property.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>  A boolean representing if the property value was set.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-get" role="function">
+<title>dbusmenu_menuitem_property_get ()</title>
+<indexterm zone="dbusmenu-menuitem-property-get"><primary>dbusmenu_menuitem_property_get</primary></indexterm>
+<programlisting>const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *       dbusmenu_menuitem_property_get      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+Look up a property on <parameter>mi</parameter> and return the value of it if
+	it exits.  <link linkend="NULL:CAPS"><type>NULL</type></link> will be returned if the property doesn't
+	exist.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>The property to grab.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A string with the value of the property
+		that shouldn't be free'd.  Or <link linkend="NULL:CAPS"><type>NULL</type></link> if the property
+		is not set or is not a string.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-get-value" role="function">
+<title>dbusmenu_menuitem_property_get_value ()</title>
+<indexterm zone="dbusmenu-menuitem-property-get-value"><primary>dbusmenu_menuitem_property_get_value</primary></indexterm>
+<programlisting>const <link linkend="GValue"><returnvalue>GValue</returnvalue></link> *      dbusmenu_menuitem_property_get_value
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+Look up a property on <parameter>mi</parameter> and return the value of it if
+	it exits.  <link linkend="NULL:CAPS"><type>NULL</type></link> will be returned if the property doesn't
+	exist.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>The property to grab.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A GValue for the property.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-get-bool" role="function">
+<title>dbusmenu_menuitem_property_get_bool ()</title>
+<indexterm zone="dbusmenu-menuitem-property-get-bool"><primary>dbusmenu_menuitem_property_get_bool</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_get_bool (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+Look up a property on <parameter>mi</parameter> and return the value of it if
+	it exits.  Returns <link linkend="FALSE:CAPS"><type>FALSE</type></link> if the property doesn't exist.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>The property to grab.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The value of the property or <link linkend="FALSE:CAPS"><type>FALSE</type></link>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-get-int" role="function">
+<title>dbusmenu_menuitem_property_get_int ()</title>
+<indexterm zone="dbusmenu-menuitem-property-get-int"><primary>dbusmenu_menuitem_property_get_int</primary></indexterm>
+<programlisting><link linkend="gint"><returnvalue>gint</returnvalue></link>                dbusmenu_menuitem_property_get_int  (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+Look up a property on <parameter>mi</parameter> and return the value of it if
+	it exits.  Returns zero if the property doesn't exist.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>The property to grab.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The value of the property or zero.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-exist" role="function">
+<title>dbusmenu_menuitem_property_exist ()</title>
+<indexterm zone="dbusmenu-menuitem-property-exist"><primary>dbusmenu_menuitem_property_exist</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_exist    (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-properties-list" role="function">
+<title>dbusmenu_menuitem_properties_list ()</title>
+<indexterm zone="dbusmenu-menuitem-properties-list"><primary>dbusmenu_menuitem_properties_list</primary></indexterm>
+<programlisting><link linkend="GList"><returnvalue>GList</returnvalue></link> *             dbusmenu_menuitem_properties_list   (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+This functiong gets a list of the names of all the properties
+	that are set on this menu item.  This data on the list is owned
+	by the menuitem but the list is not and should be freed using
+	<link linkend="g-list-free"><function>g_list_free()</function></link> when the calling function is done with it.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to list the properties on
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A list of strings or NULL if there are none.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-properties-copy" role="function">
+<title>dbusmenu_menuitem_properties_copy ()</title>
+<indexterm zone="dbusmenu-menuitem-properties-copy"><primary>dbusmenu_menuitem_properties_copy</primary></indexterm>
+<programlisting><link linkend="GHashTable"><returnvalue>GHashTable</returnvalue></link> *        dbusmenu_menuitem_properties_copy   (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+This function takes the properties of a <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>
+	and puts them into a <link linkend="GHashTable"><type>GHashTable</type></link> that is referenced by the
+	key of a string and has the value of a string.  The hash
+	table may not have any entries if there aren't any or there
+	is an error in processing.  It is the caller's responsibility
+	to destroy the created <link linkend="GHashTable"><type>GHashTable</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that we're interested in the properties of
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A brand new <link linkend="GHashTable"><type>GHashTable</type></link> that contains all of the
+		properties that are on this <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> <parameter>mi</parameter>.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-remove" role="function">
+<title>dbusmenu_menuitem_property_remove ()</title>
+<indexterm zone="dbusmenu-menuitem-property-remove"><primary>dbusmenu_menuitem_property_remove</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_property_remove   (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+Removes a property from the menuitem.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to remove the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>The property to look for.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-set-root" role="function">
+<title>dbusmenu_menuitem_set_root ()</title>
+<indexterm zone="dbusmenu-menuitem-set-root"><primary>dbusmenu_menuitem_set_root</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_set_root          (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> root</parameter>);</programlisting>
+<para>
+This function sets the internal value of whether this is a
+	root node or not.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set whether it's root
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>root</parameter>&#160;:</term>
+<listitem><simpara>Whether <parameter>mi</parameter> is a root node or not
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-get-root" role="function">
+<title>dbusmenu_menuitem_get_root ()</title>
+<indexterm zone="dbusmenu-menuitem-get-root"><primary>dbusmenu_menuitem_get_root</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_get_root          (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);</programlisting>
+<para>
+This function returns the internal value of whether this is a
+	root node or not.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to see whether it's root
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE:CAPS"><type>TRUE</type></link> if this is a root node
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-foreach" role="function">
+<title>dbusmenu_menuitem_foreach ()</title>
+<indexterm zone="dbusmenu-menuitem-foreach"><primary>dbusmenu_menuitem_foreach</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_foreach           (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (funcDbusmenuMenuitem * mi, gpointer data) ()</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> data</parameter>);</programlisting>
+<para>
+This calls the function <parameter>func</parameter> on this menu item and all
+	of the children of this item.  And their children.  And
+	their children.  And... you get the point.  It will get
+	called on the whole tree.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenItem"><type>DbusmenItem</type></link> to start from
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara> User data to pass to the function. closure</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-handle-event" role="function">
+<title>dbusmenu_menuitem_handle_event ()</title>
+<indexterm zone="dbusmenu-menuitem-handle-event"><primary>dbusmenu_menuitem_handle_event</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_handle_event      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *value</parameter>,
+                                                         <parameter><link linkend="guint"><type>guint</type></link> timestamp</parameter>);</programlisting>
+<para>
+This function is called to create an event.  It is likely
+	to be overrided by subclasses.  The default menu item
+	will respond to the activate signal and do:
+</para>
+<para>
+	Emits the <link linkend="DbusmenuMenuitem-item-activate"><type>"item-activate"</type></link> signal on this
+	menu item.  Called by server objects when they get the
+	appropriate DBus signals from the client.
+</para>
+<para>
+	If you subclass this function you should really think
+	about calling the parent function unless you have a good
+	reason not to.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to send the signal on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
+<listitem><simpara>The name of the signal
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara>A value that could be set for the event
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
+<listitem><simpara>The timestamp of when the event happened
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-send-about-to-show" role="function">
+<title>dbusmenu_menuitem_send_about_to_show ()</title>
+<indexterm zone="dbusmenu-menuitem-send-about-to-show"><primary>dbusmenu_menuitem_send_about_to_show</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_send_about_to_show
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
+                                                         <parameter><link linkend="dbusmenu-menuitem-about-to-show-cb"><type>dbusmenu_menuitem_about_to_show_cb</type></link> cb</parameter>,
+                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> cb_data</parameter>);</programlisting>
+<para>
+This function is used to send the even that the submenu
+	of this item is about to be shown.  Callers to this event
+	should delay showing the menu until their callback is
+	called if possible.
+</para><variablelist role="params">
+<varlistentry><term><parameter>mi</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to send the signal on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>cb</parameter>&#160;:</term>
+<listitem><simpara>Callback to call when the call has returned.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>cb_data</parameter>&#160;:</term>
+<listitem><simpara> Data to pass to the callback.. closure</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+<refsect1 id="DbusmenuMenuitem.property-details" role="property_details">
+<title role="property_details.title">Property Details</title>
+<refsect2 id="DbusmenuMenuitem--id" role="property"><title>The <literal>&quot;id&quot;</literal> property</title>
+<indexterm zone="DbusmenuMenuitem--id"><primary>DbusmenuMenuitem:id</primary></indexterm>
+<programlisting>  &quot;id&quot;                       <link linkend="gint"><type>gint</type></link>                  : Read / Write / Construct Only</programlisting>
+<para>This is a unique indentifier for the menu item.</para><para>Allowed values: [G_MAXULONG,30000]</para>
+<para>Default value: -1</para>
+</refsect2>
+</refsect1>
+<refsect1 id="DbusmenuMenuitem.signal-details" role="signals">
+<title role="signals.title">Signal Details</title>
+<refsect2 id="DbusmenuMenuitem-child-added" role="signal"><title>The <literal>&quot;child-added&quot;</literal> signal</title>
+<indexterm zone="DbusmenuMenuitem-child-added"><primary>DbusmenuMenuitem::child-added</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                user_function                      (<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *arg0,
+                                                        <link linkend="GObject"><type>GObject</type></link>          *arg1,
+                                                        <link linkend="guint"><type>guint</type></link>             arg2,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          user_data)      : Run Last</programlisting>
+<para>
+Signaled when the child menuitem has been added to
+		the parent.
+</para><variablelist role="params">
+<varlistentry><term><parameter>arg0</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which is the parent.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg1</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which is the child.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg2</parameter>&#160;:</term>
+<listitem><simpara>The position that the child is being added in.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
+</variablelist></refsect2><refsect2 id="DbusmenuMenuitem-child-moved" role="signal"><title>The <literal>&quot;child-moved&quot;</literal> signal</title>
+<indexterm zone="DbusmenuMenuitem-child-moved"><primary>DbusmenuMenuitem::child-moved</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                user_function                      (<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *arg0,
+                                                        <link linkend="GObject"><type>GObject</type></link>          *arg1,
+                                                        <link linkend="guint"><type>guint</type></link>             arg2,
+                                                        <link linkend="guint"><type>guint</type></link>             arg3,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          user_data)      : Run Last</programlisting>
+<para>
+Signaled when the child menuitem has had it's location
+		in the list change.
+</para><variablelist role="params">
+<varlistentry><term><parameter>arg0</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which is the parent.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg1</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which is the child.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg2</parameter>&#160;:</term>
+<listitem><simpara>The position that the child is being moved to.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg3</parameter>&#160;:</term>
+<listitem><simpara>The position that the child is was in.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
+</variablelist></refsect2><refsect2 id="DbusmenuMenuitem-child-removed" role="signal"><title>The <literal>&quot;child-removed&quot;</literal> signal</title>
+<indexterm zone="DbusmenuMenuitem-child-removed"><primary>DbusmenuMenuitem::child-removed</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                user_function                      (<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *arg0,
+                                                        <link linkend="GObject"><type>GObject</type></link>          *arg1,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          user_data)      : Run Last</programlisting>
+<para>
+Signaled when the child menuitem has been requested to
+		be removed from the parent.  This signal is called when
+		it has been removed from the list but not yet had
+		<link linkend="g-object-unref"><type>g_object_unref</type></link> called on it.
+</para><variablelist role="params">
+<varlistentry><term><parameter>arg0</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which was the parent.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg1</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which was the child.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
+</variablelist></refsect2><refsect2 id="DbusmenuMenuitem-item-activated" role="signal"><title>The <literal>&quot;item-activated&quot;</literal> signal</title>
+<indexterm zone="DbusmenuMenuitem-item-activated"><primary>DbusmenuMenuitem::item-activated</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                user_function                      (<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *arg0,
+                                                        <link linkend="guint"><type>guint</type></link>             arg1,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          user_data)      : Run Last</programlisting>
+<para>
+Emitted on the objects on the server side when
+		they are signaled on the client side.
+</para><variablelist role="params">
+<varlistentry><term><parameter>arg0</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> object.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg1</parameter>&#160;:</term>
+<listitem><simpara>The timestamp of when it was activated
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
+</variablelist></refsect2><refsect2 id="DbusmenuMenuitem-property-changed" role="signal"><title>The <literal>&quot;property-changed&quot;</literal> signal</title>
+<indexterm zone="DbusmenuMenuitem-property-changed"><primary>DbusmenuMenuitem::property-changed</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                user_function                      (<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *arg0,
+                                                        <link linkend="gchar"><type>gchar</type></link>            *arg1,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          arg2,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          user_data)      : Run Last</programlisting>
+<para>
+Emitted everytime a property on a menuitem is either
+		updated or added.
+</para><variablelist role="params">
+<varlistentry><term><parameter>arg0</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> object.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg1</parameter>&#160;:</term>
+<listitem><simpara>The name of the property that changed
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>arg2</parameter>&#160;:</term>
+<listitem><simpara>The new value of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
+</variablelist></refsect2><refsect2 id="DbusmenuMenuitem-realized" role="signal"><title>The <literal>&quot;realized&quot;</literal> signal</title>
+<indexterm zone="DbusmenuMenuitem-realized"><primary>DbusmenuMenuitem::realized</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                user_function                      (<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *arg0,
+                                                        <link linkend="gpointer"><type>gpointer</type></link>          user_data)      : Run Last</programlisting>
+<para>
+Emitted when the initial request for properties
+		is complete on the item.  If there is a type
+		handler configured for the "type" parameter
+		that will be executed before this is signaled.
+</para><variablelist role="params">
+<varlistentry><term><parameter>arg0</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> object.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
+<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/server.xml b/docs/libdbusmenu-glib/reference/xml/server.xml
new file mode 100644
index 0000000..1390c03
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/xml/server.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-glib-DbusmenuServer">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-glib-DbusmenuServer.top_of_page">DbusmenuServer</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GLIB Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuServer</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="libdbusmenu-glib-DbusmenuServer.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS">DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</link>
+#define             <link linkend="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS">DBUSMENU_SERVER_SIGNAL_ID_UPDATE</link>
+#define             <link linkend="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</link>
+#define             <link linkend="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS">DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</link>
+#define             <link linkend="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS">DBUSMENU_SERVER_PROP_DBUS_OBJECT</link>
+#define             <link linkend="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS">DBUSMENU_SERVER_PROP_ROOT_NODE</link>
+#define             <link linkend="DBUSMENU-SERVER-PROP-VERSION:CAPS">DBUSMENU_SERVER_PROP_VERSION</link>
+                    <link linkend="DbusmenuServerClass">DbusmenuServerClass</link>;
+<link linkend="DbusmenuServer"><returnvalue>DbusmenuServer</returnvalue></link> *    <link linkend="dbusmenu-server-new">dbusmenu_server_new</link>                 (<parameter>const <link linkend="gchar"><type>gchar</type></link> *object</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-server-set-root">dbusmenu_server_set_root</link>            (<parameter><link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> *server</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *root</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-glib-DbusmenuServer.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-glib-DbusmenuServer.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS" role="macro">
+<title>DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</title>
+<indexterm zone="DBUSMENU-SERVER-SIGNAL-ID-PROP-UPDATE:CAPS"><primary>DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE  "item-property-updated"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS" role="macro">
+<title>DBUSMENU_SERVER_SIGNAL_ID_UPDATE</title>
+<indexterm zone="DBUSMENU-SERVER-SIGNAL-ID-UPDATE:CAPS"><primary>DBUSMENU_SERVER_SIGNAL_ID_UPDATE</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_SIGNAL_ID_UPDATE       "item-updated"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS" role="macro">
+<title>DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</title>
+<indexterm zone="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATED:CAPS"><primary>DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED  "layout-updated"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS" role="macro">
+<title>DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</title>
+<indexterm zone="DBUSMENU-SERVER-SIGNAL-LAYOUT-UPDATE:CAPS"><primary>DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE   DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS" role="macro">
+<title>DBUSMENU_SERVER_PROP_DBUS_OBJECT</title>
+<indexterm zone="DBUSMENU-SERVER-PROP-DBUS-OBJECT:CAPS"><primary>DBUSMENU_SERVER_PROP_DBUS_OBJECT</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_PROP_DBUS_OBJECT       "dbus-object"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS" role="macro">
+<title>DBUSMENU_SERVER_PROP_ROOT_NODE</title>
+<indexterm zone="DBUSMENU-SERVER-PROP-ROOT-NODE:CAPS"><primary>DBUSMENU_SERVER_PROP_ROOT_NODE</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_PROP_ROOT_NODE         "root-node"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-SERVER-PROP-VERSION:CAPS" role="macro">
+<title>DBUSMENU_SERVER_PROP_VERSION</title>
+<indexterm zone="DBUSMENU-SERVER-PROP-VERSION:CAPS"><primary>DBUSMENU_SERVER_PROP_VERSION</primary></indexterm>
+<programlisting>#define DBUSMENU_SERVER_PROP_VERSION           "version"
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuServerClass" role="struct">
+<title>DbusmenuServerClass</title>
+<indexterm zone="DbusmenuServerClass"><primary>DbusmenuServerClass</primary></indexterm>
+<programlisting>typedef struct {
+	GObjectClass parent_class;
+
+	/* Signals */
+	void (*id_prop_update)(gint id, gchar * property, gchar * value);
+	void (*id_update)(gint id);
+	void (*layout_updated)(gint revision);
+
+	/* Reserved */
+	void (*dbusmenu_server_reserved1)(void);
+	void (*dbusmenu_server_reserved2)(void);
+	void (*dbusmenu_server_reserved3)(void);
+	void (*dbusmenu_server_reserved4)(void);
+} DbusmenuServerClass;
+</programlisting>
+<para>
+The class implementing the virtual functions for <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>.
+</para><variablelist role="struct">
+<varlistentry><term><link linkend="GObjectClass"><type>GObjectClass</type></link>&#160;<structfield id="DbusmenuServerClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara><link linkend="GObjectClass"><type>GObjectClass</type></link>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.id-prop-update">id_prop_update</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuServer-id-prop-update"><type>"id-prop-update"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.id-update">id_update</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuServer-id-update"><type>"id-update"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.layout-updated">layout_updated</structfield>&#160;()</term>
+<listitem><simpara>Slot for <link linkend="DbusmenuServer-layout-update"><type>"layout-update"</type></link>.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.dbusmenu-server-reserved1">dbusmenu_server_reserved1</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.dbusmenu-server-reserved2">dbusmenu_server_reserved2</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.dbusmenu-server-reserved3">dbusmenu_server_reserved3</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuServerClass.dbusmenu-server-reserved4">dbusmenu_server_reserved4</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-server-new" role="function">
+<title>dbusmenu_server_new ()</title>
+<indexterm zone="dbusmenu-server-new"><primary>dbusmenu_server_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuServer"><returnvalue>DbusmenuServer</returnvalue></link> *    dbusmenu_server_new                 (<parameter>const <link linkend="gchar"><type>gchar</type></link> *object</parameter>);</programlisting>
+<para>
+Creates a new <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> object with a specific object
+	path on DBus.  If <parameter>object</parameter> is set to NULL the default object
+	name of "/org/ayatana/dbusmenu" will be used.
+</para><variablelist role="params">
+<varlistentry><term><parameter>object</parameter>&#160;:</term>
+<listitem><simpara>The object name to show for this menu structure
+		on DBus.  May be NULL.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A brand new <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-server-set-root" role="function">
+<title>dbusmenu_server_set_root ()</title>
+<indexterm zone="dbusmenu-server-set-root"><primary>dbusmenu_server_set_root</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_server_set_root            (<parameter><link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> *server</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *root</parameter>);</programlisting>
+<para>
+This function contains all of the <link linkend="GValue"><type>GValue</type></link> wrapping
+	required to set the property <link linkend="DbusmenuServer--root-node"><type>"root-node"</type></link>
+	on the server <parameter>self</parameter>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>server</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>root</parameter>&#160;:</term>
+<listitem><simpara>The new root <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> tree
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-gtk/Makefile.in b/docs/libdbusmenu-gtk/Makefile.in
new file mode 100644
index 0000000..fd3d4f2
--- /dev/null
+++ b/docs/libdbusmenu-gtk/Makefile.in
@@ -0,0 +1,613 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = docs/libdbusmenu-gtk
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@
+DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@
+DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@
+DBUSMENUGTK_LIBS = @DBUSMENUGTK_LIBS@
+DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
+DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDBUSMENU_AGE = @LIBDBUSMENU_AGE@
+LIBDBUSMENU_CURRENT = @LIBDBUSMENU_CURRENT@
+LIBDBUSMENU_REVISION = @LIBDBUSMENU_REVISION@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VALA_API_GEN = @VALA_API_GEN@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = reference
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libdbusmenu-gtk/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/libdbusmenu-gtk/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.in b/docs/libdbusmenu-gtk/reference/Makefile.in
new file mode 100644
index 0000000..7473f0d
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/Makefile.in
@@ -0,0 +1,683 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make
+subdir = docs/libdbusmenu-gtk/reference
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = version.xml
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@
+DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@
+DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@
+DBUSMENUGTK_LIBS = @DBUSMENUGTK_LIBS@
+DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
+DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDBUSMENU_AGE = @LIBDBUSMENU_AGE@
+LIBDBUSMENU_CURRENT = @LIBDBUSMENU_CURRENT@
+LIBDBUSMENU_REVISION = @LIBDBUSMENU_REVISION@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VALA_API_GEN = @VALA_API_GEN@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# We require automake 1.6 at least.
+AUTOMAKE_OPTIONS = 1.6
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
+
+# The name of the module, e.g. 'glib'.
+DOC_MODULE = libdbusmenu-gtk
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+
+# The directory containing the source code. Relative to $(srcdir).
+# gtk-doc will search all .c & .h files beneath here for inline comments
+# documenting the functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR = ../../../libdbusmenu-gtk
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS = --nogtkinit --type-init-func="g_type_init()"
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS = 
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
+MKTMPL_OPTIONS = 
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS = 
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB = $(top_srcdir)/libdbusmenu-gtk/*.h
+CFILE_GLOB = $(top_srcdir)/libdbusmenu-gtk/*.c
+
+# Header files to ignore when scanning.
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES = 
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES = 
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files = version.xml
+
+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# These files must be listed here *and* in content_files
+# e.g. expand_content_files=running.sgml
+expand_content_files = 
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+INCLUDES = -I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la 
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
+	version.xml.in
+DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.local.make $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libdbusmenu-gtk/reference/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/libdbusmenu-gtk/reference/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-local
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-local dist-hook distclean \
+	distclean-generic distclean-libtool distclean-local distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local
+
+
+@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+@ENABLE_GTK_DOC_FALSE@all-local:
+
+docs: html-build.stamp
+
+$(REPORT_FILES): sgml-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+	@echo 'gtk-doc: Scanning header files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo 'gtk-doc: Rebuilding template files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+tmpl/*.sgml:
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+	@echo 'gtk-doc: Building XML'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building HTML'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html
+	mkdir $(srcdir)/html
+	mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+	if test "$(?)" = "0"; then \
+	  mkhtml_options=--path="$(srcdir)"; \
+	fi
+	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo 'gtk-doc: Fixing cross-references'
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+	rm -rf .libs
+
+distclean-local:
+	cd $(srcdir) && \
+	  rm -rf xml $(REPORT_FILES) \
+	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html
+
+install-data-local:
+	installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	  else \
+	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	  fi; \
+	  $(mkinstalldirs) $${installdir} ; \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $${installdir}; \
+	  done; \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+	  fi; \
+	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
+	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+	fi
+
+uninstall-local:
+	if test -n "$(DOC_MODULE_VERSION)"; then \
+	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	else \
+	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	fi; \
+	rm -rf $${installdir}
+
+#
+# Require gtk-doc when making dist
+#
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+@ENABLE_GTK_DOC_FALSE@	@false
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	! which gtkdoc-rebase >/dev/null 2>&1 || \
+	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
+
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+#DISTCLEANFILES +=
+
+# Comment this out if you want your docs-status tested during 'make check'
+#TESTS = $(GTKDOC_CHECK)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/docs/libdbusmenu-gtk/reference/html/Genericmenuitem.html b/docs/libdbusmenu-gtk/reference/html/Genericmenuitem.html
new file mode 100644
index 0000000..1869e60
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/Genericmenuitem.html
@@ -0,0 +1,360 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Genericmenuitem</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">
+<link rel="next" href="libdbusmenu-gtk-menuitem.html" title="menuitem">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-gtk-DbusmenuGtkClient.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-gtk-menuitem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#Genericmenuitem.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#Genericmenuitem.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Genericmenuitem.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#Genericmenuitem.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+</td></tr>
+</table>
+<div class="refentry" title="Genericmenuitem">
+<a name="Genericmenuitem"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="Genericmenuitem.top_of_page"></a>Genericmenuitem</span></h2>
+<p>Genericmenuitem</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="Genericmenuitem.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="Genericmenuitem.html#GENERICMENUITEM-TYPE:CAPS" title="GENERICMENUITEM_TYPE">GENERICMENUITEM_TYPE</a>
+#define             <a class="link" href="Genericmenuitem.html#GENERICMENUITEM:CAPS" title="GENERICMENUITEM()">GENERICMENUITEM</a>                     (obj)
+#define             <a class="link" href="Genericmenuitem.html#GENERICMENUITEM-CLASS:CAPS" title="GENERICMENUITEM_CLASS()">GENERICMENUITEM_CLASS</a>               (klass)
+#define             <a class="link" href="Genericmenuitem.html#IS-GENERICMENUITEM:CAPS" title="IS_GENERICMENUITEM()">IS_GENERICMENUITEM</a>                  (obj)
+#define             <a class="link" href="Genericmenuitem.html#IS-GENERICMENUITEM-CLASS:CAPS" title="IS_GENERICMENUITEM_CLASS()">IS_GENERICMENUITEM_CLASS</a>            (klass)
+#define             <a class="link" href="Genericmenuitem.html#GENERICMENUITEM-GET-CLASS:CAPS" title="GENERICMENUITEM_GET_CLASS()">GENERICMENUITEM_GET_CLASS</a>           (obj)
+                    <a class="link" href="Genericmenuitem.html#Genericmenuitem-struct" title="Genericmenuitem">Genericmenuitem</a>;
+                    <a class="link" href="Genericmenuitem.html#GenericmenuitemClass" title="GenericmenuitemClass">GenericmenuitemClass</a>;
+                    <a class="link" href="Genericmenuitem.html#GenericmenuitemPrivate" title="GenericmenuitemPrivate">GenericmenuitemPrivate</a>;
+enum                <a class="link" href="Genericmenuitem.html#GenericmenuitemCheckType" title="enum GenericmenuitemCheckType">GenericmenuitemCheckType</a>;
+enum                <a class="link" href="Genericmenuitem.html#GenericmenuitemState" title="enum GenericmenuitemState">GenericmenuitemState</a>;
+<a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="Genericmenuitem.html#genericmenuitem-get-type" title="genericmenuitem_get_type ()">genericmenuitem_get_type</a>            (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="Genericmenuitem.html#genericmenuitem-set-check-type" title="genericmenuitem_set_check_type ()">genericmenuitem_set_check_type</a>      (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="Genericmenuitem.html#GenericmenuitemCheckType" title="enum GenericmenuitemCheckType"><span class="type">GenericmenuitemCheckType</span></a> check_type</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="Genericmenuitem.html#genericmenuitem-set-state" title="genericmenuitem_set_state ()">genericmenuitem_set_state</a>           (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="Genericmenuitem.html#GenericmenuitemState" title="enum GenericmenuitemState"><span class="type">GenericmenuitemState</span></a> state</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="Genericmenuitem.html#genericmenuitem-set-image" title="genericmenuitem_set_image ()">genericmenuitem_set_image</a>           (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *image</code></em>);
+<a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a> *         <a class="link" href="Genericmenuitem.html#genericmenuitem-get-image" title="genericmenuitem_get_image ()">genericmenuitem_get_image</a>           (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="Genericmenuitem.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----<a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
+         +----<a href="/usr/share/gtk-doc/html/gtk/GtkObject.html">GtkObject</a>
+               +----<a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html">GtkWidget</a>
+                     +----<a href="/usr/share/gtk-doc/html/gtk/GtkContainer.html">GtkContainer</a>
+                           +----<a href="/usr/share/gtk-doc/html/gtk/GtkBin.html">GtkBin</a>
+                                 +----<a href="/usr/share/gtk-doc/html/gtk/GtkItem.html">GtkItem</a>
+                                       +----<a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html">GtkMenuItem</a>
+                                             +----<a href="/usr/share/gtk-doc/html/gtk/gtk-gtkcheckmenuitem.html#GtkCheckMenuItem">GtkCheckMenuItem</a>
+                                                   +----Genericmenuitem
+</pre>
+</div>
+<div class="refsect1" title="Implemented Interfaces">
+<a name="Genericmenuitem.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+Genericmenuitem implements
+ AtkImplementorIface,  <a href="/usr/share/gtk-doc/html/gtk/gtk-gtkbuildable.html#GtkBuildable">GtkBuildable</a> and  <a href="/usr/share/gtk-doc/html/gtk/GtkActivatable.html">GtkActivatable</a>.</p>
+</div>
+<div class="refsect1" title="Description">
+<a name="Genericmenuitem.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="Genericmenuitem.details"></a><h2>Details</h2>
+<div class="refsect2" title="GENERICMENUITEM_TYPE">
+<a name="GENERICMENUITEM-TYPE:CAPS"></a><h3>GENERICMENUITEM_TYPE</h3>
+<pre class="programlisting">#define GENERICMENUITEM_TYPE            (genericmenuitem_get_type ())
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="GENERICMENUITEM()">
+<a name="GENERICMENUITEM:CAPS"></a><h3>GENERICMENUITEM()</h3>
+<pre class="programlisting">#define GENERICMENUITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GENERICMENUITEM_TYPE, Genericmenuitem))
+</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="GENERICMENUITEM_CLASS()">
+<a name="GENERICMENUITEM-CLASS:CAPS"></a><h3>GENERICMENUITEM_CLASS()</h3>
+<pre class="programlisting">#define GENERICMENUITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GENERICMENUITEM_TYPE, GenericmenuitemClass))
+</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>klass</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="IS_GENERICMENUITEM()">
+<a name="IS-GENERICMENUITEM:CAPS"></a><h3>IS_GENERICMENUITEM()</h3>
+<pre class="programlisting">#define IS_GENERICMENUITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GENERICMENUITEM_TYPE))
+</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="IS_GENERICMENUITEM_CLASS()">
+<a name="IS-GENERICMENUITEM-CLASS:CAPS"></a><h3>IS_GENERICMENUITEM_CLASS()</h3>
+<pre class="programlisting">#define IS_GENERICMENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GENERICMENUITEM_TYPE))
+</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>klass</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="GENERICMENUITEM_GET_CLASS()">
+<a name="GENERICMENUITEM-GET-CLASS:CAPS"></a><h3>GENERICMENUITEM_GET_CLASS()</h3>
+<pre class="programlisting">#define GENERICMENUITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GENERICMENUITEM_TYPE, GenericmenuitemClass))
+</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="Genericmenuitem">
+<a name="Genericmenuitem-struct"></a><h3>Genericmenuitem</h3>
+<pre class="programlisting">typedef struct _Genericmenuitem Genericmenuitem;</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="GenericmenuitemClass">
+<a name="GenericmenuitemClass"></a><h3>GenericmenuitemClass</h3>
+<pre class="programlisting">typedef struct {
+	GtkCheckMenuItemClass parent_class;
+} GenericmenuitemClass;
+</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="type">GtkCheckMenuItemClass</span> <em class="structfield"><code><a name="GenericmenuitemClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>Our parent <span class="type">GtkCheckMenuItemClass</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="GenericmenuitemPrivate">
+<a name="GenericmenuitemPrivate"></a><h3>GenericmenuitemPrivate</h3>
+<pre class="programlisting">typedef struct _GenericmenuitemPrivate GenericmenuitemPrivate;</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="enum GenericmenuitemCheckType">
+<a name="GenericmenuitemCheckType"></a><h3>enum GenericmenuitemCheckType</h3>
+<pre class="programlisting">enum GenericmenuitemCheckType {
+	GENERICMENUITEM_CHECK_TYPE_NONE,
+	GENERICMENUITEM_CHECK_TYPE_CHECKBOX,
+	GENERICMENUITEM_CHECK_TYPE_RADIO
+};
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="enum GenericmenuitemState">
+<a name="GenericmenuitemState"></a><h3>enum GenericmenuitemState</h3>
+<pre class="programlisting">enum GenericmenuitemState {
+	GENERICMENUITEM_STATE_UNCHECKED,
+	GENERICMENUITEM_STATE_CHECKED,
+	GENERICMENUITEM_STATE_INDETERMINATE
+};
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="genericmenuitem_get_type ()">
+<a name="genericmenuitem-get-type"></a><h3>genericmenuitem_get_type ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               genericmenuitem_get_type            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="genericmenuitem_set_check_type ()">
+<a name="genericmenuitem-set-check-type"></a><h3>genericmenuitem_set_check_type ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                genericmenuitem_set_check_type      (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="Genericmenuitem.html#GenericmenuitemCheckType" title="enum GenericmenuitemCheckType"><span class="type">GenericmenuitemCheckType</span></a> check_type</code></em>);</pre>
+<p>
+This function changes the type of the checkmark that
+	appears in the left hand gutter for the menuitem.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>
+<a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> to set the type on
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>check_type</code></em> :</span></p></td>
+<td>Which type of check should be displayed
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="genericmenuitem_set_state ()">
+<a name="genericmenuitem-set-state"></a><h3>genericmenuitem_set_state ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                genericmenuitem_set_state           (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="Genericmenuitem.html#GenericmenuitemState" title="enum GenericmenuitemState"><span class="type">GenericmenuitemState</span></a> state</code></em>);</pre>
+<p>
+Sets the state of the check in the menu item.  It does
+	not require, but isn't really useful if the type of
+	check that the menuitem is set to <span class="type">GENERICMENUITEM_CHECK_TYPE_NONE</span>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>
+<a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> to set the type on
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>state</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="genericmenuitem_set_image ()">
+<a name="genericmenuitem-set-image"></a><h3>genericmenuitem_set_image ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                genericmenuitem_set_image           (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *image</code></em>);</pre>
+<p>
+Sets the image of the menu item.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>A <a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>image</code></em> :</span></p></td>
+<td>The image to set as the image of <em class="parameter"><code>item</code></em>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="genericmenuitem_get_image ()">
+<a name="genericmenuitem-get-image"></a><h3>genericmenuitem_get_image ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a> *         genericmenuitem_get_image           (<em class="parameter"><code><a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a> *item</code></em>);</pre>
+<p>
+Returns the image if there is one.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>A <a class="link" href="Genericmenuitem.html" title="Genericmenuitem"><span class="type">Genericmenuitem</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A pointer to the image of the item or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>
+		if there isn't one.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/api-index-full.html b/docs/libdbusmenu-gtk/reference/html/api-index-full.html
new file mode 100644
index 0000000..5b1fe4e
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/api-index-full.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API Index</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="prev" href="object-tree.html" title="Object Hierarchy">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="object-tree.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td> </td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#idx"></a>
+                      | 
+                   <a class="shortcut" href="#idxC">C</a>
+                      | 
+                   <a class="shortcut" href="#idxD">D</a>
+                      | 
+                   <a class="shortcut" href="#idxG">G</a>
+                      | 
+                   <a class="shortcut" href="#idxI">I</a>
+                      | 
+                   <a class="shortcut" href="#idxP">P</a>
+                      | 
+                   <a class="shortcut" href="#idxS">S</a>
+                      | 
+                   <a class="shortcut" href="#idxT">T</a>
+</td></tr>
+</table>
+<div class="index" title="API Index">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="api-index-full"></a>API Index</h2></div></div></div>
+<a name="idx"></a><a name="idx"></a><h3 class="title"></h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#GENERICMENUITEM:CAPS" title="GENERICMENUITEM()">GENERICMENUITEM</a>, macro in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#Genericmenuitem-struct" title="Genericmenuitem">Genericmenuitem</a>, struct in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<a name="idxC"></a><h3 class="title">C</h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#GenericmenuitemCheckType" title="enum GenericmenuitemCheckType">GenericmenuitemCheckType</a>, enum in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#GENERICMENUITEM-CLASS:CAPS" title="GENERICMENUITEM_CLASS()">GENERICMENUITEM_CLASS</a>, macro in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#GenericmenuitemClass" title="GenericmenuitemClass">GenericmenuitemClass</a>, struct in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<a name="idxD"></a><h3 class="title">D</h3>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass" title="DbusmenuGtkClientClass">DbusmenuGtkClientClass</a>, struct in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#DbusmenuGtkMenuClass" title="DbusmenuGtkMenuClass">DbusmenuGtkMenuClass</a>, struct in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html" title="DbusmenuGtkMenu">DbusmenuGtkMenu</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a>, function in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a>, function in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a>, function in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base" title="dbusmenu_gtkclient_newitem_base ()">dbusmenu_gtkclient_newitem_base</a>, function in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS" title="DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED">DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</a>, macro in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-TYPE:CAPS" title="DBUSMENU_GTKCLIENT_TYPE">DBUSMENU_GTKCLIENT_TYPE</a>, macro in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">DbusmenuGtkClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-get-client" title="dbusmenu_gtkmenu_get_client ()">dbusmenu_gtkmenu_get_client</a>, function in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html" title="DbusmenuGtkMenu">DbusmenuGtkMenu</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-new" title="dbusmenu_gtkmenu_new ()">dbusmenu_gtkmenu_new</a>, function in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html" title="DbusmenuGtkMenu">DbusmenuGtkMenu</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#DBUSMENU-GTKMENU-TYPE:CAPS" title="DBUSMENU_GTKMENU_TYPE">DBUSMENU_GTKMENU_TYPE</a>, macro in <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html" title="DbusmenuGtkMenu">DbusmenuGtkMenu</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image" title="dbusmenu_menuitem_property_get_image ()">dbusmenu_menuitem_property_get_image</a>, function in <a class="link" href="libdbusmenu-gtk-menuitem.html" title="menuitem">menuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image" title="dbusmenu_menuitem_property_set_image ()">dbusmenu_menuitem_property_set_image</a>, function in <a class="link" href="libdbusmenu-gtk-menuitem.html" title="menuitem">menuitem</a>
+</dt>
+<dd></dd>
+<a name="idxG"></a><h3 class="title">G</h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#GENERICMENUITEM-GET-CLASS:CAPS" title="GENERICMENUITEM_GET_CLASS()">GENERICMENUITEM_GET_CLASS</a>, macro in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#genericmenuitem-get-image" title="genericmenuitem_get_image ()">genericmenuitem_get_image</a>, function in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#genericmenuitem-get-type" title="genericmenuitem_get_type ()">genericmenuitem_get_type</a>, function in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<a name="idxI"></a><h3 class="title">I</h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#IS-GENERICMENUITEM:CAPS" title="IS_GENERICMENUITEM()">IS_GENERICMENUITEM</a>, macro in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#IS-GENERICMENUITEM-CLASS:CAPS" title="IS_GENERICMENUITEM_CLASS()">IS_GENERICMENUITEM_CLASS</a>, macro in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<a name="idxP"></a><h3 class="title">P</h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#GenericmenuitemPrivate" title="GenericmenuitemPrivate">GenericmenuitemPrivate</a>, struct in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<a name="idxS"></a><h3 class="title">S</h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#genericmenuitem-set-check-type" title="genericmenuitem_set_check_type ()">genericmenuitem_set_check_type</a>, function in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#genericmenuitem-set-image" title="genericmenuitem_set_image ()">genericmenuitem_set_image</a>, function in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#genericmenuitem-set-state" title="genericmenuitem_set_state ()">genericmenuitem_set_state</a>, function in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="Genericmenuitem.html#GenericmenuitemState" title="enum GenericmenuitemState">GenericmenuitemState</a>, enum in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+<a name="idxT"></a><h3 class="title">T</h3>
+<dt>
+<a class="link" href="Genericmenuitem.html#GENERICMENUITEM-TYPE:CAPS" title="GENERICMENUITEM_TYPE">GENERICMENUITEM_TYPE</a>, macro in <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</dt>
+<dd></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/ch01.html b/docs/libdbusmenu-gtk/reference/html/ch01.html
new file mode 100644
index 0000000..fd0340b
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/ch01.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="prev" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="next" href="libdbusmenu-gtk-DbusmenuGtkMenu.html" title="DbusmenuGtkMenu">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-gtk-DbusmenuGtkMenu.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter" title="API">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id418688"></a>API</h2></div></div></div>
+<div class="toc"><dl>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkClient.html">DbusmenuGtkClient</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="Genericmenuitem.html">Genericmenuitem</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-gtk-menuitem.html">menuitem</a></span><span class="refpurpose"></span>
+</dt>
+</dl></div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/home.png b/docs/libdbusmenu-gtk/reference/html/home.png
new file mode 100644
index 0000000..1700361
Binary files /dev/null and b/docs/libdbusmenu-gtk/reference/html/home.png differ
diff --git a/docs/libdbusmenu-gtk/reference/html/index.html b/docs/libdbusmenu-gtk/reference/html/index.html
new file mode 100644
index 0000000..177f34d
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>libdbusmenu-gtk Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="next" href="ch01.html" title="API">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="book" title="libdbusmenu-gtk Reference Manual">
+<div class="titlepage">
+<div><div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libdbusmenu-gtk Reference Manual</p></th></tr></table></div></div>
+<hr>
+</div>
+<div class="toc"><dl>
+<dt><span class="chapter"><a href="ch01.html">API</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkClient.html">DbusmenuGtkClient</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="Genericmenuitem.html">Genericmenuitem</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libdbusmenu-gtk-menuitem.html">menuitem</a></span><span class="refpurpose"></span>
+</dt>
+</dl></dd>
+<dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt>
+<dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt>
+</dl></div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/index.sgml b/docs/libdbusmenu-gtk/reference/html/index.sgml
new file mode 100644
index 0000000..14c0b37
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/index.sgml
@@ -0,0 +1,47 @@
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkMenu" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkMenu.synopsis" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#libdbusmenu-gtk-DbusmenuGtkMenu.synopsis">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkMenu.description" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#libdbusmenu-gtk-DbusmenuGtkMenu.description">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkMenu.details" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#libdbusmenu-gtk-DbusmenuGtkMenu.details">
+<ANCHOR id="DBUSMENU-GTKMENU-TYPE:CAPS" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#DBUSMENU-GTKMENU-TYPE:CAPS">
+<ANCHOR id="DbusmenuGtkMenuClass" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#DbusmenuGtkMenuClass">
+<ANCHOR id="dbusmenu-gtkmenu-new" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-new">
+<ANCHOR id="dbusmenu-gtkmenu-get-client" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-get-client">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkClient" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkClient.synopsis" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#libdbusmenu-gtk-DbusmenuGtkClient.synopsis">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkClient.description" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#libdbusmenu-gtk-DbusmenuGtkClient.description">
+<ANCHOR id="libdbusmenu-gtk-DbusmenuGtkClient.details" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#libdbusmenu-gtk-DbusmenuGtkClient.details">
+<ANCHOR id="DBUSMENU-GTKCLIENT-TYPE:CAPS" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-TYPE:CAPS">
+<ANCHOR id="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS">
+<ANCHOR id="DbusmenuGtkClientClass" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass">
+<ANCHOR id="dbusmenu-gtkclient-new" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new">
+<ANCHOR id="dbusmenu-gtkclient-menuitem-get" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get">
+<ANCHOR id="dbusmenu-gtkclient-menuitem-get-submenu" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu">
+<ANCHOR id="dbusmenu-gtkclient-newitem-base" href="libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base">
+<ANCHOR id="Genericmenuitem" href="libdbusmenu-gtk/Genericmenuitem.html">
+<ANCHOR id="Genericmenuitem.synopsis" href="libdbusmenu-gtk/Genericmenuitem.html#Genericmenuitem.synopsis">
+<ANCHOR id="Genericmenuitem.object-hierarchy" href="libdbusmenu-gtk/Genericmenuitem.html#Genericmenuitem.object-hierarchy">
+<ANCHOR id="Genericmenuitem.implemented-interfaces" href="libdbusmenu-gtk/Genericmenuitem.html#Genericmenuitem.implemented-interfaces">
+<ANCHOR id="Genericmenuitem.description" href="libdbusmenu-gtk/Genericmenuitem.html#Genericmenuitem.description">
+<ANCHOR id="Genericmenuitem.details" href="libdbusmenu-gtk/Genericmenuitem.html#Genericmenuitem.details">
+<ANCHOR id="GENERICMENUITEM-TYPE:CAPS" href="libdbusmenu-gtk/Genericmenuitem.html#GENERICMENUITEM-TYPE:CAPS">
+<ANCHOR id="GENERICMENUITEM:CAPS" href="libdbusmenu-gtk/Genericmenuitem.html#GENERICMENUITEM:CAPS">
+<ANCHOR id="GENERICMENUITEM-CLASS:CAPS" href="libdbusmenu-gtk/Genericmenuitem.html#GENERICMENUITEM-CLASS:CAPS">
+<ANCHOR id="IS-GENERICMENUITEM:CAPS" href="libdbusmenu-gtk/Genericmenuitem.html#IS-GENERICMENUITEM:CAPS">
+<ANCHOR id="IS-GENERICMENUITEM-CLASS:CAPS" href="libdbusmenu-gtk/Genericmenuitem.html#IS-GENERICMENUITEM-CLASS:CAPS">
+<ANCHOR id="GENERICMENUITEM-GET-CLASS:CAPS" href="libdbusmenu-gtk/Genericmenuitem.html#GENERICMENUITEM-GET-CLASS:CAPS">
+<ANCHOR id="Genericmenuitem-struct" href="libdbusmenu-gtk/Genericmenuitem.html#Genericmenuitem-struct">
+<ANCHOR id="GenericmenuitemClass" href="libdbusmenu-gtk/Genericmenuitem.html#GenericmenuitemClass">
+<ANCHOR id="GenericmenuitemPrivate" href="libdbusmenu-gtk/Genericmenuitem.html#GenericmenuitemPrivate">
+<ANCHOR id="GenericmenuitemCheckType" href="libdbusmenu-gtk/Genericmenuitem.html#GenericmenuitemCheckType">
+<ANCHOR id="GenericmenuitemState" href="libdbusmenu-gtk/Genericmenuitem.html#GenericmenuitemState">
+<ANCHOR id="genericmenuitem-get-type" href="libdbusmenu-gtk/Genericmenuitem.html#genericmenuitem-get-type">
+<ANCHOR id="genericmenuitem-set-check-type" href="libdbusmenu-gtk/Genericmenuitem.html#genericmenuitem-set-check-type">
+<ANCHOR id="genericmenuitem-set-state" href="libdbusmenu-gtk/Genericmenuitem.html#genericmenuitem-set-state">
+<ANCHOR id="genericmenuitem-set-image" href="libdbusmenu-gtk/Genericmenuitem.html#genericmenuitem-set-image">
+<ANCHOR id="genericmenuitem-get-image" href="libdbusmenu-gtk/Genericmenuitem.html#genericmenuitem-get-image">
+<ANCHOR id="libdbusmenu-gtk-menuitem" href="libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html">
+<ANCHOR id="libdbusmenu-gtk-menuitem.synopsis" href="libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html#libdbusmenu-gtk-menuitem.synopsis">
+<ANCHOR id="libdbusmenu-gtk-menuitem.description" href="libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html#libdbusmenu-gtk-menuitem.description">
+<ANCHOR id="libdbusmenu-gtk-menuitem.details" href="libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html#libdbusmenu-gtk-menuitem.details">
+<ANCHOR id="dbusmenu-menuitem-property-set-image" href="libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image">
+<ANCHOR id="dbusmenu-menuitem-property-get-image" href="libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image">
diff --git a/docs/libdbusmenu-gtk/reference/html/left.png b/docs/libdbusmenu-gtk/reference/html/left.png
new file mode 100644
index 0000000..2d05b3d
Binary files /dev/null and b/docs/libdbusmenu-gtk/reference/html/left.png differ
diff --git a/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html
new file mode 100644
index 0000000..0bea229
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html
@@ -0,0 +1,273 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuGtkClient</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="libdbusmenu-gtk-DbusmenuGtkMenu.html" title="DbusmenuGtkMenu">
+<link rel="next" href="Genericmenuitem.html" title="Genericmenuitem">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-gtk-DbusmenuGtkMenu.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td><a accesskey="n" href="Genericmenuitem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-gtk-DbusmenuGtkClient.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-gtk-DbusmenuGtkClient.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuGtkClient">
+<a name="libdbusmenu-gtk-DbusmenuGtkClient"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-gtk-DbusmenuGtkClient.top_of_page"></a>DbusmenuGtkClient</span></h2>
+<p>DbusmenuGtkClient</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-gtk-DbusmenuGtkClient.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-TYPE:CAPS" title="DBUSMENU_GTKCLIENT_TYPE">DBUSMENU_GTKCLIENT_TYPE</a>
+#define             <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS" title="DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED">DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</a>
+                    <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass" title="DbusmenuGtkClientClass">DbusmenuGtkClientClass</a>;
+<span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a>              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);
+<a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> *       <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a>     (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);
+<a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *           <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a>
+                                                        (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base" title="dbusmenu_gtkclient_newitem_base ()">dbusmenu_gtkclient_newitem_base</a>     (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *parent</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-gtk-DbusmenuGtkClient.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-gtk-DbusmenuGtkClient.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUSMENU_GTKCLIENT_TYPE">
+<a name="DBUSMENU-GTKCLIENT-TYPE:CAPS"></a><h3>DBUSMENU_GTKCLIENT_TYPE</h3>
+<pre class="programlisting">#define DBUSMENU_GTKCLIENT_TYPE            (dbusmenu_gtkclient_get_type ())
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED">
+<a name="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"></a><h3>DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</h3>
+<pre class="programlisting">#define DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED  DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuGtkClientClass">
+<a name="DbusmenuGtkClientClass"></a><h3>DbusmenuGtkClientClass</h3>
+<pre class="programlisting">typedef struct {
+	DbusmenuClientClass parent_class;
+
+	/* Signals */
+	void (*root_changed) (DbusmenuMenuitem * newroot);
+
+	/* Reserved */
+	void (*reserved1) (void);
+	void (*reserved2) (void);
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+} DbusmenuGtkClientClass;
+</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><span class="type">DbusmenuClientClass</span> <em class="structfield"><code><a name="DbusmenuGtkClientClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>
+<span class="type">GtkMenuClass</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkClientClass.root-changed"></a>root_changed</code></em> ()</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkClientClass.reserved1"></a>reserved1</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkClientClass.reserved2"></a>reserved2</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkClientClass.reserved3"></a>reserved3</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkClientClass.reserved4"></a>reserved4</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_gtkclient_new ()">
+<a name="dbusmenu-gtkclient-new"></a><h3>dbusmenu_gtkclient_new ()</h3>
+<pre class="programlisting"><span class="returnvalue">DbusmenuGtkClient</span> * dbusmenu_gtkclient_new              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);</pre>
+<p>
+Creates a new <span class="type">DbusmenuGtkClient</span> object and creates a <span class="type">DbusmenuClient</span>
+	that connects across DBus to a <span class="type">DbusmenuServer</span>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>dbus_name</code></em> :</span></p></td>
+<td>Name of the <span class="type">DbusmenuServer</span> on DBus
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>dbus_object</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A new <span class="type">DbusmenuGtkClient</span> sync'd with a server
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_gtkclient_menuitem_get ()">
+<a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> *       dbusmenu_gtkclient_menuitem_get     (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);</pre>
+<p>
+This grabs the <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the
+	<span class="type">DbusmenuMenuitem</span>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>A <span class="type">DbusmenuGtkClient</span> with the item in it.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>
+<span class="type">DbusmenuMenuitem</span> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that can be played with.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_gtkclient_menuitem_get_submenu ()">
+<a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *           dbusmenu_gtkclient_menuitem_get_submenu
+                                                        (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);</pre>
+<p>
+This grabs the submenu associated with the menuitem.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>A <span class="type">DbusmenuGtkClient</span> with the item in it.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>
+<span class="type">DbusmenuMenuitem</span> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> if there is one.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_gtkclient_newitem_base ()">
+<a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_gtkclient_newitem_base     (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
+                                                         <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *parent</code></em>);</pre>
+<p>
+This function provides some of the basic connectivity for being in
+	the GTK world.  Things like visibility and sensitivity of the item are
+	handled here so that the subclasses don't have to.  If you're building
+	your on GTK menu item you can use this function to apply those basic
+	attributes so that you don't have to deal with them either.
+</p>
+<p>
+	This also handles passing the "activate" signal back to the
+	<span class="type">DbusmenuMenuitem</span> side of thing.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>The client handling everything on this connection
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenuMenuitem</span> to attach the GTK-isms to
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gmi</code></em> :</span></p></td>
+<td>A <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> representing the GTK world's view of this menuitem
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
+<td>The parent <span class="type">DbusmenuMenuitem</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html
new file mode 100644
index 0000000..f36e8a5
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html
@@ -0,0 +1,166 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DbusmenuGtkMenu</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="ch01.html" title="API">
+<link rel="next" href="libdbusmenu-gtk-DbusmenuGtkClient.html" title="DbusmenuGtkClient">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td><a accesskey="n" href="libdbusmenu-gtk-DbusmenuGtkClient.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-gtk-DbusmenuGtkMenu.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-gtk-DbusmenuGtkMenu.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="DbusmenuGtkMenu">
+<a name="libdbusmenu-gtk-DbusmenuGtkMenu"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-gtk-DbusmenuGtkMenu.top_of_page"></a>DbusmenuGtkMenu</span></h2>
+<p>DbusmenuGtkMenu</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-gtk-DbusmenuGtkMenu.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#DBUSMENU-GTKMENU-TYPE:CAPS" title="DBUSMENU_GTKMENU_TYPE">DBUSMENU_GTKMENU_TYPE</a>
+                    <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#DbusmenuGtkMenuClass" title="DbusmenuGtkMenuClass">DbusmenuGtkMenuClass</a>;
+<span class="returnvalue">DbusmenuGtkMenu</span> *   <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-new" title="dbusmenu_gtkmenu_new ()">dbusmenu_gtkmenu_new</a>                (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);
+<span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-get-client" title="dbusmenu_gtkmenu_get_client ()">dbusmenu_gtkmenu_get_client</a>         (<em class="parameter"><code><span class="type">DbusmenuGtkMenu</span> *menu</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-gtk-DbusmenuGtkMenu.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-gtk-DbusmenuGtkMenu.details"></a><h2>Details</h2>
+<div class="refsect2" title="DBUSMENU_GTKMENU_TYPE">
+<a name="DBUSMENU-GTKMENU-TYPE:CAPS"></a><h3>DBUSMENU_GTKMENU_TYPE</h3>
+<pre class="programlisting">#define DBUSMENU_GTKMENU_TYPE            (dbusmenu_gtkmenu_get_type ())
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2" title="DbusmenuGtkMenuClass">
+<a name="DbusmenuGtkMenuClass"></a><h3>DbusmenuGtkMenuClass</h3>
+<pre class="programlisting">typedef struct {
+	GtkMenuClass parent_class;
+
+	/* Reserved */
+	void (*reserved1) (void);
+	void (*reserved2) (void);
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+} DbusmenuGtkMenuClass;
+</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><span class="type">GtkMenuClass</span> <em class="structfield"><code><a name="DbusmenuGtkMenuClass.parent-class"></a>parent_class</code></em>;</span></p></td>
+<td>
+<span class="type">GtkMenuClass</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkMenuClass.reserved1"></a>reserved1</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkMenuClass.reserved2"></a>reserved2</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkMenuClass.reserved3"></a>reserved3</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuGtkMenuClass.reserved4"></a>reserved4</code></em> ()</span></p></td>
+<td>Reserved for future use.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_gtkmenu_new ()">
+<a name="dbusmenu-gtkmenu-new"></a><h3>dbusmenu_gtkmenu_new ()</h3>
+<pre class="programlisting"><span class="returnvalue">DbusmenuGtkMenu</span> *   dbusmenu_gtkmenu_new                (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);</pre>
+<p>
+Creates a new <span class="type">DbusmenuGtkMenu</span> object and creates a <span class="type">DbusmenuClient</span>
+	that connects across DBus to a <span class="type">DbusmenuServer</span>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>dbus_name</code></em> :</span></p></td>
+<td>Name of the <span class="type">DbusmenuServer</span> on DBus
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>dbus_object</code></em> :</span></p></td>
+<td>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A new <span class="type">DbusmenuGtkMenu</span> sync'd with a server
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_gtkmenu_get_client ()">
+<a name="dbusmenu-gtkmenu-get-client"></a><h3>dbusmenu_gtkmenu_get_client ()</h3>
+<pre class="programlisting"><span class="returnvalue">DbusmenuGtkClient</span> * dbusmenu_gtkmenu_get_client         (<em class="parameter"><code><span class="type">DbusmenuGtkMenu</span> *menu</code></em>);</pre>
+<p>
+An accessor for the client that this menu is using to
+	communicate with the server.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>menu</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenuGtkMenu</span> to get the client from
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A valid <span class="type">DbusmenuGtkClient</span> or NULL on error.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html
new file mode 100644
index 0000000..b3f5058
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>menuitem</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="ch01.html" title="API">
+<link rel="prev" href="Genericmenuitem.html" title="Genericmenuitem">
+<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="Genericmenuitem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#libdbusmenu-gtk-menuitem.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#libdbusmenu-gtk-menuitem.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="menuitem">
+<a name="libdbusmenu-gtk-menuitem"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libdbusmenu-gtk-menuitem.top_of_page"></a>menuitem</span></h2>
+<p>menuitem</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="libdbusmenu-gtk-menuitem.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image" title="dbusmenu_menuitem_property_set_image ()">dbusmenu_menuitem_property_set_image</a>
+                                                        (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);
+<a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> *         <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image" title="dbusmenu_menuitem_property_get_image ()">dbusmenu_menuitem_property_get_image</a>
+                                                        (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="libdbusmenu-gtk-menuitem.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="libdbusmenu-gtk-menuitem.details"></a><h2>Details</h2>
+<div class="refsect2" title="dbusmenu_menuitem_property_set_image ()">
+<a name="dbusmenu-menuitem-property-set-image"></a><h3>dbusmenu_menuitem_property_set_image ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_image
+                                                        (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);</pre>
+<p>
+This function takes the pixbuf that is stored in <em class="parameter"><code>data</code></em> and
+	turns it into a base64 encoded PNG so that it can be placed
+	onto a standard <span class="type">DbusmenuMenuitem</span> property.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>menuitem</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenuMenuitem</span> to set the property on.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>Name of the property to set.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
+<td>The image to place on the property.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> Whether the function was able to set the property
+		or not.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="dbusmenu_menuitem_property_get_image ()">
+<a name="dbusmenu-menuitem-property-get-image"></a><h3>dbusmenu_menuitem_property_get_image ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> *         dbusmenu_menuitem_property_get_image
+                                                        (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
+<p>
+This function looks on the menu item for a property by the
+	name of <em class="parameter"><code>property</code></em>.  If one exists it tries to turn it into
+	a <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>.  It assumes that the property is a base64 encoded
+	PNG file like the one created by <span class="type">dbusmenu_menuite_property_set_image</span>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>menuitem</code></em> :</span></p></td>
+<td>The <span class="type">DbusmenuMenuite</span> to look for the property on
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
+<td>The name of the property to look for.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A pixbuf or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> to signal error.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp
new file mode 100644
index 0000000..ce59ace
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<book xmlns="http://www.devhelp.net/book" title="libdbusmenu-gtk Reference Manual" link="index.html" author="" name="libdbusmenu-gtk">
+  <chapters>
+    <sub name="API" link="ch01.html">
+      <sub name="DbusmenuGtkMenu" link="libdbusmenu-gtk-DbusmenuGtkMenu.html"/>
+      <sub name="DbusmenuGtkClient" link="libdbusmenu-gtk-DbusmenuGtkClient.html"/>
+      <sub name="Genericmenuitem" link="Genericmenuitem.html"/>
+      <sub name="menuitem" link="libdbusmenu-gtk-menuitem.html"/>
+    </sub>
+    <sub name="Object Hierarchy" link="object-tree.html"/>
+    <sub name="API Index" link="api-index-full.html"/>
+  </chapters>
+  <functions>
+    <function name="DBUSMENU_GTKMENU_TYPE" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#DBUSMENU-GTKMENU-TYPE:CAPS"/>
+    <function name="DbusmenuGtkMenuClass" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#DbusmenuGtkMenuClass"/>
+    <function name="dbusmenu_gtkmenu_new ()" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-new"/>
+    <function name="dbusmenu_gtkmenu_get_client ()" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-get-client"/>
+    <function name="DBUSMENU_GTKCLIENT_TYPE" link="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-TYPE:CAPS"/>
+    <function name="DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED" link="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"/>
+    <function name="DbusmenuGtkClientClass" link="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass"/>
+    <function name="dbusmenu_gtkclient_new ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new"/>
+    <function name="dbusmenu_gtkclient_menuitem_get ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get"/>
+    <function name="dbusmenu_gtkclient_menuitem_get_submenu ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu"/>
+    <function name="dbusmenu_gtkclient_newitem_base ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base"/>
+    <function name="GENERICMENUITEM_TYPE" link="Genericmenuitem.html#GENERICMENUITEM-TYPE:CAPS"/>
+    <function name="GENERICMENUITEM()" link="Genericmenuitem.html#GENERICMENUITEM:CAPS"/>
+    <function name="GENERICMENUITEM_CLASS()" link="Genericmenuitem.html#GENERICMENUITEM-CLASS:CAPS"/>
+    <function name="IS_GENERICMENUITEM()" link="Genericmenuitem.html#IS-GENERICMENUITEM:CAPS"/>
+    <function name="IS_GENERICMENUITEM_CLASS()" link="Genericmenuitem.html#IS-GENERICMENUITEM-CLASS:CAPS"/>
+    <function name="GENERICMENUITEM_GET_CLASS()" link="Genericmenuitem.html#GENERICMENUITEM-GET-CLASS:CAPS"/>
+    <function name="Genericmenuitem" link="Genericmenuitem.html#Genericmenuitem-struct"/>
+    <function name="GenericmenuitemClass" link="Genericmenuitem.html#GenericmenuitemClass"/>
+    <function name="GenericmenuitemPrivate" link="Genericmenuitem.html#GenericmenuitemPrivate"/>
+    <function name="enum GenericmenuitemCheckType" link="Genericmenuitem.html#GenericmenuitemCheckType"/>
+    <function name="enum GenericmenuitemState" link="Genericmenuitem.html#GenericmenuitemState"/>
+    <function name="genericmenuitem_get_type ()" link="Genericmenuitem.html#genericmenuitem-get-type"/>
+    <function name="genericmenuitem_set_check_type ()" link="Genericmenuitem.html#genericmenuitem-set-check-type"/>
+    <function name="genericmenuitem_set_state ()" link="Genericmenuitem.html#genericmenuitem-set-state"/>
+    <function name="genericmenuitem_set_image ()" link="Genericmenuitem.html#genericmenuitem-set-image"/>
+    <function name="genericmenuitem_get_image ()" link="Genericmenuitem.html#genericmenuitem-get-image"/>
+    <function name="dbusmenu_menuitem_property_set_image ()" link="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image"/>
+    <function name="dbusmenu_menuitem_property_get_image ()" link="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image"/>
+  </functions>
+</book>
diff --git a/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp2 b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp2
new file mode 100644
index 0000000..8d7794f
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp2
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<book xmlns="http://www.devhelp.net/book" title="libdbusmenu-gtk Reference Manual" link="index.html" author="" name="libdbusmenu-gtk" version="2" language="c">
+  <chapters>
+    <sub name="API" link="ch01.html">
+      <sub name="DbusmenuGtkMenu" link="libdbusmenu-gtk-DbusmenuGtkMenu.html"/>
+      <sub name="DbusmenuGtkClient" link="libdbusmenu-gtk-DbusmenuGtkClient.html"/>
+      <sub name="Genericmenuitem" link="Genericmenuitem.html"/>
+      <sub name="menuitem" link="libdbusmenu-gtk-menuitem.html"/>
+    </sub>
+    <sub name="Object Hierarchy" link="object-tree.html"/>
+    <sub name="API Index" link="api-index-full.html"/>
+  </chapters>
+  <functions>
+    <keyword type="macro" name="DBUSMENU_GTKMENU_TYPE" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#DBUSMENU-GTKMENU-TYPE:CAPS"/>
+    <keyword type="struct" name="DbusmenuGtkMenuClass" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#DbusmenuGtkMenuClass"/>
+    <keyword type="function" name="dbusmenu_gtkmenu_new ()" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-new"/>
+    <keyword type="function" name="dbusmenu_gtkmenu_get_client ()" link="libdbusmenu-gtk-DbusmenuGtkMenu.html#dbusmenu-gtkmenu-get-client"/>
+    <keyword type="macro" name="DBUSMENU_GTKCLIENT_TYPE" link="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-TYPE:CAPS"/>
+    <keyword type="macro" name="DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED" link="libdbusmenu-gtk-DbusmenuGtkClient.html#DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"/>
+    <keyword type="struct" name="DbusmenuGtkClientClass" link="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass"/>
+    <keyword type="function" name="dbusmenu_gtkclient_new ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new"/>
+    <keyword type="function" name="dbusmenu_gtkclient_menuitem_get ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get"/>
+    <keyword type="function" name="dbusmenu_gtkclient_menuitem_get_submenu ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu"/>
+    <keyword type="function" name="dbusmenu_gtkclient_newitem_base ()" link="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base"/>
+    <keyword type="macro" name="GENERICMENUITEM_TYPE" link="Genericmenuitem.html#GENERICMENUITEM-TYPE:CAPS"/>
+    <keyword type="macro" name="GENERICMENUITEM()" link="Genericmenuitem.html#GENERICMENUITEM:CAPS"/>
+    <keyword type="macro" name="GENERICMENUITEM_CLASS()" link="Genericmenuitem.html#GENERICMENUITEM-CLASS:CAPS"/>
+    <keyword type="macro" name="IS_GENERICMENUITEM()" link="Genericmenuitem.html#IS-GENERICMENUITEM:CAPS"/>
+    <keyword type="macro" name="IS_GENERICMENUITEM_CLASS()" link="Genericmenuitem.html#IS-GENERICMENUITEM-CLASS:CAPS"/>
+    <keyword type="macro" name="GENERICMENUITEM_GET_CLASS()" link="Genericmenuitem.html#GENERICMENUITEM-GET-CLASS:CAPS"/>
+    <keyword type="struct" name="Genericmenuitem" link="Genericmenuitem.html#Genericmenuitem-struct"/>
+    <keyword type="struct" name="GenericmenuitemClass" link="Genericmenuitem.html#GenericmenuitemClass"/>
+    <keyword type="struct" name="GenericmenuitemPrivate" link="Genericmenuitem.html#GenericmenuitemPrivate"/>
+    <keyword type="enum" name="enum GenericmenuitemCheckType" link="Genericmenuitem.html#GenericmenuitemCheckType"/>
+    <keyword type="enum" name="enum GenericmenuitemState" link="Genericmenuitem.html#GenericmenuitemState"/>
+    <keyword type="function" name="genericmenuitem_get_type ()" link="Genericmenuitem.html#genericmenuitem-get-type"/>
+    <keyword type="function" name="genericmenuitem_set_check_type ()" link="Genericmenuitem.html#genericmenuitem-set-check-type"/>
+    <keyword type="function" name="genericmenuitem_set_state ()" link="Genericmenuitem.html#genericmenuitem-set-state"/>
+    <keyword type="function" name="genericmenuitem_set_image ()" link="Genericmenuitem.html#genericmenuitem-set-image"/>
+    <keyword type="function" name="genericmenuitem_get_image ()" link="Genericmenuitem.html#genericmenuitem-get-image"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_set_image ()" link="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image"/>
+    <keyword type="function" name="dbusmenu_menuitem_property_get_image ()" link="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image"/>
+  </functions>
+</book>
diff --git a/docs/libdbusmenu-gtk/reference/html/object-tree.html b/docs/libdbusmenu-gtk/reference/html/object-tree.html
new file mode 100644
index 0000000..7a7ee78
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/object-tree.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Object Hierarchy</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="up" href="index.html" title="libdbusmenu-gtk Reference Manual">
+<link rel="prev" href="libdbusmenu-gtk-menuitem.html" title="menuitem">
+<link rel="next" href="api-index-full.html" title="API Index">
+<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="libdbusmenu-gtk-menuitem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libdbusmenu-gtk Reference Manual</th>
+<td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter" title="Object Hierarchy">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
+<pre class="screen">
+    <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
+            <a href="/usr/share/gtk-doc/html/gtk/GtkObject.html">GtkObject</a>
+                <a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html">GtkWidget</a>
+                    <a href="/usr/share/gtk-doc/html/gtk/GtkContainer.html">GtkContainer</a>
+                        <a href="/usr/share/gtk-doc/html/gtk/GtkBin.html">GtkBin</a>
+                            <a href="/usr/share/gtk-doc/html/gtk/GtkItem.html">GtkItem</a>
+                                <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html">GtkMenuItem</a>
+                                    <a href="/usr/share/gtk-doc/html/gtk/gtk-gtkcheckmenuitem.html#GtkCheckMenuItem">GtkCheckMenuItem</a>
+                                        <a class="link" href="Genericmenuitem.html" title="Genericmenuitem">Genericmenuitem</a>
+</pre>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.14</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-gtk/reference/html/right.png b/docs/libdbusmenu-gtk/reference/html/right.png
new file mode 100644
index 0000000..92832e3
Binary files /dev/null and b/docs/libdbusmenu-gtk/reference/html/right.png differ
diff --git a/docs/libdbusmenu-gtk/reference/html/style.css b/docs/libdbusmenu-gtk/reference/html/style.css
new file mode 100644
index 0000000..82115eb
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/html/style.css
@@ -0,0 +1,257 @@
+.synopsis, .classsynopsis
+{
+  /* tango:aluminium 1/2 */
+  background: #eeeeec;
+  border: solid 1px #d3d7cf;
+  padding: 0.5em;
+}
+.programlisting
+{
+  /* tango:sky blue 0/1 */
+  background: #e6f3ff;
+  border: solid 1px #729fcf;
+  padding: 0.5em;
+}
+.variablelist
+{
+  padding: 4px;
+  margin-left: 3em;
+}
+.variablelist td:first-child
+{
+  vertical-align: top;
+}
+
+@media screen {
+  sup a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+    
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    position: relative;
+    padding-top:4.5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 3.2em;
+    padding-bottom: 20em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+    z-index: 10;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:scarlet red 3 */
+    color: #a40000;
+  }
+  .navigation a:hover
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+  }
+  td.shortcuts
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
+.navigation .title
+{
+  font-size: 200%;
+}
+
+div.gallery-float
+{
+  float: left;
+  padding: 10px;
+}
+div.gallery-float img
+{
+  border-style: none;
+}
+div.gallery-spacer
+{
+  clear: both;
+}
+
+a, a:visited
+{
+  text-decoration: none;
+  /* tango:sky blue 2 */
+  color: #3465a4;
+}
+a:hover
+{
+  text-decoration: underline;
+  /* tango:sky blue 1 */
+  color: #729fcf;
+}
+
+div.table table
+{
+  border-collapse: collapse;
+  border-spacing: 0px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+}
+
+div.table table td, div.table table th
+{
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+  padding: 3px;
+  vertical-align: top;
+}
+
+div.table table th
+{
+  /* tango:aluminium 2 */
+  background-color: #d3d7cf;
+}
+
+hr
+{
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  background: #babdb6;
+  border: none 0px;
+  height: 1px;
+  clear: both;
+}
+
+.footer
+{
+  padding-top: 3.5em;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  text-align: center;
+  font-size: 80%;
+}
+
+.warning
+{
+  /* tango:orange 0/1 */
+  background: #ffeed9;
+  border-color: #ffb04f;
+}
+.note
+{
+  /* tango:chameleon 0/0.5 */
+  background: #d8ffb2;
+  border-color: #abf562;
+}
+.note, .warning
+{
+  padding: 0.5em;
+  border-width: 1px;
+  border-style: solid;
+}
+.note h3, .warning h3
+{
+  margin-top: 0.0em
+}
+.note p, .warning p
+{
+  margin-bottom: 0.0em
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+  float: right;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+/* code listings */
+
+.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal     { color: #000000; }
+.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
+.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type       { color: #000000; }
+.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+
+.listing_frame {
+  /* tango:sky blue 1 */
+  border: solid 1px #729fcf;
+  padding: 0px;
+}
+
+.listing_lines, .listing_code {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding: 0.5em;
+}
+.listing_lines {
+  /* tango:sky blue 0.5 */
+  background: #a6c5e3;
+  /* tango:aluminium 6 */
+  color: #2e3436;
+}
+.listing_code {
+  /* tango:sky blue 0 */
+  background: #e6f3ff;
+}
+.listing_code .programlisting {
+  /* override from previous */
+  border: none 0px;
+  padding: 0px;
+}
+.listing_lines pre, .listing_code pre {
+  margin: 0px;
+}
+
diff --git a/docs/libdbusmenu-gtk/reference/html/up.png b/docs/libdbusmenu-gtk/reference/html/up.png
new file mode 100644
index 0000000..85b3e2a
Binary files /dev/null and b/docs/libdbusmenu-gtk/reference/html/up.png differ
diff --git a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-sections.txt b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-sections.txt
new file mode 100644
index 0000000..cd0636e
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-sections.txt
@@ -0,0 +1,62 @@
+<SECTION>
+<FILE>client</FILE>
+<TITLE>DbusmenuGtkClient</TITLE>
+DBUSMENU_GTKCLIENT_TYPE
+DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED
+DbusmenuGtkClientClass
+dbusmenu_gtkclient_new
+dbusmenu_gtkclient_menuitem_get
+dbusmenu_gtkclient_menuitem_get_submenu
+dbusmenu_gtkclient_newitem_base
+<SUBSECTION Standard>
+DBUSMENU_GTKCLIENT
+DBUSMENU_IS_GTKCLIENT
+dbusmenu_gtkclient_get_type
+DBUSMENU_GTKCLIENT_CLASS
+DBUSMENU_IS_GTKCLIENT_CLASS
+DBUSMENU_GTKCLIENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>menu</FILE>
+<TITLE>DbusmenuGtkMenu</TITLE>
+DBUSMENU_GTKMENU_TYPE
+DbusmenuGtkMenuClass
+dbusmenu_gtkmenu_new
+dbusmenu_gtkmenu_get_client
+<SUBSECTION Standard>
+DBUSMENU_GTKMENU
+DBUSMENU_IS_GTKMENU
+dbusmenu_gtkmenu_get_type
+DBUSMENU_GTKMENU_CLASS
+DBUSMENU_IS_GTKMENU_CLASS
+DBUSMENU_GTKMENU_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>menuitem</FILE>
+dbusmenu_menuitem_property_set_image
+dbusmenu_menuitem_property_get_image
+</SECTION>
+
+<SECTION>
+<FILE>genericmenuitem</FILE>
+<TITLE>Genericmenuitem</TITLE>
+GENERICMENUITEM_TYPE
+GENERICMENUITEM
+GENERICMENUITEM_CLASS
+IS_GENERICMENUITEM
+IS_GENERICMENUITEM_CLASS
+GENERICMENUITEM_GET_CLASS
+Genericmenuitem
+GenericmenuitemClass
+GenericmenuitemPrivate
+GenericmenuitemCheckType
+GenericmenuitemState
+genericmenuitem_get_type
+genericmenuitem_set_check_type
+genericmenuitem_set_state
+genericmenuitem_set_image
+genericmenuitem_get_image
+</SECTION>
+
diff --git a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk.types b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk.types
new file mode 100644
index 0000000..092dccd
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk.types
@@ -0,0 +1,3 @@
+dbusmenu_gtkclient_get_type
+dbusmenu_gtkmenu_get_type
+genericmenuitem_get_type
diff --git a/docs/libdbusmenu-gtk/reference/tmpl/client.sgml b/docs/libdbusmenu-gtk/reference/tmpl/client.sgml
new file mode 100644
index 0000000..6aedcc6
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/tmpl/client.sgml
@@ -0,0 +1,91 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuGtkClient
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUSMENU_GTKCLIENT_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DbusmenuGtkClientClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+@root_changed: 
+@reserved1: 
+@reserved2: 
+@reserved3: 
+@reserved4: 
+
+<!-- ##### FUNCTION dbusmenu_gtkclient_new ##### -->
+<para>
+
+</para>
+
+@dbus_name: 
+@dbus_object: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_gtkclient_menuitem_get ##### -->
+<para>
+
+</para>
+
+@client: 
+@item: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_gtkclient_menuitem_get_submenu ##### -->
+<para>
+
+</para>
+
+@client: 
+@item: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_gtkclient_newitem_base ##### -->
+<para>
+
+</para>
+
+@client: 
+@item: 
+@gmi: 
+@parent: 
+
+
diff --git a/docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml b/docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml
new file mode 100644
index 0000000..91b4673
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml
@@ -0,0 +1,153 @@
+<!-- ##### SECTION Title ##### -->
+Genericmenuitem
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO GENERICMENUITEM_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GENERICMENUITEM ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+
+<!-- ##### MACRO GENERICMENUITEM_CLASS ##### -->
+<para>
+
+</para>
+
+@klass: 
+
+
+<!-- ##### MACRO IS_GENERICMENUITEM ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+
+<!-- ##### MACRO IS_GENERICMENUITEM_CLASS ##### -->
+<para>
+
+</para>
+
+@klass: 
+
+
+<!-- ##### MACRO GENERICMENUITEM_GET_CLASS ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+
+<!-- ##### STRUCT Genericmenuitem ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GenericmenuitemClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+
+<!-- ##### STRUCT GenericmenuitemPrivate ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM GenericmenuitemCheckType ##### -->
+<para>
+
+</para>
+
+@GENERICMENUITEM_CHECK_TYPE_NONE: 
+@GENERICMENUITEM_CHECK_TYPE_CHECKBOX: 
+@GENERICMENUITEM_CHECK_TYPE_RADIO: 
+
+<!-- ##### ENUM GenericmenuitemState ##### -->
+<para>
+
+</para>
+
+@GENERICMENUITEM_STATE_UNCHECKED: 
+@GENERICMENUITEM_STATE_CHECKED: 
+@GENERICMENUITEM_STATE_INDETERMINATE: 
+
+<!-- ##### FUNCTION genericmenuitem_get_type ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION genericmenuitem_set_check_type ##### -->
+<para>
+
+</para>
+
+@item: 
+@check_type: 
+
+
+<!-- ##### FUNCTION genericmenuitem_set_state ##### -->
+<para>
+
+</para>
+
+@item: 
+@state: 
+
+
+<!-- ##### FUNCTION genericmenuitem_set_image ##### -->
+<para>
+
+</para>
+
+@item: 
+@image: 
+
+
+<!-- ##### FUNCTION genericmenuitem_get_image ##### -->
+<para>
+
+</para>
+
+@item: 
+@Returns: 
+
+
diff --git a/docs/libdbusmenu-gtk/reference/tmpl/libdbusmenu-gtk-unused.sgml b/docs/libdbusmenu-gtk/reference/tmpl/libdbusmenu-gtk-unused.sgml
new file mode 100644
index 0000000..e69de29
diff --git a/docs/libdbusmenu-gtk/reference/tmpl/menu.sgml b/docs/libdbusmenu-gtk/reference/tmpl/menu.sgml
new file mode 100644
index 0000000..a493a08
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/tmpl/menu.sgml
@@ -0,0 +1,61 @@
+<!-- ##### SECTION Title ##### -->
+DbusmenuGtkMenu
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUSMENU_GTKMENU_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DbusmenuGtkMenuClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+@reserved1: 
+@reserved2: 
+@reserved3: 
+@reserved4: 
+
+<!-- ##### FUNCTION dbusmenu_gtkmenu_new ##### -->
+<para>
+
+</para>
+
+@dbus_name: 
+@dbus_object: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_gtkmenu_get_client ##### -->
+<para>
+
+</para>
+
+@menu: 
+@Returns: 
+
+
diff --git a/docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml b/docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml
new file mode 100644
index 0000000..9325510
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml
@@ -0,0 +1,45 @@
+<!-- ##### SECTION Title ##### -->
+menuitem
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_set_image ##### -->
+<para>
+
+</para>
+
+@menuitem: 
+@property: 
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION dbusmenu_menuitem_property_get_image ##### -->
+<para>
+
+</para>
+
+@menuitem: 
+@property: 
+@Returns: 
+
+
diff --git a/docs/libdbusmenu-gtk/reference/version.xml b/docs/libdbusmenu-gtk/reference/version.xml
new file mode 100644
index 0000000..9e11b32
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/version.xml
@@ -0,0 +1 @@
+0.3.1
diff --git a/docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml b/docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml
new file mode 100644
index 0000000..8ec0fe4
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<indexdiv>
+</indexdiv>
diff --git a/docs/libdbusmenu-gtk/reference/xml/api-index-full.xml b/docs/libdbusmenu-gtk/reference/xml/api-index-full.xml
new file mode 100644
index 0000000..4f2e63d
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/xml/api-index-full.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<indexdiv>
+<indexdiv><title></title>
+<indexentry><primaryie linkends="GENERICMENUITEM:CAPS"><link linkend="GENERICMENUITEM:CAPS">GENERICMENUITEM</link>, macro in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="Genericmenuitem-struct"><link linkend="Genericmenuitem-struct">Genericmenuitem</link>, struct in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>C</title>
+<indexentry><primaryie linkends="GenericmenuitemCheckType"><link linkend="GenericmenuitemCheckType">GenericmenuitemCheckType</link>, enum in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="GENERICMENUITEM-CLASS:CAPS"><link linkend="GENERICMENUITEM-CLASS:CAPS">GENERICMENUITEM_CLASS</link>, macro in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="GenericmenuitemClass"><link linkend="GenericmenuitemClass">GenericmenuitemClass</link>, struct in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>D</title>
+<indexentry><primaryie linkends="DbusmenuGtkClientClass"><link linkend="DbusmenuGtkClientClass">DbusmenuGtkClientClass</link>, struct in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DbusmenuGtkMenuClass"><link linkend="DbusmenuGtkMenuClass">DbusmenuGtkMenuClass</link>, struct in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-gtkclient-menuitem-get"><link linkend="dbusmenu-gtkclient-menuitem-get">dbusmenu_gtkclient_menuitem_get</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-gtkclient-menuitem-get-submenu"><link linkend="dbusmenu-gtkclient-menuitem-get-submenu">dbusmenu_gtkclient_menuitem_get_submenu</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-gtkclient-new"><link linkend="dbusmenu-gtkclient-new">dbusmenu_gtkclient_new</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-gtkclient-newitem-base"><link linkend="dbusmenu-gtkclient-newitem-base">dbusmenu_gtkclient_newitem_base</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"><link linkend="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS">DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</link>, macro in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-GTKCLIENT-TYPE:CAPS"><link linkend="DBUSMENU-GTKCLIENT-TYPE:CAPS">DBUSMENU_GTKCLIENT_TYPE</link>, macro in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-gtkmenu-get-client"><link linkend="dbusmenu-gtkmenu-get-client">dbusmenu_gtkmenu_get_client</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-gtkmenu-new"><link linkend="dbusmenu-gtkmenu-new">dbusmenu_gtkmenu_new</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
+<indexentry><primaryie linkends="DBUSMENU-GTKMENU-TYPE:CAPS"><link linkend="DBUSMENU-GTKMENU-TYPE:CAPS">DBUSMENU_GTKMENU_TYPE</link>, macro in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-get-image"><link linkend="dbusmenu-menuitem-property-get-image">dbusmenu_menuitem_property_get_image</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-image"><link linkend="dbusmenu-menuitem-property-set-image">dbusmenu_menuitem_property_set_image</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>G</title>
+<indexentry><primaryie linkends="GENERICMENUITEM-GET-CLASS:CAPS"><link linkend="GENERICMENUITEM-GET-CLASS:CAPS">GENERICMENUITEM_GET_CLASS</link>, macro in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="genericmenuitem-get-image"><link linkend="genericmenuitem-get-image">genericmenuitem_get_image</link>, function in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="genericmenuitem-get-type"><link linkend="genericmenuitem-get-type">genericmenuitem_get_type</link>, function in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>I</title>
+<indexentry><primaryie linkends="IS-GENERICMENUITEM:CAPS"><link linkend="IS-GENERICMENUITEM:CAPS">IS_GENERICMENUITEM</link>, macro in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="IS-GENERICMENUITEM-CLASS:CAPS"><link linkend="IS-GENERICMENUITEM-CLASS:CAPS">IS_GENERICMENUITEM_CLASS</link>, macro in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>P</title>
+<indexentry><primaryie linkends="GenericmenuitemPrivate"><link linkend="GenericmenuitemPrivate">GenericmenuitemPrivate</link>, struct in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>S</title>
+<indexentry><primaryie linkends="genericmenuitem-set-check-type"><link linkend="genericmenuitem-set-check-type">genericmenuitem_set_check_type</link>, function in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="genericmenuitem-set-image"><link linkend="genericmenuitem-set-image">genericmenuitem_set_image</link>, function in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="genericmenuitem-set-state"><link linkend="genericmenuitem-set-state">genericmenuitem_set_state</link>, function in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+<indexentry><primaryie linkends="GenericmenuitemState"><link linkend="GenericmenuitemState">GenericmenuitemState</link>, enum in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>T</title>
+<indexentry><primaryie linkends="GENERICMENUITEM-TYPE:CAPS"><link linkend="GENERICMENUITEM-TYPE:CAPS">GENERICMENUITEM_TYPE</link>, macro in <link linkend="Genericmenuitem">Genericmenuitem</link></primaryie></indexentry>
+</indexdiv>
+</indexdiv>
diff --git a/docs/libdbusmenu-gtk/reference/xml/client.xml b/docs/libdbusmenu-gtk/reference/xml/client.xml
new file mode 100644
index 0000000..7519298
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/xml/client.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-gtk-DbusmenuGtkClient">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-gtk-DbusmenuGtkClient.top_of_page">DbusmenuGtkClient</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GTK Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuGtkClient</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="libdbusmenu-gtk-DbusmenuGtkClient.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="DBUSMENU-GTKCLIENT-TYPE:CAPS">DBUSMENU_GTKCLIENT_TYPE</link>
+#define             <link linkend="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS">DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</link>
+                    <link linkend="DbusmenuGtkClientClass">DbusmenuGtkClientClass</link>;
+<link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> * <link linkend="dbusmenu-gtkclient-new">dbusmenu_gtkclient_new</link>              (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
+                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);
+<link linkend="GtkMenuItem"><returnvalue>GtkMenuItem</returnvalue></link> *       <link linkend="dbusmenu-gtkclient-menuitem-get">dbusmenu_gtkclient_menuitem_get</link>     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);
+<link linkend="GtkMenu"><returnvalue>GtkMenu</returnvalue></link> *           <link linkend="dbusmenu-gtkclient-menuitem-get-submenu">dbusmenu_gtkclient_menuitem_get_submenu</link>
+                                                        (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-gtkclient-newitem-base">dbusmenu_gtkclient_newitem_base</link>     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> *gmi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-gtk-DbusmenuGtkClient.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-gtk-DbusmenuGtkClient.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUSMENU-GTKCLIENT-TYPE:CAPS" role="macro">
+<title>DBUSMENU_GTKCLIENT_TYPE</title>
+<indexterm zone="DBUSMENU-GTKCLIENT-TYPE:CAPS"><primary>DBUSMENU_GTKCLIENT_TYPE</primary></indexterm>
+<programlisting>#define DBUSMENU_GTKCLIENT_TYPE            (dbusmenu_gtkclient_get_type ())
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS" role="macro">
+<title>DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</title>
+<indexterm zone="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"><primary>DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</primary></indexterm>
+<programlisting>#define DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED  DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuGtkClientClass" role="struct">
+<title>DbusmenuGtkClientClass</title>
+<indexterm zone="DbusmenuGtkClientClass"><primary>DbusmenuGtkClientClass</primary></indexterm>
+<programlisting>typedef struct {
+	DbusmenuClientClass parent_class;
+
+	/* Signals */
+	void (*root_changed) (DbusmenuMenuitem * newroot);
+
+	/* Reserved */
+	void (*reserved1) (void);
+	void (*reserved2) (void);
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+} DbusmenuGtkClientClass;
+</programlisting>
+<variablelist role="struct">
+<varlistentry><term><link linkend="DbusmenuClientClass"><type>DbusmenuClientClass</type></link>&#160;<structfield id="DbusmenuGtkClientClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara><link linkend="GtkMenuClass"><type>GtkMenuClass</type></link>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkClientClass.root-changed">root_changed</structfield>&#160;()</term>
+<listitem><simpara>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved1">reserved1</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved2">reserved2</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved3">reserved3</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved4">reserved4</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-gtkclient-new" role="function">
+<title>dbusmenu_gtkclient_new ()</title>
+<indexterm zone="dbusmenu-gtkclient-new"><primary>dbusmenu_gtkclient_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> * dbusmenu_gtkclient_new              (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
+                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);</programlisting>
+<para>
+Creates a new <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> object and creates a <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link>
+	that connects across DBus to a <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>dbus_name</parameter>&#160;:</term>
+<listitem><simpara>Name of the <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> on DBus
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dbus_object</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A new <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> sync'd with a server
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-gtkclient-menuitem-get" role="function">
+<title>dbusmenu_gtkclient_menuitem_get ()</title>
+<indexterm zone="dbusmenu-gtkclient-menuitem-get"><primary>dbusmenu_gtkclient_menuitem_get</primary></indexterm>
+<programlisting><link linkend="GtkMenuItem"><returnvalue>GtkMenuItem</returnvalue></link> *       dbusmenu_gtkclient_menuitem_get     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);</programlisting>
+<para>
+This grabs the <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> that is associated with the
+	<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>A <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> with the item in it.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to get associated <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> that can be played with.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-gtkclient-menuitem-get-submenu" role="function">
+<title>dbusmenu_gtkclient_menuitem_get_submenu ()</title>
+<indexterm zone="dbusmenu-gtkclient-menuitem-get-submenu"><primary>dbusmenu_gtkclient_menuitem_get_submenu</primary></indexterm>
+<programlisting><link linkend="GtkMenu"><returnvalue>GtkMenu</returnvalue></link> *           dbusmenu_gtkclient_menuitem_get_submenu
+                                                        (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);</programlisting>
+<para>
+This grabs the submenu associated with the menuitem.
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>A <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> with the item in it.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to get associated <link linkend="GtkMenu"><type>GtkMenu</type></link> on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The <link linkend="GtkMenu"><type>GtkMenu</type></link> if there is one.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-gtkclient-newitem-base" role="function">
+<title>dbusmenu_gtkclient_newitem_base ()</title>
+<indexterm zone="dbusmenu-gtkclient-newitem-base"><primary>dbusmenu_gtkclient_newitem_base</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_gtkclient_newitem_base     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> *gmi</parameter>,
+                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);</programlisting>
+<para>
+This function provides some of the basic connectivity for being in
+	the GTK world.  Things like visibility and sensitivity of the item are
+	handled here so that the subclasses don't have to.  If you're building
+	your on GTK menu item you can use this function to apply those basic
+	attributes so that you don't have to deal with them either.
+</para>
+<para>
+	This also handles passing the "activate" signal back to the
+	<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> side of thing.
+</para><variablelist role="params">
+<varlistentry><term><parameter>client</parameter>&#160;:</term>
+<listitem><simpara>The client handling everything on this connection
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to attach the GTK-isms to
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>gmi</parameter>&#160;:</term>
+<listitem><simpara>A <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> representing the GTK world's view of this menuitem
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
+<listitem><simpara>The parent <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml b/docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml
new file mode 100644
index 0000000..1ecb04c
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="Genericmenuitem">
+<refmeta>
+<refentrytitle role="top_of_page" id="Genericmenuitem.top_of_page">Genericmenuitem</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GTK Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>Genericmenuitem</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="Genericmenuitem.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="GENERICMENUITEM-TYPE:CAPS">GENERICMENUITEM_TYPE</link>
+#define             <link linkend="GENERICMENUITEM:CAPS">GENERICMENUITEM</link>                     (obj)
+#define             <link linkend="GENERICMENUITEM-CLASS:CAPS">GENERICMENUITEM_CLASS</link>               (klass)
+#define             <link linkend="IS-GENERICMENUITEM:CAPS">IS_GENERICMENUITEM</link>                  (obj)
+#define             <link linkend="IS-GENERICMENUITEM-CLASS:CAPS">IS_GENERICMENUITEM_CLASS</link>            (klass)
+#define             <link linkend="GENERICMENUITEM-GET-CLASS:CAPS">GENERICMENUITEM_GET_CLASS</link>           (obj)
+                    <link linkend="Genericmenuitem-struct">Genericmenuitem</link>;
+                    <link linkend="GenericmenuitemClass">GenericmenuitemClass</link>;
+                    <link linkend="GenericmenuitemPrivate">GenericmenuitemPrivate</link>;
+enum                <link linkend="GenericmenuitemCheckType">GenericmenuitemCheckType</link>;
+enum                <link linkend="GenericmenuitemState">GenericmenuitemState</link>;
+<link linkend="GType"><returnvalue>GType</returnvalue></link>               <link linkend="genericmenuitem-get-type">genericmenuitem_get_type</link>            (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="genericmenuitem-set-check-type">genericmenuitem_set_check_type</link>      (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GenericmenuitemCheckType"><type>GenericmenuitemCheckType</type></link> check_type</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="genericmenuitem-set-state">genericmenuitem_set_state</link>           (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GenericmenuitemState"><type>GenericmenuitemState</type></link> state</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="genericmenuitem-set-image">genericmenuitem_set_image</link>           (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GtkWidget"><type>GtkWidget</type></link> *image</parameter>);
+<link linkend="GtkWidget"><returnvalue>GtkWidget</returnvalue></link> *         <link linkend="genericmenuitem-get-image">genericmenuitem_get_image</link>           (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>);
+</synopsis>
+</refsynopsisdiv>
+<refsect1 id="Genericmenuitem.object-hierarchy" role="object_hierarchy">
+<title role="object_hierarchy.title">Object Hierarchy</title>
+<synopsis>
+  <link linkend="GObject">GObject</link>
+   +----<link linkend="GInitiallyUnowned">GInitiallyUnowned</link>
+         +----<link linkend="GtkObject">GtkObject</link>
+               +----<link linkend="GtkWidget">GtkWidget</link>
+                     +----<link linkend="GtkContainer">GtkContainer</link>
+                           +----<link linkend="GtkBin">GtkBin</link>
+                                 +----<link linkend="GtkItem">GtkItem</link>
+                                       +----<link linkend="GtkMenuItem">GtkMenuItem</link>
+                                             +----<link linkend="GtkCheckMenuItem">GtkCheckMenuItem</link>
+                                                   +----Genericmenuitem
+</synopsis>
+</refsect1>
+<refsect1 id="Genericmenuitem.implemented-interfaces" role="impl_interfaces">
+<title role="impl_interfaces.title">Implemented Interfaces</title>
+<para>
+Genericmenuitem implements
+ <link linkend="AtkImplementorIface">AtkImplementorIface</link>,  <link linkend="GtkBuildable">GtkBuildable</link> and  <link linkend="GtkActivatable">GtkActivatable</link>.</para>
+</refsect1>
+
+<refsect1 id="Genericmenuitem.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="Genericmenuitem.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="GENERICMENUITEM-TYPE:CAPS" role="macro">
+<title>GENERICMENUITEM_TYPE</title>
+<indexterm zone="GENERICMENUITEM-TYPE:CAPS"><primary>GENERICMENUITEM_TYPE</primary></indexterm>
+<programlisting>#define GENERICMENUITEM_TYPE            (genericmenuitem_get_type ())
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="GENERICMENUITEM:CAPS" role="macro">
+<title>GENERICMENUITEM()</title>
+<indexterm zone="GENERICMENUITEM:CAPS"><primary>GENERICMENUITEM</primary></indexterm>
+<programlisting>#define GENERICMENUITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GENERICMENUITEM_TYPE, Genericmenuitem))
+</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>obj</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="GENERICMENUITEM-CLASS:CAPS" role="macro">
+<title>GENERICMENUITEM_CLASS()</title>
+<indexterm zone="GENERICMENUITEM-CLASS:CAPS"><primary>GENERICMENUITEM_CLASS</primary></indexterm>
+<programlisting>#define GENERICMENUITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GENERICMENUITEM_TYPE, GenericmenuitemClass))
+</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="IS-GENERICMENUITEM:CAPS" role="macro">
+<title>IS_GENERICMENUITEM()</title>
+<indexterm zone="IS-GENERICMENUITEM:CAPS"><primary>IS_GENERICMENUITEM</primary></indexterm>
+<programlisting>#define IS_GENERICMENUITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GENERICMENUITEM_TYPE))
+</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>obj</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="IS-GENERICMENUITEM-CLASS:CAPS" role="macro">
+<title>IS_GENERICMENUITEM_CLASS()</title>
+<indexterm zone="IS-GENERICMENUITEM-CLASS:CAPS"><primary>IS_GENERICMENUITEM_CLASS</primary></indexterm>
+<programlisting>#define IS_GENERICMENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GENERICMENUITEM_TYPE))
+</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="GENERICMENUITEM-GET-CLASS:CAPS" role="macro">
+<title>GENERICMENUITEM_GET_CLASS()</title>
+<indexterm zone="GENERICMENUITEM-GET-CLASS:CAPS"><primary>GENERICMENUITEM_GET_CLASS</primary></indexterm>
+<programlisting>#define GENERICMENUITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GENERICMENUITEM_TYPE, GenericmenuitemClass))
+</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>obj</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="Genericmenuitem-struct" role="struct">
+<title>Genericmenuitem</title>
+<indexterm zone="Genericmenuitem-struct"><primary>Genericmenuitem</primary></indexterm>
+<programlisting>typedef struct _Genericmenuitem Genericmenuitem;</programlisting>
+<variablelist role="struct">
+</variablelist></refsect2>
+<refsect2 id="GenericmenuitemClass" role="struct">
+<title>GenericmenuitemClass</title>
+<indexterm zone="GenericmenuitemClass"><primary>GenericmenuitemClass</primary></indexterm>
+<programlisting>typedef struct {
+	GtkCheckMenuItemClass parent_class;
+} GenericmenuitemClass;
+</programlisting>
+<variablelist role="struct">
+<varlistentry><term><link linkend="GtkCheckMenuItemClass"><type>GtkCheckMenuItemClass</type></link>&#160;<structfield id="GenericmenuitemClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara>Our parent <link linkend="GtkCheckMenuItemClass"><type>GtkCheckMenuItemClass</type></link>
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="GenericmenuitemPrivate" role="struct">
+<title>GenericmenuitemPrivate</title>
+<indexterm zone="GenericmenuitemPrivate"><primary>GenericmenuitemPrivate</primary></indexterm>
+<programlisting>typedef struct _GenericmenuitemPrivate GenericmenuitemPrivate;</programlisting>
+<variablelist role="struct">
+</variablelist></refsect2>
+<refsect2 id="GenericmenuitemCheckType" role="enum">
+<title>enum GenericmenuitemCheckType</title>
+<indexterm zone="GenericmenuitemCheckType"><primary>GenericmenuitemCheckType</primary></indexterm>
+<programlisting>enum GenericmenuitemCheckType {
+	GENERICMENUITEM_CHECK_TYPE_NONE,
+	GENERICMENUITEM_CHECK_TYPE_CHECKBOX,
+	GENERICMENUITEM_CHECK_TYPE_RADIO
+};
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="GenericmenuitemState" role="enum">
+<title>enum GenericmenuitemState</title>
+<indexterm zone="GenericmenuitemState"><primary>GenericmenuitemState</primary></indexterm>
+<programlisting>enum GenericmenuitemState {
+	GENERICMENUITEM_STATE_UNCHECKED,
+	GENERICMENUITEM_STATE_CHECKED,
+	GENERICMENUITEM_STATE_INDETERMINATE
+};
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="genericmenuitem-get-type" role="function">
+<title>genericmenuitem_get_type ()</title>
+<indexterm zone="genericmenuitem-get-type"><primary>genericmenuitem_get_type</primary></indexterm>
+<programlisting><link linkend="GType"><returnvalue>GType</returnvalue></link>               genericmenuitem_get_type            (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="genericmenuitem-set-check-type" role="function">
+<title>genericmenuitem_set_check_type ()</title>
+<indexterm zone="genericmenuitem-set-check-type"><primary>genericmenuitem_set_check_type</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                genericmenuitem_set_check_type      (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GenericmenuitemCheckType"><type>GenericmenuitemCheckType</type></link> check_type</parameter>);</programlisting>
+<para>
+This function changes the type of the checkmark that
+	appears in the left hand gutter for the menuitem.
+</para><variablelist role="params">
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> to set the type on
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>check_type</parameter>&#160;:</term>
+<listitem><simpara>Which type of check should be displayed
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="genericmenuitem-set-state" role="function">
+<title>genericmenuitem_set_state ()</title>
+<indexterm zone="genericmenuitem-set-state"><primary>genericmenuitem_set_state</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                genericmenuitem_set_state           (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GenericmenuitemState"><type>GenericmenuitemState</type></link> state</parameter>);</programlisting>
+<para>
+Sets the state of the check in the menu item.  It does
+	not require, but isn't really useful if the type of
+	check that the menuitem is set to <link linkend="GENERICMENUITEM-CHECK-TYPE-NONE:CAPS"><type>GENERICMENUITEM_CHECK_TYPE_NONE</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> to set the type on
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>state</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="genericmenuitem-set-image" role="function">
+<title>genericmenuitem_set_image ()</title>
+<indexterm zone="genericmenuitem-set-image"><primary>genericmenuitem_set_image</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                genericmenuitem_set_image           (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>,
+                                                         <parameter><link linkend="GtkWidget"><type>GtkWidget</type></link> *image</parameter>);</programlisting>
+<para>
+Sets the image of the menu item.
+</para><variablelist role="params">
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara>A <link linkend="Genericmenuitem"><type>Genericmenuitem</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>image</parameter>&#160;:</term>
+<listitem><simpara>The image to set as the image of <parameter>item</parameter>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="genericmenuitem-get-image" role="function">
+<title>genericmenuitem_get_image ()</title>
+<indexterm zone="genericmenuitem-get-image"><primary>genericmenuitem_get_image</primary></indexterm>
+<programlisting><link linkend="GtkWidget"><returnvalue>GtkWidget</returnvalue></link> *         genericmenuitem_get_image           (<parameter><link linkend="Genericmenuitem"><type>Genericmenuitem</type></link> *item</parameter>);</programlisting>
+<para>
+Returns the image if there is one.
+</para><variablelist role="params">
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
+<listitem><simpara>A <link linkend="Genericmenuitem"><type>Genericmenuitem</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A pointer to the image of the item or <link linkend="NULL:CAPS"><type>NULL</type></link>
+		if there isn't one.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-gtk/reference/xml/menu.xml b/docs/libdbusmenu-gtk/reference/xml/menu.xml
new file mode 100644
index 0000000..5074b52
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/xml/menu.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-gtk-DbusmenuGtkMenu">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-gtk-DbusmenuGtkMenu.top_of_page">DbusmenuGtkMenu</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GTK Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>DbusmenuGtkMenu</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="libdbusmenu-gtk-DbusmenuGtkMenu.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>#define             <link linkend="DBUSMENU-GTKMENU-TYPE:CAPS">DBUSMENU_GTKMENU_TYPE</link>
+                    <link linkend="DbusmenuGtkMenuClass">DbusmenuGtkMenuClass</link>;
+<link linkend="DbusmenuGtkMenu"><returnvalue>DbusmenuGtkMenu</returnvalue></link> *   <link linkend="dbusmenu-gtkmenu-new">dbusmenu_gtkmenu_new</link>                (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
+                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);
+<link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> * <link linkend="dbusmenu-gtkmenu-get-client">dbusmenu_gtkmenu_get_client</link>         (<parameter><link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> *menu</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-gtk-DbusmenuGtkMenu.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-gtk-DbusmenuGtkMenu.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="DBUSMENU-GTKMENU-TYPE:CAPS" role="macro">
+<title>DBUSMENU_GTKMENU_TYPE</title>
+<indexterm zone="DBUSMENU-GTKMENU-TYPE:CAPS"><primary>DBUSMENU_GTKMENU_TYPE</primary></indexterm>
+<programlisting>#define DBUSMENU_GTKMENU_TYPE            (dbusmenu_gtkmenu_get_type ())
+</programlisting>
+<para>
+</para></refsect2>
+<refsect2 id="DbusmenuGtkMenuClass" role="struct">
+<title>DbusmenuGtkMenuClass</title>
+<indexterm zone="DbusmenuGtkMenuClass"><primary>DbusmenuGtkMenuClass</primary></indexterm>
+<programlisting>typedef struct {
+	GtkMenuClass parent_class;
+
+	/* Reserved */
+	void (*reserved1) (void);
+	void (*reserved2) (void);
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+} DbusmenuGtkMenuClass;
+</programlisting>
+<variablelist role="struct">
+<varlistentry><term><link linkend="GtkMenuClass"><type>GtkMenuClass</type></link>&#160;<structfield id="DbusmenuGtkMenuClass.parent-class">parent_class</structfield>;</term>
+<listitem><simpara><link linkend="GtkMenuClass"><type>GtkMenuClass</type></link>
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved1">reserved1</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved2">reserved2</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved3">reserved3</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved4">reserved4</structfield>&#160;()</term>
+<listitem><simpara>Reserved for future use.
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-gtkmenu-new" role="function">
+<title>dbusmenu_gtkmenu_new ()</title>
+<indexterm zone="dbusmenu-gtkmenu-new"><primary>dbusmenu_gtkmenu_new</primary></indexterm>
+<programlisting><link linkend="DbusmenuGtkMenu"><returnvalue>DbusmenuGtkMenu</returnvalue></link> *   dbusmenu_gtkmenu_new                (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
+                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);</programlisting>
+<para>
+Creates a new <link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> object and creates a <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link>
+	that connects across DBus to a <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>dbus_name</parameter>&#160;:</term>
+<listitem><simpara>Name of the <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> on DBus
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dbus_object</parameter>&#160;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A new <link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> sync'd with a server
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-gtkmenu-get-client" role="function">
+<title>dbusmenu_gtkmenu_get_client ()</title>
+<indexterm zone="dbusmenu-gtkmenu-get-client"><primary>dbusmenu_gtkmenu_get_client</primary></indexterm>
+<programlisting><link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> * dbusmenu_gtkmenu_get_client         (<parameter><link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> *menu</parameter>);</programlisting>
+<para>
+An accessor for the client that this menu is using to
+	communicate with the server.
+</para><variablelist role="params">
+<varlistentry><term><parameter>menu</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> to get the client from
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A valid <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> or NULL on error.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/libdbusmenu-gtk/reference/xml/menuitem.xml b/docs/libdbusmenu-gtk/reference/xml/menuitem.xml
new file mode 100644
index 0000000..b9bd4b6
--- /dev/null
+++ b/docs/libdbusmenu-gtk/reference/xml/menuitem.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<refentry id="libdbusmenu-gtk-menuitem">
+<refmeta>
+<refentrytitle role="top_of_page" id="libdbusmenu-gtk-menuitem.top_of_page">menuitem</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>
+  LIBDBUSMENU-GTK Library
+</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>menuitem</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="libdbusmenu-gtk-menuitem.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-image">dbusmenu_menuitem_property_set_image</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="GdkPixbuf"><type>GdkPixbuf</type></link> *data</parameter>);
+<link linkend="GdkPixbuf"><returnvalue>GdkPixbuf</returnvalue></link> *         <link linkend="dbusmenu-menuitem-property-get-image">dbusmenu_menuitem_property_get_image</link>
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
+</synopsis>
+</refsynopsisdiv>
+
+<refsect1 id="libdbusmenu-gtk-menuitem.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+</para>
+</refsect1>
+<refsect1 id="libdbusmenu-gtk-menuitem.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="dbusmenu-menuitem-property-set-image" role="function">
+<title>dbusmenu_menuitem_property_set_image ()</title>
+<indexterm zone="dbusmenu-menuitem-property-set-image"><primary>dbusmenu_menuitem_property_set_image</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_image
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
+                                                         <parameter>const <link linkend="GdkPixbuf"><type>GdkPixbuf</type></link> *data</parameter>);</programlisting>
+<para>
+This function takes the pixbuf that is stored in <parameter>data</parameter> and
+	turns it into a base64 encoded PNG so that it can be placed
+	onto a standard <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> property.
+</para><variablelist role="params">
+<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>Name of the property to set.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>The image to place on the property.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the function was able to set the property
+		or not.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="dbusmenu-menuitem-property-get-image" role="function">
+<title>dbusmenu_menuitem_property_get_image ()</title>
+<indexterm zone="dbusmenu-menuitem-property-get-image"><primary>dbusmenu_menuitem_property_get_image</primary></indexterm>
+<programlisting><link linkend="GdkPixbuf"><returnvalue>GdkPixbuf</returnvalue></link> *         dbusmenu_menuitem_property_get_image
+                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
+<para>
+This function looks on the menu item for a property by the
+	name of <parameter>property</parameter>.  If one exists it tries to turn it into
+	a <link linkend="GdkPixbuf"><type>GdkPixbuf</type></link>.  It assumes that the property is a base64 encoded
+	PNG file like the one created by <link linkend="dbusmenu-menuite-property-set-image"><type>dbusmenu_menuite_property_set_image</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="DbusmenuMenuite"><type>DbusmenuMenuite</type></link> to look for the property on
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property</parameter>&#160;:</term>
+<listitem><simpara>The name of the property to look for.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A pixbuf or <link linkend="NULL:CAPS"><type>NULL</type></link> to signal error.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+
+</refsect1>
+
+</refentry>
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index 94d607f..6af876c 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -43,7 +43,12 @@ subdir = libdbusmenu-glib
 DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -152,6 +157,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -164,6 +171,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -205,6 +217,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index f64ef95..c466ed2 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -43,7 +43,12 @@ subdir = libdbusmenu-gtk
 DIST_COMMON = $(libdbusmenu_gtkinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -149,6 +154,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -161,6 +168,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -202,6 +214,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
new file mode 100644
index 0000000..2cfa1e7
--- /dev/null
+++ b/m4/gtk-doc.m4
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+  dnl check for tools we added during development
+  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH([html-dir],
+    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST([HTML_DIR])
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE([gtk-doc],
+    AS_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [[default=no]]]),,
+    [enable_gtk_doc=no])
+
+  if test x$enable_gtk_doc = xyes; then
+    ifelse([$1],[],
+      [PKG_CHECK_EXISTS([gtk-doc],,
+                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+  fi
+
+  AC_MSG_CHECKING([whether to build gtk-doc documentation])
+  AC_MSG_RESULT($enable_gtk_doc)
+
+  dnl enable/disable output formats
+  AC_ARG_ENABLE([gtk-doc-html],
+    AS_HELP_STRING([--enable-gtk-doc-html],
+                   [build documentation in html format [[default=yes]]]),,
+    [enable_gtk_doc_html=yes])
+    AC_ARG_ENABLE([gtk-doc-pdf],
+      AS_HELP_STRING([--enable-gtk-doc-pdf],
+                     [build documentation in pdf format [[default=no]]]),,
+      [enable_gtk_doc_pdf=no])
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
+
+
+  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 36803b9..3a29bca 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -50,7 +50,8 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -297,6 +298,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -309,6 +312,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -350,6 +358,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index e3a87aa..eaf7052 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -40,7 +40,8 @@ libexec_PROGRAMS = dbusmenu-dumper$(EXEEXT)
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -185,6 +186,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -197,6 +200,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -238,6 +246,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in
index 2b17ca3..51fb71b 100644
--- a/tools/testapp/Makefile.in
+++ b/tools/testapp/Makefile.in
@@ -38,7 +38,8 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT)
 subdir = tools/testapp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -122,6 +123,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -134,6 +137,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -175,6 +183,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
-- 
cgit v1.2.3


From 17450574de877f299e8d58fe4fb316f70bcc17f3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Jun 2010 15:13:04 -0500
Subject: releasing version 0.3.1-0ubuntu1~ppa2

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 75683ee..c12f513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ libdbusmenu (0.3.1-0ubuntu1~ppa2) lucid; urgency=low
     * gtk-doc support
   * Autogen and adding new Makefiles
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 09 Jun 2010 15:08:22 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 09 Jun 2010 15:13:00 -0500
 
 libdbusmenu (0.3.1-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 59506468e39b3422d1c5c19ac2b5924c6e4c77d2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 08:32:08 -0500
Subject: Autogen update

---
 debian/changelog  |   3 +-
 tests/Makefile.in | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d21e7c..9bcc465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libdbusmenu (0.3.1-0ubuntu2~ppa1) UNRELEASED; urgency=low
   * Upstream Merge
     * Set the 'child-display' property on menuitems that
       have child menuitems.
+  * Autogen update
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Jun 2010 08:30:33 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Jun 2010 08:31:59 -0500
 
 libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3a29bca..776ce4a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -35,8 +35,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 TESTS = test-glib-objects-test test-glib-layout test-glib-properties \
-	test-glib-proxy test-glib-simple-items$(EXEEXT) test-gtk-label \
-	test-gtk-reorder
+	test-glib-proxy test-glib-simple-items$(EXEEXT) \
+	test-glib-submenu test-gtk-label test-gtk-reorder
 check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 	test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \
 	test-glib-layout-server$(EXEEXT) \
@@ -44,6 +44,8 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 	test-glib-properties-server$(EXEEXT) \
 	test-glib-proxy-client$(EXEEXT) \
 	test-glib-proxy-server$(EXEEXT) test-glib-proxy-proxy$(EXEEXT) \
+	test-glib-submenu-client$(EXEEXT) \
+	test-glib-submenu-server$(EXEEXT) \
 	test-gtk-label-client$(EXEEXT) test-gtk-label-server$(EXEEXT) \
 	test-glib-simple-items$(EXEEXT) \
 	test-gtk-reorder-server$(EXEEXT)
@@ -158,6 +160,26 @@ test_glib_simple_items_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_glib_simple_items_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_test_glib_submenu_client_OBJECTS =  \
+	test_glib_submenu_client-test-glib-submenu-client.$(OBJEXT)
+test_glib_submenu_client_OBJECTS =  \
+	$(am_test_glib_submenu_client_OBJECTS)
+test_glib_submenu_client_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+test_glib_submenu_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_glib_submenu_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_glib_submenu_server_OBJECTS =  \
+	test_glib_submenu_server-test-glib-submenu-server.$(OBJEXT)
+test_glib_submenu_server_OBJECTS =  \
+	$(am_test_glib_submenu_server_OBJECTS)
+test_glib_submenu_server_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+test_glib_submenu_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_glib_submenu_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_test_gtk_label_client_OBJECTS =  \
 	test_gtk_label_client-test-gtk-label-client.$(OBJEXT)
 test_gtk_label_client_OBJECTS = $(am_test_gtk_label_client_OBJECTS)
@@ -228,6 +250,8 @@ SOURCES = $(glib_server_nomenu_SOURCES) \
 	$(test_glib_proxy_proxy_SOURCES) \
 	$(test_glib_proxy_server_SOURCES) \
 	$(test_glib_simple_items_SOURCES) \
+	$(test_glib_submenu_client_SOURCES) \
+	$(test_glib_submenu_server_SOURCES) \
 	$(test_gtk_label_client_SOURCES) \
 	$(test_gtk_label_server_SOURCES) \
 	$(test_gtk_reorder_server_SOURCES)
@@ -241,6 +265,8 @@ DIST_SOURCES = $(glib_server_nomenu_SOURCES) \
 	$(test_glib_proxy_proxy_SOURCES) \
 	$(test_glib_proxy_server_SOURCES) \
 	$(test_glib_simple_items_SOURCES) \
+	$(test_glib_submenu_client_SOURCES) \
+	$(test_glib_submenu_server_SOURCES) \
 	$(test_gtk_label_client_SOURCES) \
 	$(test_gtk_label_server_SOURCES) \
 	$(test_gtk_reorder_server_SOURCES)
@@ -476,6 +502,30 @@ test_glib_layout_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+test_glib_submenu_server_SOURCES = \
+	test-glib-submenu.h \
+	test-glib-submenu-server.c
+
+test_glib_submenu_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
+test_glib_submenu_client_SOURCES = \
+	test-glib-submenu.h \
+	test-glib-submenu-client.c
+
+test_glib_submenu_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
 
 ######################
 # Test Glib Object
@@ -728,6 +778,12 @@ test-glib-proxy-server$(EXEEXT): $(test_glib_proxy_server_OBJECTS) $(test_glib_p
 test-glib-simple-items$(EXEEXT): $(test_glib_simple_items_OBJECTS) $(test_glib_simple_items_DEPENDENCIES) 
 	@rm -f test-glib-simple-items$(EXEEXT)
 	$(AM_V_CCLD)$(test_glib_simple_items_LINK) $(test_glib_simple_items_OBJECTS) $(test_glib_simple_items_LDADD) $(LIBS)
+test-glib-submenu-client$(EXEEXT): $(test_glib_submenu_client_OBJECTS) $(test_glib_submenu_client_DEPENDENCIES) 
+	@rm -f test-glib-submenu-client$(EXEEXT)
+	$(AM_V_CCLD)$(test_glib_submenu_client_LINK) $(test_glib_submenu_client_OBJECTS) $(test_glib_submenu_client_LDADD) $(LIBS)
+test-glib-submenu-server$(EXEEXT): $(test_glib_submenu_server_OBJECTS) $(test_glib_submenu_server_DEPENDENCIES) 
+	@rm -f test-glib-submenu-server$(EXEEXT)
+	$(AM_V_CCLD)$(test_glib_submenu_server_LINK) $(test_glib_submenu_server_OBJECTS) $(test_glib_submenu_server_LDADD) $(LIBS)
 test-gtk-label-client$(EXEEXT): $(test_gtk_label_client_OBJECTS) $(test_gtk_label_client_DEPENDENCIES) 
 	@rm -f test-gtk-label-client$(EXEEXT)
 	$(AM_V_CCLD)$(test_gtk_label_client_LINK) $(test_gtk_label_client_OBJECTS) $(test_gtk_label_client_LDADD) $(LIBS)
@@ -754,6 +810,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_proxy_proxy-test-glib-proxy-proxy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_proxy_server-test-glib-proxy-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_simple_items-test-glib-simple-items.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_label_server-test-gtk-label-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@
@@ -942,6 +1000,38 @@ test_glib_simple_items-test-glib-simple-items.obj: test-glib-simple-items.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_simple_items_CFLAGS) $(CFLAGS) -c -o test_glib_simple_items-test-glib-simple-items.obj `if test -f 'test-glib-simple-items.c'; then $(CYGPATH_W) 'test-glib-simple-items.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-simple-items.c'; fi`
 
+test_glib_submenu_client-test-glib-submenu-client.o: test-glib-submenu-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -MT test_glib_submenu_client-test-glib-submenu-client.o -MD -MP -MF $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo -c -o test_glib_submenu_client-test-glib-submenu-client.o `test -f 'test-glib-submenu-client.c' || echo '$(srcdir)/'`test-glib-submenu-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-client.c' object='test_glib_submenu_client-test-glib-submenu-client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_client-test-glib-submenu-client.o `test -f 'test-glib-submenu-client.c' || echo '$(srcdir)/'`test-glib-submenu-client.c
+
+test_glib_submenu_client-test-glib-submenu-client.obj: test-glib-submenu-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -MT test_glib_submenu_client-test-glib-submenu-client.obj -MD -MP -MF $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo -c -o test_glib_submenu_client-test-glib-submenu-client.obj `if test -f 'test-glib-submenu-client.c'; then $(CYGPATH_W) 'test-glib-submenu-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-client.c' object='test_glib_submenu_client-test-glib-submenu-client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_client-test-glib-submenu-client.obj `if test -f 'test-glib-submenu-client.c'; then $(CYGPATH_W) 'test-glib-submenu-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-client.c'; fi`
+
+test_glib_submenu_server-test-glib-submenu-server.o: test-glib-submenu-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -MT test_glib_submenu_server-test-glib-submenu-server.o -MD -MP -MF $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo -c -o test_glib_submenu_server-test-glib-submenu-server.o `test -f 'test-glib-submenu-server.c' || echo '$(srcdir)/'`test-glib-submenu-server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-server.c' object='test_glib_submenu_server-test-glib-submenu-server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_server-test-glib-submenu-server.o `test -f 'test-glib-submenu-server.c' || echo '$(srcdir)/'`test-glib-submenu-server.c
+
+test_glib_submenu_server-test-glib-submenu-server.obj: test-glib-submenu-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -MT test_glib_submenu_server-test-glib-submenu-server.obj -MD -MP -MF $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo -c -o test_glib_submenu_server-test-glib-submenu-server.obj `if test -f 'test-glib-submenu-server.c'; then $(CYGPATH_W) 'test-glib-submenu-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-server.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-server.c' object='test_glib_submenu_server-test-glib-submenu-server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_server-test-glib-submenu-server.obj `if test -f 'test-glib-submenu-server.c'; then $(CYGPATH_W) 'test-glib-submenu-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-server.c'; fi`
+
 test_gtk_label_client-test-gtk-label-client.o: test-gtk-label-client.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_label_client_CFLAGS) $(CFLAGS) -MT test_gtk_label_client-test-gtk-label-client.o -MD -MP -MF $(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Tpo -c -o test_gtk_label_client-test-gtk-label-client.o `test -f 'test-gtk-label-client.c' || echo '$(srcdir)/'`test-gtk-label-client.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Tpo $(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Po
@@ -1344,6 +1434,15 @@ test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
+######################
+# Test Glib Submenu
+######################
+
+test-glib-submenu: test-glib-submenu-client test-glib-submenu-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
 test-glib-objects-test: test-glib-objects Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
-- 
cgit v1.2.3


From e52db8e2ed8f8d270a6b7ca9cf112393186d78ae Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 08:33:33 -0500
Subject: releasing version 0.3.1-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bcc465..0bc00f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.1-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.1-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Set the 'child-display' property on menuitems that
       have child menuitems.
   * Autogen update
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Jun 2010 08:31:59 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Jun 2010 08:33:30 -0500
 
 libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From c4f60378cd36a80b5206ecbe41013544978890b5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 12:36:23 -0500
Subject: Trying to delete some files that aren't in the tarball

---
 .../reference/html/DbusmenuClientMenuitem.html     |  122 --
 .../reference/html/DbusmenuMenuitem.html           | 1688 --------------------
 .../reference/html/DbusmenuMenuitemProxy.html      |  160 --
 .../html/libdbusmenu-glib-dbusmenu-client.html     | 1001 ------------
 .../html/libdbusmenu-glib-dbusmenu-server.html     |  672 --------
 .../reference/libdbusmenu-glib-sections.txt.moved  |  208 ---
 .../reference/libdbusmenu-glib.types               |    5 -
 .../reference/tmpl/dbusmenu-client.sgml            |  285 ----
 .../reference/tmpl/dbusmenu-server.sgml            |  246 ---
 .../reference/xml/dbusmenu-client.xml              |  657 --------
 .../reference/xml/dbusmenu-server.xml              |  462 ------
 m4/gtk-doc.m4                                      |   61 -
 12 files changed, 5567 deletions(-)
 delete mode 100644 docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html
 delete mode 100644 docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html
 delete mode 100644 docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html
 delete mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html
 delete mode 100644 docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html
 delete mode 100644 docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt.moved
 delete mode 100644 docs/libdbusmenu-glib/reference/libdbusmenu-glib.types
 delete mode 100644 docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml
 delete mode 100644 docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml
 delete mode 100644 docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml
 delete mode 100644 docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml
 delete mode 100644 m4/gtk-doc.m4

diff --git a/docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html b/docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html
deleted file mode 100644
index 2e42bce..0000000
--- a/docs/libdbusmenu-glib/reference/html/DbusmenuClientMenuitem.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DbusmenuClientMenuitem</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
-<link rel="up" href="ch01.html" title="API">
-<link rel="prev" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">
-<link rel="next" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libdbusmenu-glib-DbusmenuClient.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
-<td><a accesskey="n" href="libdbusmenu-glib-dbusmenu-client.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#DbusmenuClientMenuitem.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#DbusmenuClientMenuitem.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#DbusmenuClientMenuitem.object-hierarchy" class="shortcut">Object Hierarchy</a>
-</td></tr>
-</table>
-<div class="refentry" title="DbusmenuClientMenuitem">
-<a name="DbusmenuClientMenuitem"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="DbusmenuClientMenuitem.top_of_page"></a>DbusmenuClientMenuitem</span></h2>
-<p>DbusmenuClientMenuitem</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="DbusmenuClientMenuitem.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="DbusmenuClientMenuitem.html#DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS" title="DBUSMENU_CLIENT_MENUITEM_TYPE">DBUSMENU_CLIENT_MENUITEM_TYPE</a>
-                    <a class="link" href="DbusmenuClientMenuitem.html#DbusmenuClientMenuitem-struct" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>;
-                    <a class="link" href="DbusmenuClientMenuitem.html#DbusmenuClientMenuitemClass" title="DbusmenuClientMenuitemClass">DbusmenuClientMenuitemClass</a>;
-<a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem"><span class="returnvalue">DbusmenuClientMenuitem</span></a> * <a class="link" href="DbusmenuClientMenuitem.html#dbusmenu-client-menuitem-new" title="dbusmenu_client_menuitem_new ()">dbusmenu_client_menuitem_new</a>   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
-                                                         <em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="DbusmenuClientMenuitem.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
-         +----DbusmenuClientMenuitem
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="DbusmenuClientMenuitem.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="DbusmenuClientMenuitem.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBUSMENU_CLIENT_MENUITEM_TYPE">
-<a name="DBUSMENU-CLIENT-MENUITEM-TYPE:CAPS"></a><h3>DBUSMENU_CLIENT_MENUITEM_TYPE</h3>
-<pre class="programlisting">#define DBUSMENU_CLIENT_MENUITEM_TYPE            (dbusmenu_client_menuitem_get_type ())
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DbusmenuClientMenuitem">
-<a name="DbusmenuClientMenuitem-struct"></a><h3>DbusmenuClientMenuitem</h3>
-<pre class="programlisting">typedef struct _DbusmenuClientMenuitem DbusmenuClientMenuitem;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DbusmenuClientMenuitemClass">
-<a name="DbusmenuClientMenuitemClass"></a><h3>DbusmenuClientMenuitemClass</h3>
-<pre class="programlisting">typedef struct {
-	DbusmenuMenuitemClass parent_class;
-} DbusmenuClientMenuitemClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_client_menuitem_new ()">
-<a name="dbusmenu-client-menuitem-new"></a><h3>dbusmenu_client_menuitem_new ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem"><span class="returnvalue">DbusmenuClientMenuitem</span></a> * dbusmenu_client_menuitem_new   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>,
-                                                         <em class="parameter"><code><span class="type">DbusmenuClient</span> *client</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.14</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html b/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html
deleted file mode 100644
index c5b7452..0000000
--- a/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitem.html
+++ /dev/null
@@ -1,1688 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DbusmenuMenuitem</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
-<link rel="up" href="ch01.html" title="API">
-<link rel="prev" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">
-<link rel="next" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="DbusmenuMenuitemProxy.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
-<td><a accesskey="n" href="libdbusmenu-glib-DbusmenuClient.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#DbusmenuMenuitem.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#DbusmenuMenuitem.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#DbusmenuMenuitem.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#DbusmenuMenuitem.properties" class="shortcut">Properties</a>
-                   | 
-                  <a href="#DbusmenuMenuitem.signals" class="shortcut">Signals</a>
-</td></tr>
-</table>
-<div class="refentry" title="DbusmenuMenuitem">
-<a name="DbusmenuMenuitem"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="DbusmenuMenuitem.top_of_page"></a>DbusmenuMenuitem</span></h2>
-<p>DbusmenuMenuitem — A lowlevel represenation of a menuitem</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="DbusmenuMenuitem.stability-level"></a><h2>Stability Level</h2>
-Unstable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="DbusmenuMenuitem.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libdbusmenu-glib/menuitem.h&gt;
-
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED">DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED">DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED">DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED">DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED">DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED">DBUSMENU_MENUITEM_SIGNAL_REALIZED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID">DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TYPE:CAPS" title="DBUSMENU_MENUITEM_PROP_TYPE">DBUSMENU_MENUITEM_PROP_TYPE</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS" title="DBUSMENU_MENUITEM_PROP_VISIBLE">DBUSMENU_MENUITEM_PROP_VISIBLE</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ENABLED:CAPS" title="DBUSMENU_MENUITEM_PROP_ENABLED">DBUSMENU_MENUITEM_PROP_ENABLED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-LABEL:CAPS" title="DBUSMENU_MENUITEM_PROP_LABEL">DBUSMENU_MENUITEM_PROP_LABEL</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS" title="DBUSMENU_MENUITEM_PROP_ICON_NAME">DBUSMENU_MENUITEM_PROP_ICON_NAME</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS" title="DBUSMENU_MENUITEM_PROP_ICON_DATA">DBUSMENU_MENUITEM_PROP_ICON_DATA</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS" title="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE">DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS" title="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE">DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_CHECK">DBUSMENU_MENUITEM_TOGGLE_CHECK</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_RADIO">DBUSMENU_MENUITEM_TOGGLE_RADIO</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED">DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED">DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN">DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</a>
-#define             <a class="link" href="DbusmenuMenuitem.html#DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS" title="DBUSMENU_MENUITEM_ICON_NAME_BLANK">DBUSMENU_MENUITEM_ICON_NAME_BLANK</a>
-                    <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-struct" title="DbusmenuMenuitem">DbusmenuMenuitem</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()">*dbusmenu_menuitem_about_to_show_cb</a>)
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t" title="dbusmenu_menuitem_buildxml_slot_t ()">*dbusmenu_menuitem_buildxml_slot_t</a>)
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *stringarray</code></em>);
-                    <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitemClass" title="DbusmenuMenuitemClass">DbusmenuMenuitemClass</a>;
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-new" title="dbusmenu_menuitem_new ()">dbusmenu_menuitem_new</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-new-with-id" title="dbusmenu_menuitem_new_with_id ()">dbusmenu_menuitem_new_with_id</a>       (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-id" title="dbusmenu_menuitem_get_id ()">dbusmenu_menuitem_get_id</a>            (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-children" title="dbusmenu_menuitem_get_children ()">dbusmenu_menuitem_get_children</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-take-children" title="dbusmenu_menuitem_take_children ()">dbusmenu_menuitem_take_children</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position" title="dbusmenu_menuitem_get_position ()">dbusmenu_menuitem_get_position</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position-realized" title="dbusmenu_menuitem_get_position_realized ()">dbusmenu_menuitem_get_position_realized</a>
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-append" title="dbusmenu_menuitem_child_append ()">dbusmenu_menuitem_child_append</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-prepend" title="dbusmenu_menuitem_child_prepend ()">dbusmenu_menuitem_child_prepend</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-delete" title="dbusmenu_menuitem_child_delete ()">dbusmenu_menuitem_child_delete</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-add-position" title="dbusmenu_menuitem_child_add_position ()">dbusmenu_menuitem_child_add_position</a>
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-reorder" title="dbusmenu_menuitem_child_reorder ()">dbusmenu_menuitem_child_reorder</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-child-find" title="dbusmenu_menuitem_child_find ()">dbusmenu_menuitem_child_find</a>        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-find-id" title="dbusmenu_menuitem_find_id ()">dbusmenu_menuitem_find_id</a>           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set" title="dbusmenu_menuitem_property_set ()">dbusmenu_menuitem_property_set</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-value" title="dbusmenu_menuitem_property_set_value ()">dbusmenu_menuitem_property_set_value</a>
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-bool" title="dbusmenu_menuitem_property_set_bool ()">dbusmenu_menuitem_property_set_bool</a> (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-set-int" title="dbusmenu_menuitem_property_set_int ()">dbusmenu_menuitem_property_set_int</a>  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> value</code></em>);
-const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get" title="dbusmenu_menuitem_property_get ()">dbusmenu_menuitem_property_get</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
-const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="returnvalue">GValue</span></a> *      <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-value" title="dbusmenu_menuitem_property_get_value ()">dbusmenu_menuitem_property_get_value</a>
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-bool" title="dbusmenu_menuitem_property_get_bool ()">dbusmenu_menuitem_property_get_bool</a> (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-get-int" title="dbusmenu_menuitem_property_get_int ()">dbusmenu_menuitem_property_get_int</a>  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-exist" title="dbusmenu_menuitem_property_exist ()">dbusmenu_menuitem_property_exist</a>    (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-list" title="dbusmenu_menuitem_properties_list ()">dbusmenu_menuitem_properties_list</a>   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-properties-copy" title="dbusmenu_menuitem_properties_copy ()">dbusmenu_menuitem_properties_copy</a>   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-property-remove" title="dbusmenu_menuitem_property_remove ()">dbusmenu_menuitem_property_remove</a>   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-set-root" title="dbusmenu_menuitem_set_root ()">dbusmenu_menuitem_set_root</a>          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> root</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-root" title="dbusmenu_menuitem_get_root ()">dbusmenu_menuitem_get_root</a>          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-foreach" title="dbusmenu_menuitem_foreach ()">dbusmenu_menuitem_foreach</a>           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><span class="type">void</span> (funcDbusmenuMenuitem * mi, gpointer data) ()</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event" title="dbusmenu_menuitem_handle_event ()">dbusmenu_menuitem_handle_event</a>      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timestamp</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-send-about-to-show" title="dbusmenu_menuitem_send_about_to_show ()">dbusmenu_menuitem_send_about_to_show</a>
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()"><span class="type">dbusmenu_menuitem_about_to_show_cb</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> cb_data</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="DbusmenuMenuitem.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----DbusmenuMenuitem
-         +----<a class="link" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">DbusmenuClientMenuitem</a>
-         +----<a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>
-</pre>
-</div>
-<div class="refsect1" title="Properties">
-<a name="DbusmenuMenuitem.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem--id" title='The "id" property'>id</a>"                       <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct Only
-</pre>
-</div>
-<div class="refsect1" title="Signals">
-<a name="DbusmenuMenuitem.signals"></a><h2>Signals</h2>
-<pre class="synopsis">
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added" title='The "child-added" signal'>child-added</a>"                                    : Run Last
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved" title='The "child-moved" signal'>child-moved</a>"                                    : Run Last
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed" title='The "child-removed" signal'>child-removed</a>"                                  : Run Last
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated" title='The "item-activated" signal'>item-activated</a>"                                 : Run Last
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed" title='The "property-changed" signal'>property-changed</a>"                               : Run Last
-  "<a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-realized" title='The "realized" signal'>realized</a>"                                       : Run Last
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="DbusmenuMenuitem.description"></a><h2>Description</h2>
-<p>
-A <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> is the lowest level of represenation of a
-single item in a menu.  It gets created on the server side
-and copied over to the client side where it gets rendered.  As
-the server starts to change it, and grow it, and do all kinds
-of fun stuff that information is transfered over DBus and the
-client updates it's understanding of the object model.
-</p>
-<p>
-Most people using either the client or the server should be
-able to deal mostly with <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.  These
-are simple, but then they can be attached to more complex
-objects and handled appropriately.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="DbusmenuMenuitem.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED">
-<a name="DBUSMENU-MENUITEM-SIGNAL-PROPERTY-CHANGED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED    "property-changed"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED">
-<a name="DBUSMENU-MENUITEM-SIGNAL-ITEM-ACTIVATED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED      "item-activated"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED">
-<a name="DBUSMENU-MENUITEM-SIGNAL-CHILD-ADDED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED         "child-added"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED">
-<a name="DBUSMENU-MENUITEM-SIGNAL-CHILD-REMOVED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED       "child-removed"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED">
-<a name="DBUSMENU-MENUITEM-SIGNAL-CHILD-MOVED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED         "child-moved"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED">
-<a name="DBUSMENU-MENUITEM-SIGNAL-REALIZED:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_REALIZED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID">
-<a name="DBUSMENU-MENUITEM-SIGNAL-REALIZED-ID:CAPS"></a><h3>DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_TYPE">
-<a name="DBUSMENU-MENUITEM-PROP-TYPE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_TYPE</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_TYPE                  "type"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_VISIBLE">
-<a name="DBUSMENU-MENUITEM-PROP-VISIBLE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_VISIBLE</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_VISIBLE               "visible"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_ENABLED">
-<a name="DBUSMENU-MENUITEM-PROP-ENABLED:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_ENABLED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_ENABLED               "enabled"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_LABEL">
-<a name="DBUSMENU-MENUITEM-PROP-LABEL:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_LABEL</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_LABEL                 "label"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_ICON_NAME">
-<a name="DBUSMENU-MENUITEM-PROP-ICON-NAME:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_ICON_NAME</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_ICON_NAME             "icon-name"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_ICON_DATA">
-<a name="DBUSMENU-MENUITEM-PROP-ICON-DATA:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_ICON_DATA</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_ICON_DATA             "icon-data"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE">
-<a name="DBUSMENU-MENUITEM-PROP-TOGGLE-TYPE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE           "toggle-type"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_TOGGLE_STATE">
-<a name="DBUSMENU-MENUITEM-PROP-TOGGLE-STATE:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_TOGGLE_STATE</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE          "toggle-state"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_CHECK">
-<a name="DBUSMENU-MENUITEM-TOGGLE-CHECK:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_CHECK</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_CHECK               "checkmark"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_RADIO">
-<a name="DBUSMENU-MENUITEM-TOGGLE-RADIO:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_RADIO</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_RADIO               "radio"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED">
-<a name="DBUSMENU-MENUITEM-TOGGLE-STATE-UNCHECKED:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED     0
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED">
-<a name="DBUSMENU-MENUITEM-TOGGLE-STATE-CHECKED:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED       1
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN">
-<a name="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS"></a><h3>DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN       -1
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUSMENU_MENUITEM_ICON_NAME_BLANK">
-<a name="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS"></a><h3>DBUSMENU_MENUITEM_ICON_NAME_BLANK</h3>
-<pre class="programlisting">#define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DbusmenuMenuitem">
-<a name="DbusmenuMenuitem-struct"></a><h3>DbusmenuMenuitem</h3>
-<pre class="programlisting">typedef struct _DbusmenuMenuitem DbusmenuMenuitem;</pre>
-<p>
-This is the <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> based object that represents a menu
-item.  It gets created the same on both the client and
-the server side and libdbusmenu-glib does the work of making
-this object model appear on both sides of DBus.  Simple
-really, though through updates and people coming on and off
-the bus it can lead to lots of fun complex scenarios.
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_about_to_show_cb ()">
-<a name="dbusmenu-menuitem-about-to-show-cb"></a><h3>dbusmenu_menuitem_about_to_show_cb ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*dbusmenu_menuitem_about_to_show_cb)
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Callback prototype for a callback that is called when the
-menu should be shown.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>Menu item that should be shown
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td> Extra user data sent with the function. closure</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_buildxml_slot_t ()">
-<a name="dbusmenu-menuitem-buildxml-slot-t"></a><h3>dbusmenu_menuitem_buildxml_slot_t ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*dbusmenu_menuitem_buildxml_slot_t)
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *stringarray</code></em>);</pre>
-<p>
-This is the function that is called to represent this menu item
-as an XML fragment.  Should call it's own children.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td> Menu item that should be built from. <acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>. </td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>stringarray</code></em> :</span></p></td>
-<td> An array of strings that can be combined into an XML file.. <acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>. <acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>. <acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym>. <acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8. </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="DbusmenuMenuitemClass">
-<a name="DbusmenuMenuitemClass"></a><h3>DbusmenuMenuitemClass</h3>
-<pre class="programlisting">typedef struct {
-	GObjectClass parent_class;
-
-	/* Signals */
-	void (*property_changed) (gchar * property, GValue * value);
-	void (*item_activated) (guint timestamp);
-	void (*child_added) (DbusmenuMenuitem * child, guint position);
-	void (*child_removed) (DbusmenuMenuitem * child);
-	void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint oldpos);
-	void (*realized) (void);
-
-	/* Virtual functions */
-	dbusmenu_menuitem_buildxml_slot_t buildxml;
-	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
-	void (*send_about_to_show) (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
-
-	void (*reserved1) (void);
-	/* void (*reserved2) (void); */
-	/* void (*reserved3) (void); */
-	/* void (*reserved4) (void); -- realized, realloc when bumping lib version */
-} DbusmenuMenuitemClass;
-</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="DbusmenuMenuitemClass.parent-class"></a>parent_class</code></em>;</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.property-changed"></a>property_changed</code></em> ()</span></p></td>
-<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-property-changed" title='The "property-changed" signal'><span class="type">"property-changed"</span></a>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.item-activated"></a>item_activated</code></em> ()</span></p></td>
-<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-item-activated" title='The "item-activated" signal'><span class="type">"item-activated"</span></a>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.child-added"></a>child_added</code></em> ()</span></p></td>
-<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-added" title='The "child-added" signal'><span class="type">"child-added"</span></a>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.child-removed"></a>child_removed</code></em> ()</span></p></td>
-<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-removed" title='The "child-removed" signal'><span class="type">"child-removed"</span></a>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.child-moved"></a>child_moved</code></em> ()</span></p></td>
-<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-child-moved" title='The "child-moved" signal'><span class="type">"child-moved"</span></a>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.realized"></a>realized</code></em> ()</span></p></td>
-<td>Slot for <a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitem-realized" title='The "realized" signal'><span class="type">"realized"</span></a>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-buildxml-slot-t" title="dbusmenu_menuitem_buildxml_slot_t ()"><span class="type">dbusmenu_menuitem_buildxml_slot_t</span></a> <em class="structfield"><code><a name="DbusmenuMenuitemClass.buildxml"></a>buildxml</code></em>;</span></p></td>
-<td>Virtual function that appends the strings required to represent this menu item in the menu XML file.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.handle-event"></a>handle_event</code></em> ()</span></p></td>
-<td>This function is to override how events are handled by subclasses.  Look at <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-handle-event" title="dbusmenu_menuitem_handle_event ()"><span class="type">dbusmenu_menuitem_handle_event</span></a> for lots of good information.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.send-about-to-show"></a>send_about_to_show</code></em> ()</span></p></td>
-<td>Virtual function that notifies server that the client is about to show a menu.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuMenuitemClass.reserved1"></a>reserved1</code></em> ()</span></p></td>
-<td>Reserved for future use.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_new ()">
-<a name="dbusmenu-menuitem-new"></a><h3>dbusmenu_menuitem_new ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_new               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Create a new <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> with all default values.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A newly allocated <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_new_with_id ()">
-<a name="dbusmenu-menuitem-new-with-id"></a><h3>dbusmenu_menuitem_new_with_id ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_new_with_id       (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);</pre>
-<p>
-This creates a blank <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> with a specific ID.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID to use for this menuitem
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A newly allocated <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_get_id ()">
-<a name="dbusmenu-menuitem-get-id"></a><h3>dbusmenu_menuitem_get_id ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                dbusmenu_menuitem_get_id            (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-Gets the unique ID for <em class="parameter"><code>mi</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to query.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The ID of the <em class="parameter"><code>mi</code></em>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_get_children ()">
-<a name="dbusmenu-menuitem-get-children"></a><h3>dbusmenu_menuitem_get_children ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             dbusmenu_menuitem_get_children      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-Returns simply the list of children that this menu item
-	has.  The list is valid until another child related function
-	is called, where it might be changed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to query.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A <a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of pointers to <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_take_children ()">
-<a name="dbusmenu-menuitem-take-children"></a><h3>dbusmenu_menuitem_take_children ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             dbusmenu_menuitem_take_children     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-While the name sounds devious that's exactly what this function
-	does.  It takes the list of children from the <em class="parameter"><code>mi</code></em> and clears the
-	internal list.  The calling function is now in charge of the ref's
-	on the children it has taken.  A lot of responsibility involved
-	in taking children.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <span class="type">DbusmenMenuitem</span> to take the children from.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A <a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of pointers to <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_get_position ()">
-<a name="dbusmenu-menuitem-get-position"></a><h3>dbusmenu_menuitem_get_position ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               dbusmenu_menuitem_get_position      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre>
-<p>
-This function returns the position of the menu item <em class="parameter"><code>mi</code></em>
-	in the children of <em class="parameter"><code>parent</code></em>.  It will return zero if the
-	menu item can't be found.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to find the position of
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> who's children contain <em class="parameter"><code>mi</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The position of <em class="parameter"><code>mi</code></em> in the children of <em class="parameter"><code>parent</code></em>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_get_position_realized ()">
-<a name="dbusmenu-menuitem-get-position-realized"></a><h3>dbusmenu_menuitem_get_position_realized ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               dbusmenu_menuitem_get_position_realized
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre>
-<p>
-This function is very similar to <a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-get-position" title="dbusmenu_menuitem_get_position ()"><span class="type">dbusmenu_menuitem_get_position</span></a>
-	except that it only counts in the children that have been realized.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to find the position of
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> who's children contain <em class="parameter"><code>mi</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The position of <em class="parameter"><code>mi</code></em> in the realized children of <em class="parameter"><code>parent</code></em>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_child_append ()">
-<a name="dbusmenu-menuitem-child-append"></a><h3>dbusmenu_menuitem_child_append ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_append      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);</pre>
-<p>
-This function adds <em class="parameter"><code>child</code></em> to the list of children on <em class="parameter"><code>mi</code></em> at
-	the end of that list.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which will become a new parent
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
-<td>The <span class="type">DbusmenMenuitem</span> that will be a child
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> Whether the child has been added successfully.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_child_prepend ()">
-<a name="dbusmenu-menuitem-child-prepend"></a><h3>dbusmenu_menuitem_child_prepend ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_prepend     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);</pre>
-<p>
-This function adds <em class="parameter"><code>child</code></em> to the list of children on <em class="parameter"><code>mi</code></em> at
-	the beginning of that list.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which will become a new parent
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
-<td>The <span class="type">DbusmenMenuitem</span> that will be a child
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> Whether the child has been added successfully.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_child_delete ()">
-<a name="dbusmenu-menuitem-child-delete"></a><h3>dbusmenu_menuitem_child_delete ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_delete      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>);</pre>
-<p>
-This function removes <em class="parameter"><code>child</code></em> from the children list of <em class="parameter"><code>mi</code></em>.  It does
-	not call <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><span class="type">g_object_unref</span></a> on <em class="parameter"><code>child</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which has <em class="parameter"><code>child</code></em> as a child
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
-<td>The child <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that you want to no longer
-	    be a child of <em class="parameter"><code>mi</code></em>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> If we were able to delete <em class="parameter"><code>child</code></em>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_child_add_position ()">
-<a name="dbusmenu-menuitem-child-add-position"></a><h3>dbusmenu_menuitem_child_add_position ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_add_position
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);</pre>
-<p>
-Puts <em class="parameter"><code>child</code></em> in the list of children for <em class="parameter"><code>mi</code></em> at the location
-	specified in <em class="parameter"><code>position</code></em>.  If there is not enough entires available
-	then <em class="parameter"><code>child</code></em> will be placed at the end of the list.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that we're adding the child <em class="parameter"><code>child</code></em> to.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to make a child of <em class="parameter"><code>mi</code></em>.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>position</code></em> :</span></p></td>
-<td>Where in <em class="parameter"><code>mi</code></em> object's list of chidren <em class="parameter"><code>child</code></em> should be placed.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> Whether <em class="parameter"><code>child</code></em> was added successfully.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_child_reorder ()">
-<a name="dbusmenu-menuitem-child-reorder"></a><h3>dbusmenu_menuitem_child_reorder ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_child_reorder     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *child</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> position</code></em>);</pre>
-<p>
-This function moves a child on the list of children.  It is
-	for a child that is already in the list, but simply needs a 
-	new location.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>child</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that is a child needing to be moved
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>position</code></em> :</span></p></td>
-<td>The position in the list to place it in
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> Whether the move was successful.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_child_find ()">
-<a name="dbusmenu-menuitem-child-find"></a><h3>dbusmenu_menuitem_child_find ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_child_find        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);</pre>
-<p>
-Search the children of <em class="parameter"><code>mi</code></em> to find one with the ID of <em class="parameter"><code>id</code></em>.
-	If it doesn't exist then we return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> who's children to look on
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>The ID of the child that we're looking for.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The menu item with the ID <em class="parameter"><code>id</code></em> or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if it
-	   can't be found.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_find_id ()">
-<a name="dbusmenu-menuitem-find-id"></a><h3>dbusmenu_menuitem_find_id ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_find_id           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> id</code></em>);</pre>
-<p>
-This function searchs the whole tree of children that
-	are attached to <em class="parameter"><code>mi</code></em>.  This could be quite a few nodes, all
-	the way down the tree.  It is a depth first search.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> at the top of the tree to search
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID of the <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to search for
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> with the ID of <em class="parameter"><code>id</code></em>
-		or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if there isn't such a menu item in the tree
-		represented by <em class="parameter"><code>mi</code></em>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_set ()">
-<a name="dbusmenu-menuitem-property-set"></a><h3>dbusmenu_menuitem_property_set ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);</pre>
-<p>
-Takes the pair of <em class="parameter"><code>property</code></em> and <em class="parameter"><code>value</code></em> and places them as a
-	property on <em class="parameter"><code>mi</code></em>.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal <span class="type">"prop-changed"</span> will be
-	emitted by this function.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>Name of the property to set.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The value of the property.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>  A boolean representing if the property value was set.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_set_value ()">
-<a name="dbusmenu-menuitem-property-set-value"></a><h3>dbusmenu_menuitem_property_set_value ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_value
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_set_bool ()">
-<a name="dbusmenu-menuitem-property-set-bool"></a><h3>dbusmenu_menuitem_property_set_bool ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_bool (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
-<p>
-Takes a boolean <em class="parameter"><code>value</code></em> and sets it on <em class="parameter"><code>property</code></em> as a
-	property on <em class="parameter"><code>mi</code></em>.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal <span class="type">"prop-changed"</span> will be
-	emitted by this function.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>Name of the property to set.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The value of the property.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>  A boolean representing if the property value was set.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_set_int ()">
-<a name="dbusmenu-menuitem-property-set-int"></a><h3>dbusmenu_menuitem_property_set_int ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_set_int  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> value</code></em>);</pre>
-<p>
-Takes a boolean <em class="parameter"><code>value</code></em> and sets it on <em class="parameter"><code>property</code></em> as a
-	property on <em class="parameter"><code>mi</code></em>.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal <span class="type">"prop-changed"</span> will be
-	emitted by this function.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>Name of the property to set.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The value of the property.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>  A boolean representing if the property value was set.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_get ()">
-<a name="dbusmenu-menuitem-property-get"></a><h3>dbusmenu_menuitem_property_get ()</h3>
-<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       dbusmenu_menuitem_property_get      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
-<p>
-Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
-	it exits.  <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> will be returned if the property doesn't
-	exist.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>The property to grab.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A string with the value of the property
-		that shouldn't be free'd.  Or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if the property
-		is not set or is not a string.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_get_value ()">
-<a name="dbusmenu-menuitem-property-get-value"></a><h3>dbusmenu_menuitem_property_get_value ()</h3>
-<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="returnvalue">GValue</span></a> *      dbusmenu_menuitem_property_get_value
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
-<p>
-Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
-	it exits.  <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> will be returned if the property doesn't
-	exist.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>The property to grab.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A GValue for the property.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_get_bool ()">
-<a name="dbusmenu-menuitem-property-get-bool"></a><h3>dbusmenu_menuitem_property_get_bool ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_get_bool (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
-<p>
-Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
-	it exits.  Returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> if the property doesn't exist.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>The property to grab.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The value of the property or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_get_int ()">
-<a name="dbusmenu-menuitem-property-get-int"></a><h3>dbusmenu_menuitem_property_get_int ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                dbusmenu_menuitem_property_get_int  (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
-<p>
-Look up a property on <em class="parameter"><code>mi</code></em> and return the value of it if
-	it exits.  Returns zero if the property doesn't exist.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to look for the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>The property to grab.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The value of the property or zero.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_exist ()">
-<a name="dbusmenu-menuitem-property-exist"></a><h3>dbusmenu_menuitem_property_exist ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_property_exist    (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_properties_list ()">
-<a name="dbusmenu-menuitem-properties-list"></a><h3>dbusmenu_menuitem_properties_list ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             dbusmenu_menuitem_properties_list   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-This functiong gets a list of the names of all the properties
-	that are set on this menu item.  This data on the list is owned
-	by the menuitem but the list is not and should be freed using
-	<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a> when the calling function is done with it.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to list the properties on
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A list of strings or NULL if there are none.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_properties_copy ()">
-<a name="dbusmenu-menuitem-properties-copy"></a><h3>dbusmenu_menuitem_properties_copy ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        dbusmenu_menuitem_properties_copy   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-This function takes the properties of a <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>
-	and puts them into a <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> that is referenced by the
-	key of a string and has the value of a string.  The hash
-	table may not have any entries if there aren't any or there
-	is an error in processing.  It is the caller's responsibility
-	to destroy the created <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> that we're interested in the properties of
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A brand new <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> that contains all of the
-		properties that are on this <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> <em class="parameter"><code>mi</code></em>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_property_remove ()">
-<a name="dbusmenu-menuitem-property-remove"></a><h3>dbusmenu_menuitem_property_remove ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_property_remove   (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre>
-<p>
-Removes a property from the menuitem.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to remove the property on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>The property to look for.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_set_root ()">
-<a name="dbusmenu-menuitem-set-root"></a><h3>dbusmenu_menuitem_set_root ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_set_root          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> root</code></em>);</pre>
-<p>
-This function sets the internal value of whether this is a
-	root node or not.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set whether it's root
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>root</code></em> :</span></p></td>
-<td>Whether <em class="parameter"><code>mi</code></em> is a root node or not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_get_root ()">
-<a name="dbusmenu-menuitem-get-root"></a><h3>dbusmenu_menuitem_get_root ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            dbusmenu_menuitem_get_root          (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-This function returns the internal value of whether this is a
-	root node or not.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to see whether it's root
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> if this is a root node
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_foreach ()">
-<a name="dbusmenu-menuitem-foreach"></a><h3>dbusmenu_menuitem_foreach ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_foreach           (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><span class="type">void</span> (funcDbusmenuMenuitem * mi, gpointer data) ()</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>);</pre>
-<p>
-This calls the function <em class="parameter"><code>func</code></em> on this menu item and all
-	of the children of this item.  And their children.  And
-	their children.  And... you get the point.  It will get
-	called on the whole tree.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <span class="type">DbusmenItem</span> to start from
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td> User data to pass to the function. closure</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_handle_event ()">
-<a name="dbusmenu-menuitem-handle-event"></a><h3>dbusmenu_menuitem_handle_event ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_handle_event      (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timestamp</code></em>);</pre>
-<p>
-This function is called to create an event.  It is likely
-	to be overrided by subclasses.  The default menu item
-	will respond to the activate signal and do:
-</p>
-<p>
-	Emits the <span class="type">"item-activate"</span> signal on this
-	menu item.  Called by server objects when they get the
-	appropriate DBus signals from the client.
-</p>
-<p>
-	If you subclass this function you should really think
-	about calling the parent function unless you have a good
-	reason not to.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to send the signal on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of the signal
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A value that could be set for the event
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td>The timestamp of when the event happened
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_send_about_to_show ()">
-<a name="dbusmenu-menuitem-send-about-to-show"></a><h3>dbusmenu_menuitem_send_about_to_show ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbusmenu_menuitem_send_about_to_show
-                                                        (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()"><span class="type">dbusmenu_menuitem_about_to_show_cb</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> cb_data</code></em>);</pre>
-<p>
-This function is used to send the even that the submenu
-	of this item is about to be shown.  Callers to this event
-	should delay showing the menu until their callback is
-	called if possible.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to send the signal on.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>cb</code></em> :</span></p></td>
-<td>Callback to call when the call has returned.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>cb_data</code></em> :</span></p></td>
-<td> Data to pass to the callback.. closure</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Property Details">
-<a name="DbusmenuMenuitem.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "id" property'>
-<a name="DbusmenuMenuitem--id"></a><h3>The <code class="literal">"id"</code> property</h3>
-<pre class="programlisting">  "id"                       <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct Only</pre>
-<p>This is a unique indentifier for the menu item.</p>
-<p>Allowed values: [G_MAXULONG,30000]</p>
-<p>Default value: -1</p>
-</div>
-</div>
-<div class="refsect1" title="Signal Details">
-<a name="DbusmenuMenuitem.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "child-added" signal'>
-<a name="DbusmenuMenuitem-child-added"></a><h3>The <code class="literal">"child-added"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
-                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg2,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
-<p>
-Signaled when the child menuitem has been added to
-		the parent.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the parent.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the child.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
-<td>The position that the child is being added in.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title='The "child-moved" signal'>
-<a name="DbusmenuMenuitem-child-moved"></a><h3>The <code class="literal">"child-moved"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
-                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg2,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg3,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
-<p>
-Signaled when the child menuitem has had it's location
-		in the list change.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the parent.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which is the child.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
-<td>The position that the child is being moved to.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg3</code></em> :</span></p></td>
-<td>The position that the child is was in.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title='The "child-removed" signal'>
-<a name="DbusmenuMenuitem-child-removed"></a><h3>The <code class="literal">"child-removed"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
-                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
-<p>
-Signaled when the child menuitem has been requested to
-		be removed from the parent.  This signal is called when
-		it has been removed from the list but not yet had
-		<a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><span class="type">g_object_unref</span></a> called on it.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which was the parent.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> which was the child.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title='The "item-activated" signal'>
-<a name="DbusmenuMenuitem-item-activated"></a><h3>The <code class="literal">"item-activated"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a>             arg1,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
-<p>
-Emitted on the objects on the server side when
-		they are signaled on the client side.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
-<td>The timestamp of when it was activated
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title='The "property-changed" signal'>
-<a name="DbusmenuMenuitem-property-changed"></a><h3>The <code class="literal">"property-changed"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>            *arg1,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          arg2,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
-<p>
-Emitted everytime a property on a menuitem is either
-		updated or added.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
-<td>The name of the property that changed
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
-<td>The new value of the property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title='The "realized" signal'>
-<a name="DbusmenuMenuitem-realized"></a><h3>The <code class="literal">"realized"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *arg0,
-                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)      : Run Last</pre>
-<p>
-Emitted when the initial request for properties
-		is complete on the item.  If there is a type
-		handler configured for the "type" parameter
-		that will be executed before this is signaled.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.14</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html b/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html
deleted file mode 100644
index b5efc96..0000000
--- a/docs/libdbusmenu-glib/reference/html/DbusmenuMenuitemProxy.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DbusmenuMenuitemProxy</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
-<link rel="up" href="ch01.html" title="API">
-<link rel="prev" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer">
-<link rel="next" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libdbusmenu-glib-DbusmenuServer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
-<td><a accesskey="n" href="DbusmenuMenuitem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#DbusmenuMenuitemProxy.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#DbusmenuMenuitemProxy.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#DbusmenuMenuitemProxy.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#DbusmenuMenuitemProxy.properties" class="shortcut">Properties</a>
-</td></tr>
-</table>
-<div class="refentry" title="DbusmenuMenuitemProxy">
-<a name="DbusmenuMenuitemProxy"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="DbusmenuMenuitemProxy.top_of_page"></a>DbusmenuMenuitemProxy</span></h2>
-<p>DbusmenuMenuitemProxy</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="DbusmenuMenuitemProxy.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy-struct" title="DbusmenuMenuitemProxy">DbusmenuMenuitemProxy</a>;
-                    <a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxyClass" title="DbusmenuMenuitemProxyClass">DbusmenuMenuitemProxyClass</a>;
-<a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="returnvalue">DbusmenuMenuitemProxy</span></a> * <a class="link" href="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-new" title="dbusmenu_menuitem_proxy_new ()">dbusmenu_menuitem_proxy_new</a>     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);
-<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  <a class="link" href="DbusmenuMenuitemProxy.html#dbusmenu-menuitem-proxy-get-wrapped" title="dbusmenu_menuitem_proxy_get_wrapped ()">dbusmenu_menuitem_proxy_get_wrapped</a> (<em class="parameter"><code><a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> *pmi</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="DbusmenuMenuitemProxy.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
-         +----DbusmenuMenuitemProxy
-</pre>
-</div>
-<div class="refsect1" title="Properties">
-<a name="DbusmenuMenuitemProxy.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="DbusmenuMenuitemProxy.html#DbusmenuMenuitemProxy--menu-item" title='The "menu-item" property'>menu-item</a>"                <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>*     : Read / Write / Construct Only
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="DbusmenuMenuitemProxy.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="DbusmenuMenuitemProxy.details"></a><h2>Details</h2>
-<div class="refsect2" title="DbusmenuMenuitemProxy">
-<a name="DbusmenuMenuitemProxy-struct"></a><h3>DbusmenuMenuitemProxy</h3>
-<pre class="programlisting">typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DbusmenuMenuitemProxyClass">
-<a name="DbusmenuMenuitemProxyClass"></a><h3>DbusmenuMenuitemProxyClass</h3>
-<pre class="programlisting">typedef struct {
-	DbusmenuMenuitemClass parent_class;
-} DbusmenuMenuitemProxyClass;
-</pre>
-<p>
-Functions and signal slots for <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><a class="link" href="DbusmenuMenuitem.html#DbusmenuMenuitemClass" title="DbusmenuMenuitemClass"><span class="type">DbusmenuMenuitemClass</span></a> <em class="structfield"><code><a name="DbusmenuMenuitemProxyClass.parent-class"></a>parent_class</code></em>;</span></p></td>
-<td>The Class of <span class="type">DbusmeneMenuitem</span>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_proxy_new ()">
-<a name="dbusmenu-menuitem-proxy-new"></a><h3>dbusmenu_menuitem_proxy_new ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="returnvalue">DbusmenuMenuitemProxy</span></a> * dbusmenu_menuitem_proxy_new     (<em class="parameter"><code><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>);</pre>
-<p>
-Builds a new <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> object that proxies
-	all of the values for <em class="parameter"><code>mi</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td>
-<td>The <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to proxy
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A new <a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> object.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbusmenu_menuitem_proxy_get_wrapped ()">
-<a name="dbusmenu-menuitem-proxy-get-wrapped"></a><h3>dbusmenu_menuitem_proxy_get_wrapped ()</h3>
-<pre class="programlisting"><a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="returnvalue">DbusmenuMenuitem</span></a> *  dbusmenu_menuitem_proxy_get_wrapped (<em class="parameter"><code><a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> *pmi</code></em>);</pre>
-<p>
-Accesses the private variable of which <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>
-	we are doing the proxying for.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>pmi</code></em> :</span></p></td>
-<td>
-<a class="link" href="DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"><span class="type">DbusmenuMenuitemProxy</span></a> to look into
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object or a <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if we
-		don't have one or there is an error.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Property Details">
-<a name="DbusmenuMenuitemProxy.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "menu-item" property'>
-<a name="DbusmenuMenuitemProxy--menu-item"></a><h3>The <code class="literal">"menu-item"</code> property</h3>
-<pre class="programlisting">  "menu-item"                <a class="link" href="DbusmenuMenuitem.html" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>*     : Read / Write / Construct Only</pre>
-<p>An instance of the DbusmenuMenuitem class that this menuitem will mimic.</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.14</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html
deleted file mode 100644
index b8088e2..0000000
--- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-client.html
+++ /dev/null
@@ -1,1001 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>dbusmenu-client</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
-<link rel="up" href="ch01.html" title="API">
-<link rel="prev" href="DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem">
-<link rel="next" href="libdbusmenu-glib-dbusmenu-server.html" title="dbusmenu-server">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="DbusmenuClientMenuitem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
-<td><a accesskey="n" href="libdbusmenu-glib-dbusmenu-server.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libdbusmenu-glib-dbusmenu-client.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libdbusmenu-glib-dbusmenu-client.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="dbusmenu-client">
-<a name="libdbusmenu-glib-dbusmenu-client"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libdbusmenu-glib-dbusmenu-client.top_of_page"></a>dbusmenu-client</span></h2>
-<p>dbusmenu-client</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libdbusmenu-glib-dbusmenu-client.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu" title="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu">DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</a>
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout" title="org_ayatana_dbusmenu_get_layout ()">org_ayatana_dbusmenu_get_layout</a>     (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *OUT_revision</code></em>,
-                                                         <em class="parameter"><code><span class="type">char</span> **OUT_layout</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()">*org_ayatana_dbusmenu_get_layout_reply</a>)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> OUT_revision</code></em>,
-                                                         <em class="parameter"><code><span class="type">char</span> *OUT_layout</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-async" title="org_ayatana_dbusmenu_get_layout_async ()">org_ayatana_dbusmenu_get_layout_async</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()"><span class="type">org_ayatana_dbusmenu_get_layout_reply</span></a> callback</code></em>);
-<span class="returnvalue">return</span>              <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()">dbus_g_proxy_begin_call</a>             (<em class="parameter"><code><span class="type">proxy</span> Param1</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties" title="org_ayatana_dbusmenu_get_group_properties ()">org_ayatana_dbusmenu_get_group_properties</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()">*org_ayatana_dbusmenu_get_group_properties_reply</a>)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-async" title="org_ayatana_dbusmenu_get_group_properties_async ()">org_ayatana_dbusmenu_get_group_properties_async</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_group_properties_reply</span></a> callback</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children" title="org_ayatana_dbusmenu_get_children ()">org_ayatana_dbusmenu_get_children</a>   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()">*org_ayatana_dbusmenu_get_children_reply</a>)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-async" title="org_ayatana_dbusmenu_get_children_async ()">org_ayatana_dbusmenu_get_children_async</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()"><span class="type">org_ayatana_dbusmenu_get_children_reply</span></a> callback</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property" title="org_ayatana_dbusmenu_get_property ()">org_ayatana_dbusmenu_get_property</a>   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *OUT_value</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()">*org_ayatana_dbusmenu_get_property_reply</a>)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> OUT_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-async" title="org_ayatana_dbusmenu_get_property_async ()">org_ayatana_dbusmenu_get_property_async</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()"><span class="type">org_ayatana_dbusmenu_get_property_reply</span></a> callback</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties" title="org_ayatana_dbusmenu_get_properties ()">org_ayatana_dbusmenu_get_properties</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **OUT_properties</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()">*org_ayatana_dbusmenu_get_properties_reply</a>)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *OUT_properties</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-async" title="org_ayatana_dbusmenu_get_properties_async ()">org_ayatana_dbusmenu_get_properties_async</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_properties_reply</span></a> callback</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event" title="org_ayatana_dbusmenu_event ()">org_ayatana_dbusmenu_event</a>          (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()">*org_ayatana_dbusmenu_event_reply</a>) (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-async" title="org_ayatana_dbusmenu_event_async ()">org_ayatana_dbusmenu_event_async</a>    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()"><span class="type">org_ayatana_dbusmenu_event_reply</span></a> callback</code></em>);
-<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show" title="org_ayatana_dbusmenu_about_to_show ()">org_ayatana_dbusmenu_about_to_show</a>  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *OUT_needUpdate</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()">*org_ayatana_dbusmenu_about_to_show_reply</a>)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> OUT_needUpdate</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> *    <a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-async" title="org_ayatana_dbusmenu_about_to_show_async ()">org_ayatana_dbusmenu_about_to_show_async</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()"><span class="type">org_ayatana_dbusmenu_about_to_show_reply</span></a> callback</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="libdbusmenu-glib-dbusmenu-client.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libdbusmenu-glib-dbusmenu-client.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu">
-<a name="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"></a><h3>DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</h3>
-<pre class="programlisting">#define DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_layout ()">
-<a name="org-ayatana-dbusmenu-get-layout"></a><h3>org_ayatana_dbusmenu_get_layout ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_layout     (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *OUT_revision</code></em>,
-                                                         <em class="parameter"><code><span class="type">char</span> **OUT_layout</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_parentId</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_revision</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_layout</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_layout_reply ()">
-<a name="org-ayatana-dbusmenu-get-layout-reply"></a><h3>org_ayatana_dbusmenu_get_layout_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_layout_reply)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> OUT_revision</code></em>,
-                                                         <em class="parameter"><code><span class="type">char</span> *OUT_layout</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_revision</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_layout</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_layout_async ()">
-<a name="org-ayatana-dbusmenu-get-layout-async"></a><h3>org_ayatana_dbusmenu_get_layout_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_layout_async
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_parentId</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-layout-reply" title="org_ayatana_dbusmenu_get_layout_reply ()"><span class="type">org_ayatana_dbusmenu_get_layout_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_parentId</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_begin_call ()">
-<a name="dbus-g-proxy-begin-call"></a><h3>dbus_g_proxy_begin_call ()</h3>
-<pre class="programlisting"><span class="returnvalue">return</span>              dbus_g_proxy_begin_call             (<em class="parameter"><code><span class="type">proxy</span> Param1</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>Param1</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_group_properties ()">
-<a name="org-ayatana-dbusmenu-get-group-properties"></a><h3>org_ayatana_dbusmenu_get_group_properties ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_group_properties
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_ids</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_group_properties_reply ()">
-<a name="org-ayatana-dbusmenu-get-group-properties-reply"></a><h3>org_ayatana_dbusmenu_get_group_properties_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_group_properties_reply)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_group_properties_async ()">
-<a name="org-ayatana-dbusmenu-get-group-properties-async"></a><h3>org_ayatana_dbusmenu_get_group_properties_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_group_properties_async
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Arrays.html#GArray"><span class="type">GArray</span></a> *IN_ids</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-group-properties-reply" title="org_ayatana_dbusmenu_get_group_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_group_properties_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_ids</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_children ()">
-<a name="org-ayatana-dbusmenu-get-children"></a><h3>org_ayatana_dbusmenu_get_children ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_children   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **OUT_properties</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_children_reply ()">
-<a name="org-ayatana-dbusmenu-get-children-reply"></a><h3>org_ayatana_dbusmenu_get_children_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_children_reply)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *OUT_properties</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_children_async ()">
-<a name="org-ayatana-dbusmenu-get-children-async"></a><h3>org_ayatana_dbusmenu_get_children_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_children_async
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-children-reply" title="org_ayatana_dbusmenu_get_children_reply ()"><span class="type">org_ayatana_dbusmenu_get_children_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_property ()">
-<a name="org-ayatana-dbusmenu-get-property"></a><h3>org_ayatana_dbusmenu_get_property ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_property   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *OUT_value</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_name</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_property_reply ()">
-<a name="org-ayatana-dbusmenu-get-property-reply"></a><h3>org_ayatana_dbusmenu_get_property_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_property_reply)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> OUT_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_property_async ()">
-<a name="org-ayatana-dbusmenu-get-property-async"></a><h3>org_ayatana_dbusmenu_get_property_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_property_async
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-property-reply" title="org_ayatana_dbusmenu_get_property_reply ()"><span class="type">org_ayatana_dbusmenu_get_property_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_name</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_properties ()">
-<a name="org-ayatana-dbusmenu-get-properties"></a><h3>org_ayatana_dbusmenu_get_properties ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_get_properties (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **OUT_properties</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_properties_reply ()">
-<a name="org-ayatana-dbusmenu-get-properties-reply"></a><h3>org_ayatana_dbusmenu_get_properties_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_get_properties_reply)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *OUT_properties</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_properties</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_get_properties_async ()">
-<a name="org-ayatana-dbusmenu-get-properties-async"></a><h3>org_ayatana_dbusmenu_get_properties_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_get_properties_async
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **IN_propertyNames</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-get-properties-reply" title="org_ayatana_dbusmenu_get_properties_reply ()"><span class="type">org_ayatana_dbusmenu_get_properties_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_propertyNames</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_event ()">
-<a name="org-ayatana-dbusmenu-event"></a><h3>org_ayatana_dbusmenu_event ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_event          (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_eventId</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_timestamp</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_event_reply ()">
-<a name="org-ayatana-dbusmenu-event-reply"></a><h3>org_ayatana_dbusmenu_event_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_event_reply) (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_event_async ()">
-<a name="org-ayatana-dbusmenu-event-async"></a><h3>org_ayatana_dbusmenu_event_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_event_async    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *IN_eventId</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *IN_data</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> IN_timestamp</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-event-reply" title="org_ayatana_dbusmenu_event_reply ()"><span class="type">org_ayatana_dbusmenu_event_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_eventId</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_timestamp</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_about_to_show ()">
-<a name="org-ayatana-dbusmenu-about-to-show"></a><h3>org_ayatana_dbusmenu_about_to_show ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            org_ayatana_dbusmenu_about_to_show  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *OUT_needUpdate</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_needUpdate</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_about_to_show_reply ()">
-<a name="org-ayatana-dbusmenu-about-to-show-reply"></a><h3>org_ayatana_dbusmenu_about_to_show_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*org_ayatana_dbusmenu_about_to_show_reply)
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> OUT_needUpdate</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>OUT_needUpdate</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>userdata</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="org_ayatana_dbusmenu_about_to_show_async ()">
-<a name="org-ayatana-dbusmenu-about-to-show-async"></a><h3>org_ayatana_dbusmenu_about_to_show_async ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> *    org_ayatana_dbusmenu_about_to_show_async
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> IN_id</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libdbusmenu-glib-dbusmenu-client.html#org-ayatana-dbusmenu-about-to-show-reply" title="org_ayatana_dbusmenu_about_to_show_reply ()"><span class="type">org_ayatana_dbusmenu_about_to_show_reply</span></a> callback</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>IN_id</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.14</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html
deleted file mode 100644
index fed6be3..0000000
--- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-dbusmenu-server.html
+++ /dev/null
@@ -1,672 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>dbusmenu-server</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual">
-<link rel="up" href="ch01.html" title="API">
-<link rel="prev" href="libdbusmenu-glib-dbusmenu-client.html" title="dbusmenu-client">
-<link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libdbusmenu-glib-dbusmenu-client.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libdbusmenu-glib Reference Manual</th>
-<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libdbusmenu-glib-dbusmenu-server.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libdbusmenu-glib-dbusmenu-server.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="dbusmenu-server">
-<a name="libdbusmenu-glib-dbusmenu-server"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libdbusmenu-glib-dbusmenu-server.top_of_page"></a>dbusmenu-server</span></h2>
-<p>dbusmenu-server</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libdbusmenu-glib-dbusmenu-server.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boolean" title="g_marshal_value_peek_boolean()">g_marshal_value_peek_boolean</a>        (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-char" title="g_marshal_value_peek_char()">g_marshal_value_peek_char</a>           (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uchar" title="g_marshal_value_peek_uchar()">g_marshal_value_peek_uchar</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int" title="g_marshal_value_peek_int()">g_marshal_value_peek_int</a>            (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint" title="g_marshal_value_peek_uint()">g_marshal_value_peek_uint</a>           (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-long" title="g_marshal_value_peek_long()">g_marshal_value_peek_long</a>           (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-ulong" title="g_marshal_value_peek_ulong()">g_marshal_value_peek_ulong</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-int64" title="g_marshal_value_peek_int64()">g_marshal_value_peek_int64</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-uint64" title="g_marshal_value_peek_uint64()">g_marshal_value_peek_uint64</a>         (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-enum" title="g_marshal_value_peek_enum()">g_marshal_value_peek_enum</a>           (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-flags" title="g_marshal_value_peek_flags()">g_marshal_value_peek_flags</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-float" title="g_marshal_value_peek_float()">g_marshal_value_peek_float</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-double" title="g_marshal_value_peek_double()">g_marshal_value_peek_double</a>         (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-string" title="g_marshal_value_peek_string()">g_marshal_value_peek_string</a>         (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-param" title="g_marshal_value_peek_param()">g_marshal_value_peek_param</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-boxed" title="g_marshal_value_peek_boxed()">g_marshal_value_peek_boxed</a>          (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-pointer" title="g_marshal_value_peek_pointer()">g_marshal_value_peek_pointer</a>        (v)
-#define             <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#g-marshal-value-peek-object" title="g_marshal_value_peek_object()">g_marshal_value_peek_object</a>         (v)
-<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libdbusmenu-glib-dbusmenu-server.html#dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()">dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</a>
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="libdbusmenu-glib-dbusmenu-server.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libdbusmenu-glib-dbusmenu-server.details"></a><h2>Details</h2>
-<div class="refsect2" title="g_marshal_value_peek_boolean()">
-<a name="g-marshal-value-peek-boolean"></a><h3>g_marshal_value_peek_boolean()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_boolean(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_char()">
-<a name="g-marshal-value-peek-char"></a><h3>g_marshal_value_peek_char()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_char(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_uchar()">
-<a name="g-marshal-value-peek-uchar"></a><h3>g_marshal_value_peek_uchar()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_uchar(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_int()">
-<a name="g-marshal-value-peek-int"></a><h3>g_marshal_value_peek_int()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_int(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_uint()">
-<a name="g-marshal-value-peek-uint"></a><h3>g_marshal_value_peek_uint()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_uint(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_long()">
-<a name="g-marshal-value-peek-long"></a><h3>g_marshal_value_peek_long()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_long(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_ulong()">
-<a name="g-marshal-value-peek-ulong"></a><h3>g_marshal_value_peek_ulong()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_ulong(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_int64()">
-<a name="g-marshal-value-peek-int64"></a><h3>g_marshal_value_peek_int64()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_int64(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_uint64()">
-<a name="g-marshal-value-peek-uint64"></a><h3>g_marshal_value_peek_uint64()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_uint64(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_enum()">
-<a name="g-marshal-value-peek-enum"></a><h3>g_marshal_value_peek_enum()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_enum(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_flags()">
-<a name="g-marshal-value-peek-flags"></a><h3>g_marshal_value_peek_flags()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_flags(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_float()">
-<a name="g-marshal-value-peek-float"></a><h3>g_marshal_value_peek_float()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_float(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_double()">
-<a name="g-marshal-value-peek-double"></a><h3>g_marshal_value_peek_double()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_double(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_string()">
-<a name="g-marshal-value-peek-string"></a><h3>g_marshal_value_peek_string()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_string(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_param()">
-<a name="g-marshal-value-peek-param"></a><h3>g_marshal_value_peek_param()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_param(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_boxed()">
-<a name="g-marshal-value-peek-boxed"></a><h3>g_marshal_value_peek_boxed()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_boxed(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_pointer()">
-<a name="g-marshal-value-peek-pointer"></a><h3>g_marshal_value_peek_pointer()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_pointer(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_marshal_value_peek_object()">
-<a name="g-marshal-value-peek-object"></a><h3>g_marshal_value_peek_object()</h3>
-<pre class="programlisting">#define             g_marshal_value_peek_object(v)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>v</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()">
-<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()">
-<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()">
-<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()">
-<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()">
-<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()">
-<a name="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"></a><h3>dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER
-                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_value</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>return_value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>param_values</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>invocation_hint</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshal_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.14</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt.moved b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt.moved
deleted file mode 100644
index c8d5db6..0000000
--- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt.moved
+++ /dev/null
@@ -1,208 +0,0 @@
-<SECTION>
-<FILE>client</FILE>
-<TITLE>DbusmenuClient</TITLE>
-DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED
-DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED
-DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM
-DBUSMENU_CLIENT_PROP_DBUS_NAME
-DBUSMENU_CLIENT_PROP_DBUS_OBJECT
-DBUSMENU_CLIENT_TYPES_DEFAULT
-DBUSMENU_CLIENT_TYPES_SEPARATOR
-DBUSMENU_CLIENT_TYPES_IMAGE
-DbusmenuClientClass
-DbusmenuClientTypeHandler
-dbusmenu_client_new
-dbusmenu_client_get_root
-dbusmenu_client_add_type_handler
-dbusmenu_client_send_event
-dbusmenu_client_send_about_to_show
-<SUBSECTION Standard>
-DBUSMENU_CLIENT
-DBUSMENU_IS_CLIENT
-DBUSMENU_TYPE_CLIENT
-dbusmenu_client_get_type
-DBUSMENU_CLIENT_CLASS
-DBUSMENU_IS_CLIENT_CLASS
-DBUSMENU_CLIENT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>menuitem</FILE>
-<TITLE>DbusmenuMenuitem</TITLE>
-DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED
-DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED
-DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED
-DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED
-DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED
-DBUSMENU_MENUITEM_SIGNAL_REALIZED
-DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID
-DBUSMENU_MENUITEM_PROP_TYPE
-DBUSMENU_MENUITEM_PROP_VISIBLE
-DBUSMENU_MENUITEM_PROP_ENABLED
-DBUSMENU_MENUITEM_PROP_LABEL
-DBUSMENU_MENUITEM_PROP_ICON_NAME
-DBUSMENU_MENUITEM_PROP_ICON_DATA
-DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE
-DBUSMENU_MENUITEM_PROP_TOGGLE_STATE
-DBUSMENU_MENUITEM_TOGGLE_CHECK
-DBUSMENU_MENUITEM_TOGGLE_RADIO
-DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED
-DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED
-DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN
-DBUSMENU_MENUITEM_ICON_NAME_BLANK
-DbusmenuMenuitem
-dbusmenu_menuitem_about_to_show_cb
-dbusmenu_menuitem_buildxml_slot_t
-DbusmenuMenuitemClass
-dbusmenu_menuitem_new
-dbusmenu_menuitem_new_with_id
-dbusmenu_menuitem_get_id
-dbusmenu_menuitem_get_children
-dbusmenu_menuitem_take_children
-dbusmenu_menuitem_get_position
-dbusmenu_menuitem_get_position_realized
-dbusmenu_menuitem_child_append
-dbusmenu_menuitem_child_prepend
-dbusmenu_menuitem_child_delete
-dbusmenu_menuitem_child_add_position
-dbusmenu_menuitem_child_reorder
-dbusmenu_menuitem_child_find
-dbusmenu_menuitem_find_id
-dbusmenu_menuitem_property_set
-dbusmenu_menuitem_property_set_value
-dbusmenu_menuitem_property_set_bool
-dbusmenu_menuitem_property_set_int
-dbusmenu_menuitem_property_get
-dbusmenu_menuitem_property_get_value
-dbusmenu_menuitem_property_get_bool
-dbusmenu_menuitem_property_get_int
-dbusmenu_menuitem_property_exist
-dbusmenu_menuitem_properties_list
-dbusmenu_menuitem_properties_copy
-dbusmenu_menuitem_property_remove
-dbusmenu_menuitem_set_root
-dbusmenu_menuitem_get_root
-dbusmenu_menuitem_foreach
-dbusmenu_menuitem_handle_event
-dbusmenu_menuitem_send_about_to_show
-<SUBSECTION Standard>
-DBUSMENU_MENUITEM
-DBUSMENU_IS_MENUITEM
-DBUSMENU_TYPE_MENUITEM
-dbusmenu_menuitem_get_type
-DBUSMENU_MENUITEM_CLASS
-DBUSMENU_IS_MENUITEM_CLASS
-DBUSMENU_MENUITEM_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>server</FILE>
-<TITLE>DbusmenuServer</TITLE>
-DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE
-DBUSMENU_SERVER_SIGNAL_ID_UPDATE
-DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED
-DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE
-DBUSMENU_SERVER_PROP_DBUS_OBJECT
-DBUSMENU_SERVER_PROP_ROOT_NODE
-DBUSMENU_SERVER_PROP_VERSION
-DbusmenuServerClass
-dbusmenu_server_new
-dbusmenu_server_set_root
-<SUBSECTION Standard>
-DBUSMENU_SERVER
-DBUSMENU_IS_SERVER
-DBUSMENU_TYPE_SERVER
-dbusmenu_server_get_type
-DBUSMENU_SERVER_CLASS
-DBUSMENU_IS_SERVER_CLASS
-DBUSMENU_SERVER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>client-menuitem</FILE>
-<TITLE>DbusmenuClientMenuitem</TITLE>
-DBUSMENU_CLIENT_MENUITEM_TYPE
-DbusmenuClientMenuitem
-DbusmenuClientMenuitemClass
-dbusmenu_client_menuitem_new
-<SUBSECTION Standard>
-DBUSMENU_CLIENT_MENUITEM
-DBUSMENU_IS_CLIENT_MENUITEM
-dbusmenu_client_menuitem_get_type
-DBUSMENU_CLIENT_MENUITEM_CLASS
-DBUSMENU_IS_CLIENT_MENUITEM_CLASS
-DBUSMENU_CLIENT_MENUITEM_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>menuitem-proxy</FILE>
-<TITLE>DbusmenuMenuitemProxy</TITLE>
-DbusmenuMenuitemProxy
-DbusmenuMenuitemProxyClass
-dbusmenu_menuitem_proxy_new
-dbusmenu_menuitem_proxy_get_wrapped
-<SUBSECTION Standard>
-DBUSMENU_MENUITEM_PROXY
-DBUSMENU_IS_MENUITEM_PROXY
-DBUSMENU_TYPE_MENUITEM_PROXY
-dbusmenu_menuitem_proxy_get_type
-DBUSMENU_MENUITEM_PROXY_CLASS
-DBUSMENU_IS_MENUITEM_PROXY_CLASS
-DBUSMENU_MENUITEM_PROXY_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>dbusmenu-client</FILE>
-DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu
-org_ayatana_dbusmenu_get_layout
-org_ayatana_dbusmenu_get_layout_reply
-org_ayatana_dbusmenu_get_layout_async
-dbus_g_proxy_begin_call
-org_ayatana_dbusmenu_get_group_properties
-org_ayatana_dbusmenu_get_group_properties_reply
-org_ayatana_dbusmenu_get_group_properties_async
-org_ayatana_dbusmenu_get_children
-org_ayatana_dbusmenu_get_children_reply
-org_ayatana_dbusmenu_get_children_async
-org_ayatana_dbusmenu_get_property
-org_ayatana_dbusmenu_get_property_reply
-org_ayatana_dbusmenu_get_property_async
-org_ayatana_dbusmenu_get_properties
-org_ayatana_dbusmenu_get_properties_reply
-org_ayatana_dbusmenu_get_properties_async
-org_ayatana_dbusmenu_event
-org_ayatana_dbusmenu_event_reply
-org_ayatana_dbusmenu_event_async
-org_ayatana_dbusmenu_about_to_show
-org_ayatana_dbusmenu_about_to_show_reply
-org_ayatana_dbusmenu_about_to_show_async
-</SECTION>
-
-<SECTION>
-<FILE>dbusmenu-server</FILE>
-g_marshal_value_peek_boolean
-g_marshal_value_peek_char
-g_marshal_value_peek_uchar
-g_marshal_value_peek_int
-g_marshal_value_peek_uint
-g_marshal_value_peek_long
-g_marshal_value_peek_ulong
-g_marshal_value_peek_int64
-g_marshal_value_peek_uint64
-g_marshal_value_peek_enum
-g_marshal_value_peek_flags
-g_marshal_value_peek_float
-g_marshal_value_peek_double
-g_marshal_value_peek_string
-g_marshal_value_peek_param
-g_marshal_value_peek_boxed
-g_marshal_value_peek_pointer
-g_marshal_value_peek_object
-dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER
-dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER
-dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER
-dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER
-dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER
-dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER
-</SECTION>
-
diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib.types b/docs/libdbusmenu-glib/reference/libdbusmenu-glib.types
deleted file mode 100644
index a1b7aea..0000000
--- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib.types
+++ /dev/null
@@ -1,5 +0,0 @@
-dbusmenu_client_get_type
-dbusmenu_client_menuitem_get_type
-dbusmenu_menuitem_get_type
-dbusmenu_menuitem_proxy_get_type
-dbusmenu_server_get_type
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml b/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml
deleted file mode 100644
index dd0e9d1..0000000
--- a/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-client.sgml
+++ /dev/null
@@ -1,285 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-dbusmenu-client
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_layout ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_parentId: 
-@OUT_revision: 
-@OUT_layout: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_layout_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_revision: 
-@OUT_layout: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_layout_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_parentId: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
-<para>
-
-</para>
-
-@Param1: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_group_properties ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_ids: 
-@IN_propertyNames: 
-@OUT_properties: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_group_properties_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_properties: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_group_properties_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_ids: 
-@IN_propertyNames: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_children ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_propertyNames: 
-@OUT_properties: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_children_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_properties: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_children_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_propertyNames: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_property ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_name: 
-@OUT_value: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_property_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_value: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_property_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_name: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_properties ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_propertyNames: 
-@OUT_properties: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_get_properties_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_properties: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_get_properties_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_propertyNames: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_event ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_eventId: 
-@IN_data: 
-@IN_timestamp: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_event_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_event_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_eventId: 
-@IN_data: 
-@IN_timestamp: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_about_to_show ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@OUT_needUpdate: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_ayatana_dbusmenu_about_to_show_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_needUpdate: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_ayatana_dbusmenu_about_to_show_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@callback: 
-@Returns: 
-
-
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml b/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml
deleted file mode 100644
index a08ae24..0000000
--- a/docs/libdbusmenu-glib/reference/tmpl/dbusmenu-server.sgml
+++ /dev/null
@@ -1,246 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-dbusmenu-server
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_char ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_int ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_long ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_float ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_double ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_string ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_param ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_object ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
diff --git a/docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml b/docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml
deleted file mode 100644
index f7244f7..0000000
--- a/docs/libdbusmenu-glib/reference/xml/dbusmenu-client.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<refentry id="libdbusmenu-glib-dbusmenu-client">
-<refmeta>
-<refentrytitle role="top_of_page" id="libdbusmenu-glib-dbusmenu-client.top_of_page">dbusmenu-client</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>
-  LIBDBUSMENU-GLIB Library
-</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>dbusmenu-client</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="libdbusmenu-glib-dbusmenu-client.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>#define             <link linkend="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu">DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</link>
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-layout">org_ayatana_dbusmenu_get_layout</link>     (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> *OUT_revision</parameter>,
-                                                         <parameter><link linkend="char"><type>char</type></link> **OUT_layout</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-layout-reply">*org_ayatana_dbusmenu_get_layout_reply</link>)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> OUT_revision</parameter>,
-                                                         <parameter><link linkend="char"><type>char</type></link> *OUT_layout</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-layout-async">org_ayatana_dbusmenu_get_layout_async</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-layout-reply"><type>org_ayatana_dbusmenu_get_layout_reply</type></link> callback</parameter>);
-<link linkend="return"><returnvalue>return</returnvalue></link>              <link linkend="dbus-g-proxy-begin-call">dbus_g_proxy_begin_call</link>             (<parameter><link linkend="proxy"><type>proxy</type></link> Param1</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-group-properties">org_ayatana_dbusmenu_get_group_properties</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-group-properties-reply">*org_ayatana_dbusmenu_get_group_properties_reply</link>)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-group-properties-async">org_ayatana_dbusmenu_get_group_properties_async</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-group-properties-reply"><type>org_ayatana_dbusmenu_get_group_properties_reply</type></link> callback</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-children">org_ayatana_dbusmenu_get_children</link>   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-children-reply">*org_ayatana_dbusmenu_get_children_reply</link>)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-children-async">org_ayatana_dbusmenu_get_children_async</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-children-reply"><type>org_ayatana_dbusmenu_get_children_reply</type></link> callback</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-property">org_ayatana_dbusmenu_get_property</link>   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *OUT_value</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-property-reply">*org_ayatana_dbusmenu_get_property_reply</link>)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> OUT_value</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-property-async">org_ayatana_dbusmenu_get_property_async</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-property-reply"><type>org_ayatana_dbusmenu_get_property_reply</type></link> callback</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-get-properties">org_ayatana_dbusmenu_get_properties</link> (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> **OUT_properties</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-get-properties-reply">*org_ayatana_dbusmenu_get_properties_reply</link>)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> *OUT_properties</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-get-properties-async">org_ayatana_dbusmenu_get_properties_async</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-properties-reply"><type>org_ayatana_dbusmenu_get_properties_reply</type></link> callback</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-event">org_ayatana_dbusmenu_event</link>          (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
-                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-event-reply">*org_ayatana_dbusmenu_event_reply</link>) (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-event-async">org_ayatana_dbusmenu_event_async</link>    (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
-                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-event-reply"><type>org_ayatana_dbusmenu_event_reply</type></link> callback</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="org-ayatana-dbusmenu-about-to-show">org_ayatana_dbusmenu_about_to_show</link>  (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> *OUT_needUpdate</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="org-ayatana-dbusmenu-about-to-show-reply">*org_ayatana_dbusmenu_about_to_show_reply</link>)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> OUT_needUpdate</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);
-<link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    <link linkend="org-ayatana-dbusmenu-about-to-show-async">org_ayatana_dbusmenu_about_to_show_async</link>
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-about-to-show-reply"><type>org_ayatana_dbusmenu_about_to_show_reply</type></link> callback</parameter>);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="libdbusmenu-glib-dbusmenu-client.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-</para>
-</refsect1>
-<refsect1 id="libdbusmenu-glib-dbusmenu-client.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu" role="macro">
-<title>DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</title>
-<indexterm zone="DBUS-GLIB-CLIENT-WRAPPERS-org-ayatana-dbusmenu"><primary>DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu</primary></indexterm>
-<programlisting>#define DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_dbusmenu
-</programlisting>
-<para>
-</para></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-layout" role="function">
-<title>org_ayatana_dbusmenu_get_layout ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-layout"><primary>org_ayatana_dbusmenu_get_layout</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_layout     (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> *OUT_revision</parameter>,
-                                                         <parameter><link linkend="char"><type>char</type></link> **OUT_layout</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_parentId</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_revision</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_layout</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-layout-reply" role="function">
-<title>org_ayatana_dbusmenu_get_layout_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-layout-reply"><primary>org_ayatana_dbusmenu_get_layout_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_layout_reply)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> OUT_revision</parameter>,
-                                                         <parameter><link linkend="char"><type>char</type></link> *OUT_layout</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_revision</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_layout</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-layout-async" role="function">
-<title>org_ayatana_dbusmenu_get_layout_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-layout-async"><primary>org_ayatana_dbusmenu_get_layout_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_layout_async
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_parentId</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-layout-reply"><type>org_ayatana_dbusmenu_get_layout_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_parentId</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-g-proxy-begin-call" role="function">
-<title>dbus_g_proxy_begin_call ()</title>
-<indexterm zone="dbus-g-proxy-begin-call"><primary>dbus_g_proxy_begin_call</primary></indexterm>
-<programlisting><link linkend="return"><returnvalue>return</returnvalue></link>              dbus_g_proxy_begin_call             (<parameter><link linkend="proxy"><type>proxy</type></link> Param1</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>Param1</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-group-properties" role="function">
-<title>org_ayatana_dbusmenu_get_group_properties ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-group-properties"><primary>org_ayatana_dbusmenu_get_group_properties</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_group_properties
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_ids</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-group-properties-reply" role="function">
-<title>org_ayatana_dbusmenu_get_group_properties_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-group-properties-reply"><primary>org_ayatana_dbusmenu_get_group_properties_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_group_properties_reply)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-group-properties-async" role="function">
-<title>org_ayatana_dbusmenu_get_group_properties_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-group-properties-async"><primary>org_ayatana_dbusmenu_get_group_properties_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_group_properties_async
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="GArray"><type>GArray</type></link> *IN_ids</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-group-properties-reply"><type>org_ayatana_dbusmenu_get_group_properties_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_ids</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-children" role="function">
-<title>org_ayatana_dbusmenu_get_children ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-children"><primary>org_ayatana_dbusmenu_get_children</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_children   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> **OUT_properties</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-children-reply" role="function">
-<title>org_ayatana_dbusmenu_get_children_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-children-reply"><primary>org_ayatana_dbusmenu_get_children_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_children_reply)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *OUT_properties</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-children-async" role="function">
-<title>org_ayatana_dbusmenu_get_children_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-children-async"><primary>org_ayatana_dbusmenu_get_children_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_children_async
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-children-reply"><type>org_ayatana_dbusmenu_get_children_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-property" role="function">
-<title>org_ayatana_dbusmenu_get_property ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-property"><primary>org_ayatana_dbusmenu_get_property</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_property   (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *OUT_value</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_name</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-property-reply" role="function">
-<title>org_ayatana_dbusmenu_get_property_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-property-reply"><primary>org_ayatana_dbusmenu_get_property_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_property_reply)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> OUT_value</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-property-async" role="function">
-<title>org_ayatana_dbusmenu_get_property_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-property-async"><primary>org_ayatana_dbusmenu_get_property_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_property_async
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_name</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-property-reply"><type>org_ayatana_dbusmenu_get_property_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_name</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-properties" role="function">
-<title>org_ayatana_dbusmenu_get_properties ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-properties"><primary>org_ayatana_dbusmenu_get_properties</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_get_properties (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> **OUT_properties</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-properties-reply" role="function">
-<title>org_ayatana_dbusmenu_get_properties_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-properties-reply"><primary>org_ayatana_dbusmenu_get_properties_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_get_properties_reply)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GHashTable"><type>GHashTable</type></link> *OUT_properties</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_properties</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-get-properties-async" role="function">
-<title>org_ayatana_dbusmenu_get_properties_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-get-properties-async"><primary>org_ayatana_dbusmenu_get_properties_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_get_properties_async
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> **IN_propertyNames</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-get-properties-reply"><type>org_ayatana_dbusmenu_get_properties_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_propertyNames</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-event" role="function">
-<title>org_ayatana_dbusmenu_event ()</title>
-<indexterm zone="org-ayatana-dbusmenu-event"><primary>org_ayatana_dbusmenu_event</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_event          (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
-                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_eventId</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_timestamp</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-event-reply" role="function">
-<title>org_ayatana_dbusmenu_event_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-event-reply"><primary>org_ayatana_dbusmenu_event_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_event_reply) (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-event-async" role="function">
-<title>org_ayatana_dbusmenu_event_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-event-async"><primary>org_ayatana_dbusmenu_event_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_event_async    (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter>const <link linkend="char"><type>char</type></link> *IN_eventId</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *IN_data</parameter>,
-                                                         <parameter>const <link linkend="guint"><type>guint</type></link> IN_timestamp</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-event-reply"><type>org_ayatana_dbusmenu_event_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_eventId</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_timestamp</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-about-to-show" role="function">
-<title>org_ayatana_dbusmenu_about_to_show ()</title>
-<indexterm zone="org-ayatana-dbusmenu-about-to-show"><primary>org_ayatana_dbusmenu_about_to_show</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            org_ayatana_dbusmenu_about_to_show  (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> *OUT_needUpdate</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_needUpdate</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-about-to-show-reply" role="function">
-<title>org_ayatana_dbusmenu_about_to_show_reply ()</title>
-<indexterm zone="org-ayatana-dbusmenu-about-to-show-reply"><primary>org_ayatana_dbusmenu_about_to_show_reply</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*org_ayatana_dbusmenu_about_to_show_reply)
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter><link linkend="gboolean"><type>gboolean</type></link> OUT_needUpdate</parameter>,
-                                                         <parameter><link linkend="GError"><type>GError</type></link> *error</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> userdata</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>OUT_needUpdate</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>userdata</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="org-ayatana-dbusmenu-about-to-show-async" role="function">
-<title>org_ayatana_dbusmenu_about_to_show_async ()</title>
-<indexterm zone="org-ayatana-dbusmenu-about-to-show-async"><primary>org_ayatana_dbusmenu_about_to_show_async</primary></indexterm>
-<programlisting><link linkend="DBusGProxyCall"><returnvalue>DBusGProxyCall</returnvalue></link> *    org_ayatana_dbusmenu_about_to_show_async
-                                                        (<parameter><link linkend="DBusGProxy"><type>DBusGProxy</type></link> *proxy</parameter>,
-                                                         <parameter>const <link linkend="gint"><type>gint</type></link> IN_id</parameter>,
-                                                         <parameter><link linkend="org-ayatana-dbusmenu-about-to-show-reply"><type>org_ayatana_dbusmenu_about_to_show_reply</type></link> callback</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>proxy</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>IN_id</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-</refentry>
diff --git a/docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml b/docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml
deleted file mode 100644
index 836e1d6..0000000
--- a/docs/libdbusmenu-glib/reference/xml/dbusmenu-server.xml
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<refentry id="libdbusmenu-glib-dbusmenu-server">
-<refmeta>
-<refentrytitle role="top_of_page" id="libdbusmenu-glib-dbusmenu-server.top_of_page">dbusmenu-server</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>
-  LIBDBUSMENU-GLIB Library
-</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>dbusmenu-server</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="libdbusmenu-glib-dbusmenu-server.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>#define             <link linkend="g-marshal-value-peek-boolean">g_marshal_value_peek_boolean</link>        (v)
-#define             <link linkend="g-marshal-value-peek-char">g_marshal_value_peek_char</link>           (v)
-#define             <link linkend="g-marshal-value-peek-uchar">g_marshal_value_peek_uchar</link>          (v)
-#define             <link linkend="g-marshal-value-peek-int">g_marshal_value_peek_int</link>            (v)
-#define             <link linkend="g-marshal-value-peek-uint">g_marshal_value_peek_uint</link>           (v)
-#define             <link linkend="g-marshal-value-peek-long">g_marshal_value_peek_long</link>           (v)
-#define             <link linkend="g-marshal-value-peek-ulong">g_marshal_value_peek_ulong</link>          (v)
-#define             <link linkend="g-marshal-value-peek-int64">g_marshal_value_peek_int64</link>          (v)
-#define             <link linkend="g-marshal-value-peek-uint64">g_marshal_value_peek_uint64</link>         (v)
-#define             <link linkend="g-marshal-value-peek-enum">g_marshal_value_peek_enum</link>           (v)
-#define             <link linkend="g-marshal-value-peek-flags">g_marshal_value_peek_flags</link>          (v)
-#define             <link linkend="g-marshal-value-peek-float">g_marshal_value_peek_float</link>          (v)
-#define             <link linkend="g-marshal-value-peek-double">g_marshal_value_peek_double</link>         (v)
-#define             <link linkend="g-marshal-value-peek-string">g_marshal_value_peek_string</link>         (v)
-#define             <link linkend="g-marshal-value-peek-param">g_marshal_value_peek_param</link>          (v)
-#define             <link linkend="g-marshal-value-peek-boxed">g_marshal_value_peek_boxed</link>          (v)
-#define             <link linkend="g-marshal-value-peek-pointer">g_marshal_value_peek_pointer</link>        (v)
-#define             <link linkend="g-marshal-value-peek-object">g_marshal_value_peek_object</link>         (v)
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</link>
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</link>
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</link>
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</link>
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</link>
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER">dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</link>
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="libdbusmenu-glib-dbusmenu-server.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-</para>
-</refsect1>
-<refsect1 id="libdbusmenu-glib-dbusmenu-server.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="g-marshal-value-peek-boolean" role="macro">
-<title>g_marshal_value_peek_boolean()</title>
-<indexterm zone="g-marshal-value-peek-boolean"><primary>g_marshal_value_peek_boolean</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_boolean(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-char" role="macro">
-<title>g_marshal_value_peek_char()</title>
-<indexterm zone="g-marshal-value-peek-char"><primary>g_marshal_value_peek_char</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_char(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-uchar" role="macro">
-<title>g_marshal_value_peek_uchar()</title>
-<indexterm zone="g-marshal-value-peek-uchar"><primary>g_marshal_value_peek_uchar</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_uchar(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-int" role="macro">
-<title>g_marshal_value_peek_int()</title>
-<indexterm zone="g-marshal-value-peek-int"><primary>g_marshal_value_peek_int</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_int(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-uint" role="macro">
-<title>g_marshal_value_peek_uint()</title>
-<indexterm zone="g-marshal-value-peek-uint"><primary>g_marshal_value_peek_uint</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_uint(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-long" role="macro">
-<title>g_marshal_value_peek_long()</title>
-<indexterm zone="g-marshal-value-peek-long"><primary>g_marshal_value_peek_long</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_long(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-ulong" role="macro">
-<title>g_marshal_value_peek_ulong()</title>
-<indexterm zone="g-marshal-value-peek-ulong"><primary>g_marshal_value_peek_ulong</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_ulong(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-int64" role="macro">
-<title>g_marshal_value_peek_int64()</title>
-<indexterm zone="g-marshal-value-peek-int64"><primary>g_marshal_value_peek_int64</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_int64(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-uint64" role="macro">
-<title>g_marshal_value_peek_uint64()</title>
-<indexterm zone="g-marshal-value-peek-uint64"><primary>g_marshal_value_peek_uint64</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_uint64(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-enum" role="macro">
-<title>g_marshal_value_peek_enum()</title>
-<indexterm zone="g-marshal-value-peek-enum"><primary>g_marshal_value_peek_enum</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_enum(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-flags" role="macro">
-<title>g_marshal_value_peek_flags()</title>
-<indexterm zone="g-marshal-value-peek-flags"><primary>g_marshal_value_peek_flags</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_flags(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-float" role="macro">
-<title>g_marshal_value_peek_float()</title>
-<indexterm zone="g-marshal-value-peek-float"><primary>g_marshal_value_peek_float</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_float(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-double" role="macro">
-<title>g_marshal_value_peek_double()</title>
-<indexterm zone="g-marshal-value-peek-double"><primary>g_marshal_value_peek_double</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_double(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-string" role="macro">
-<title>g_marshal_value_peek_string()</title>
-<indexterm zone="g-marshal-value-peek-string"><primary>g_marshal_value_peek_string</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_string(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-param" role="macro">
-<title>g_marshal_value_peek_param()</title>
-<indexterm zone="g-marshal-value-peek-param"><primary>g_marshal_value_peek_param</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_param(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-boxed" role="macro">
-<title>g_marshal_value_peek_boxed()</title>
-<indexterm zone="g-marshal-value-peek-boxed"><primary>g_marshal_value_peek_boxed</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_boxed(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-pointer" role="macro">
-<title>g_marshal_value_peek_pointer()</title>
-<indexterm zone="g-marshal-value-peek-pointer"><primary>g_marshal_value_peek_pointer</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_pointer(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-marshal-value-peek-object" role="macro">
-<title>g_marshal_value_peek_object()</title>
-<indexterm zone="g-marshal-value-peek-object"><primary>g_marshal_value_peek_object</primary></indexterm>
-<programlisting>#define             g_marshal_value_peek_object(v)</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>v</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER" role="function">
-<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER ()</title>
-<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_POINTER_POINTER
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>closure</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER" role="function">
-<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER ()</title>
-<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER_POINTER
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>closure</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER" role="function">
-<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER ()</title>
-<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-BOXED-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_BOXED_POINTER_POINTER
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>closure</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER" role="function">
-<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER ()</title>
-<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-STRING-BOXED-UINT-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_STRING_BOXED_UINT_POINTER
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>closure</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER" role="function">
-<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER ()</title>
-<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--INT-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__INT_POINTER_POINTER
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>closure</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER" role="function">
-<title>dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER ()</title>
-<indexterm zone="dbus-glib-marshal--dbusmenu-server-BOOLEAN--BOXED-BOXED-POINTER-POINTER"><primary>dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbus_glib_marshal__dbusmenu_server_BOOLEAN__BOXED_BOXED_POINTER_POINTER
-                                                        (<parameter><link linkend="GClosure"><type>GClosure</type></link> *closure</parameter>,
-                                                         <parameter><link linkend="GValue"><type>GValue</type></link> *return_value</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> n_param_values</parameter>,
-                                                         <parameter>const <link linkend="GValue"><type>GValue</type></link> *param_values</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> invocation_hint</parameter>,
-                                                         <parameter><link linkend="gpointer"><type>gpointer</type></link> marshal_data</parameter>);</programlisting>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>closure</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>return_value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n_param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>param_values</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invocation_hint</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>marshal_data</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-</refentry>
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
deleted file mode 100644
index 2cfa1e7..0000000
--- a/m4/gtk-doc.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
-  dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH([html-dir],
-    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST([HTML_DIR])
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE([gtk-doc],
-    AS_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [[default=no]]]),,
-    [enable_gtk_doc=no])
-
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-  fi
-
-  AC_MSG_CHECKING([whether to build gtk-doc documentation])
-  AC_MSG_RESULT($enable_gtk_doc)
-
-  dnl enable/disable output formats
-  AC_ARG_ENABLE([gtk-doc-html],
-    AS_HELP_STRING([--enable-gtk-doc-html],
-                   [build documentation in html format [[default=yes]]]),,
-    [enable_gtk_doc_html=yes])
-    AC_ARG_ENABLE([gtk-doc-pdf],
-      AS_HELP_STRING([--enable-gtk-doc-pdf],
-                     [build documentation in pdf format [[default=no]]]),,
-      [enable_gtk_doc_pdf=no])
-
-  if test -z "$GTKDOC_MKPDF"; then
-    enable_gtk_doc_pdf=no
-  fi
-
-
-  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])
-- 
cgit v1.2.3


From 858027328dada43f30eb2db96ecff33abd3b0974 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 12:38:31 -0500
Subject: releasing version 0.3.2-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea500cd..b566f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Set the 'child-display' property on menuitems that
@@ -6,7 +6,7 @@ libdbusmenu (0.3.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * gtk-doc support
     * Document the 'shortcut' property
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Jun 2010 12:21:31 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Jun 2010 12:38:27 -0500
 
 libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From c6d95ac4d53118c0a2f4b05c760bd03cc55e8c67 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Fri, 11 Jun 2010 18:09:16 +0200
Subject: releasing version 0.3.2-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 501c75b..773863f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.2-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
   * debian/control
     - added doc packages
-- 
cgit v1.2.3


From aaf2c098253373978f5a42fedc37ead470d0bea9 Mon Sep 17 00:00:00 2001
From: unknown <sargentd@die-welt.net>
Date: Tue, 15 Jun 2010 19:27:15 +0200
Subject: Merge from Ubuntu.

* debian/control:
  - Set Maintainer to pkg-ayatana.
  - Add myself as Uploader.
---
 debian/changelog | 9 +++++++++
 debian/control   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 773863f..5979a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdbusmenu (0.3.2-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+  * debian/control:
+    - Set Maintainer to pkg-ayatana.
+    - Add myself as Uploader.
+
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:25:56 +0200
+
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
   * debian/control
diff --git a/debian/control b/debian/control
index 9ddb90b..44fcfb9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libdbusmenu
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.12.0),
-- 
cgit v1.2.3


From 4d513a2d48b3a9e2bb0108050166b83e3e41b69d Mon Sep 17 00:00:00 2001
From: unknown <sargentd@die-welt.net>
Date: Tue, 15 Jun 2010 19:28:37 +0200
Subject: debian/copyright: Convert to DEP5 format.

---
 debian/changelog |  4 +++-
 debian/copyright | 70 ++++++++++++++------------------------------------------
 2 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5979a5f..a1e2f75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
   * debian/control:
     - Set Maintainer to pkg-ayatana.
     - Add myself as Uploader.
+  * debian/copyright:
+    - Convert to DEP5 format.
 
- -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:25:56 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:28:18 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 074097c..f4035f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,17 @@
-This package was debianized by Ted Gould <ted@canonical.com> on
-Wed, 11 Feb 2009 15:41:06 -0600.
-
-It was downloaded from <http://launchpad.net/indicator-applet/>
-
-Upstream Author:
-
-    Ted Gould <ted@canonical.com>
-
-Copyright:
-
-    Copyright (C) 2009 Canonical Ltd.
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-License for libindicate/* (libindicate0 and libindicate-dev packages):
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 or 3 of the License.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL-2.1' and
-`/usr/share/common-licenses/LGPL-3'.
-
-The Debian packaging is (C) 2009, Canonical Ltd. and
-is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: libdbusmenu
+Maintainer: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/dbusmenu
+
+Files: *
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-- 
cgit v1.2.3


From 05c812550569d64b3573a5fcf2fe8b66bb5906a9 Mon Sep 17 00:00:00 2001
From: unknown <sargentd@die-welt.net>
Date: Tue, 15 Jun 2010 19:30:24 +0200
Subject: Update package descriptions.

---
 debian/changelog |  3 ++-
 debian/control   | 66 ++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1e2f75..b45ea54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,11 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
   * debian/control:
     - Set Maintainer to pkg-ayatana.
     - Add myself as Uploader.
+    - Update package descriptions.
   * debian/copyright:
     - Convert to DEP5 format.
 
- -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:28:18 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:30:08 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 44fcfb9..8041076 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,11 @@ Depends: ${shlibs:Depends},
 Breaks: indicator-messages (<< 0.3.0),
         indicator-session (<< 0.2.0),
         libdbusmenu-glib0
-Description: Menus over DBus shared library for glib
+Description: library for passing menus over DBus
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
  This package contains shared libraries to be used by applications.
 
 Package: libdbusmenu-glib-dev
@@ -43,18 +47,24 @@ Depends: ${shlibs:Depends},
          libdbusmenu-glib1 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
-Description: Menus over DBus shared library
- This package contains files that are needed to build applications.
+Description: library for passing menus over DBus - development files
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package provides the development files.
+ This package contains files that are needed to build applications.
 
 Package: libdbusmenu-gtk1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Menus over DBus shared library for GTK
- This package contains shared libraries to be used by applications.
+Description: library for passing menus over DBus - GTK version
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package contains shared libraries to be used by GTK applications.
 
 Package: libdbusmenu-gtk-dev
 Section: libdevel
@@ -65,10 +75,12 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
-Description: Menus over DBus shared library for GTK
- This package contains files that are needed to build applications.
+Description: library for passing menus over DBus - GTK version developement files
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package provides the development files.
+ This package contains files that are needed to build GTK applications.
 
 Package: libdbusmenu-tools
 Section: devel
@@ -77,9 +89,13 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
          libdbusmenu-glib1 (= ${binary:Version})
-Description: Tools useful during development with libdbusmenu
+Description: tools useful during development with libdbusmenu
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package contains tools that are useful when building applications.
+ This package contains tools that are useful when developing and building
+ applications with libdbusmenu.
 
 Package: gir1.0-dbusmenu-glib-0.2
 Section: libs
@@ -87,10 +103,13 @@ Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-glib1 (= ${binary:Version}),
          gir1.0-glib-2.0
-Description: Typelib file for libdbusmenu-glib1
+Description: typelib file for libdbusmenu-glib1
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings
+ generate dynamic bindings for libdbusmenu-glib1.
 
 Package: gir1.0-dbusmenu-gtk-0.2
 Section: libs
@@ -99,24 +118,33 @@ Depends: ${misc:Depends},
          libdbusmenu-gtk1 (= ${binary:Version}),
          gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
          gir1.0-gtk-2.0
-Description: Typelib file for libdbusmenu-gtk1
+Description: typelib file for libdbusmenu-gtk1
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings
+ generate dynamic bindings for libdbusmenu-gtk1.
 
 Package: libdbusmenu-glib-doc
 Section: doc
 Architecture: any
 Depends: ${misc:Depends}
-Description: Docs for libdbusmenu-glib
+Description: library for passing menus over DBus - documentation
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package contains developer documentation.
+ This package contains developer documentation for libdbusmenu-glib.
 
 Package: libdbusmenu-gtk-doc
 Section: doc
 Architecture: any
 Depends: ${misc:Depends}
-Description: Docs for libdbusmenu-gtk
+Description: library for passing menus over DBus - GTK version documentation
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package contains developer documentation.
+ This package contains developer documentation for libdbusmenu-gtk.
 
-- 
cgit v1.2.3


From 5272ac12e39c3a45d9f5016df7c48b3b6508c400 Mon Sep 17 00:00:00 2001
From: unknown <sargentd@die-welt.net>
Date: Tue, 15 Jun 2010 19:31:27 +0200
Subject:   - Standards-Version: 3.8.4   - Fix Homepage URL.

---
 debian/changelog | 4 +++-
 debian/control   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b45ea54..a31f749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,12 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
     - Set Maintainer to pkg-ayatana.
     - Add myself as Uploader.
     - Update package descriptions.
+    - Standards-Version: 3.8.4
+    - Fix Homepage URL.
   * debian/copyright:
     - Convert to DEP5 format.
 
- -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:30:08 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:31:00 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 8041076..47b64b1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                valac
-Standards-Version: 3.8.0
-Homepage: https://launchpad.net/libdbusmenu
+Standards-Version: 3.8.4
+Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 
-- 
cgit v1.2.3


From c7155ebdb13500400902b0600c77115375c193f2 Mon Sep 17 00:00:00 2001
From: unknown <sargentd@die-welt.net>
Date: Tue, 15 Jun 2010 19:39:34 +0200
Subject: Update Vcs-* fields.

---
 debian/changelog | 3 ++-
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a31f749..47693e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,11 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
     - Update package descriptions.
     - Standards-Version: 3.8.4
     - Fix Homepage URL.
+    - Update Vcs-* fields.
   * debian/copyright:
     - Convert to DEP5 format.
 
- -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:31:00 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:39:15 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 47b64b1..ed86b8a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends: debhelper (>= 5.0),
                valac
 Standards-Version: 3.8.4
 Homepage: https://launchpad.net/dbusmenu
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian
+Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian
 
 Package: libdbusmenu-glib1
 Section: libs
-- 
cgit v1.2.3


From 55657e2b8c812cb5a829e59cbaf2125c94dcf138 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Wed, 16 Jun 2010 08:42:27 +0200
Subject: Add Ken and Sebastien, according to changelog.

---
 debian/changelog | 3 ++-
 debian/copyright | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 47693e5..198da55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
     - Update Vcs-* fields.
   * debian/copyright:
     - Convert to DEP5 format.
+    - Add Ken and Sebastien, according to changelog.
 
- -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:39:15 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 08:42:03 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index f4035f6..530ad85 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,8 @@ License: GPL-3
 Files: debian/*
 Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
 Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+Copyright: 2009-2010 Sebastien Bacher <seb128@ubuntu.com>
+Copyright: 2009-2010 Ken VanDine <ken.vandine@canonical.com>
 License: GPL-3
 
 License: GPL-3
-- 
cgit v1.2.3


From acd48e74157f74bb50c451a7f47e7d8c2f45efbb Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Wed, 16 Jun 2010 09:43:19 +0200
Subject: Add a Closes: #586069

---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 198da55..04dc307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdbusmenu (0.3.2-1) unstable; urgency=low
 
   * Merge from Ubuntu.
+    Closes: #586069
   * debian/control:
     - Set Maintainer to pkg-ayatana.
     - Add myself as Uploader.
@@ -12,7 +13,7 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
     - Convert to DEP5 format.
     - Add Ken and Sebastien, according to changelog.
 
- -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 08:42:03 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 09:43:06 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 614d3fc2311780a4011d24b5e59e18b857b36b9c Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Wed, 16 Jun 2010 11:37:27 +0200
Subject: =?UTF-8?q?Add=20Aur=C3=A9lien=20G=C3=A2teau,=20according=20to=20h?=
 =?UTF-8?q?eaders.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog | 3 ++-
 debian/copyright | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 04dc307..9551d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
   * debian/copyright:
     - Convert to DEP5 format.
     - Add Ken and Sebastien, according to changelog.
+    - Add Aurélien Gâteau, according to headers.
 
- -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 09:43:06 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 11:37:08 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 530ad85..161670c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,13 @@ Files: *
 Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
 License: GPL-3
 
+Files: libdbusmenu-glib/dbus-menu.xml, tools/{dbusmenu-bench,testapp/main.c}
+
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+Copyright: 2009-2010 Aurélien Gâteau <aurelien.gateau@canonical.com>
+
+License: GPL-3
+
 Files: debian/*
 Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
 Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
-- 
cgit v1.2.3


From f589927de79fe437cdd2014d62e2f2e7b37ad266 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Wed, 16 Jun 2010 11:58:53 +0200
Subject: More parts are LGPL...

---
 debian/copyright | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 161670c..6d7c11b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,12 +7,18 @@ Files: *
 Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
 License: GPL-3
 
-Files: libdbusmenu-glib/dbus-menu.xml, tools/{dbusmenu-bench,testapp/main.c}
+Files: libdbusmenu-{glib,gtk}/*
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: LGPL-2.1 | LGPL-3
 
+Files: libdbusmenu-glib/dbus-menu.xml
 Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
 Copyright: 2009-2010 Aurélien Gâteau <aurelien.gateau@canonical.com>
+License: LGPL-2.1 | LGPL-3
 
-License: GPL-3
+Files: tools/{dbusmenu-bench,testapp/main.c}
+Copyright: 2009-2010 Aurélien Gâteau <aurelien.gateau@canonical.com>
+License: LGPL-2.1 | LGPL-3
 
 Files: debian/*
 Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
@@ -24,3 +30,11 @@ License: GPL-3
 License: GPL-3
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: LGPL-3
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'.
-- 
cgit v1.2.3


From da753d7953b6abe0ed14009eddc7e50a0617ca8f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 16 Jun 2010 10:45:30 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f8cbdd..6a58506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa1) lucid; urgency=low
 
   * Merging in Debian branch
   * debian/control: Switching branch on this branch to be the
     dbusmenu-team.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 16 Jun 2010 10:38:24 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 16 Jun 2010 10:45:24 -0500
 
 libdbusmenu (0.3.2-1) unstable; urgency=low
 
-- 
cgit v1.2.3


From 2dfaa21730da0cb153d45bfa5a9d2110c7e1a379 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Sun, 20 Jun 2010 13:56:19 +0200
Subject: -doc packages are Arch:all

---
 debian/changelog | 3 ++-
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9551d8f..9d34249 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,13 @@ libdbusmenu (0.3.2-1) unstable; urgency=low
     - Standards-Version: 3.8.4
     - Fix Homepage URL.
     - Update Vcs-* fields.
+    - -doc packages are Arch:all
   * debian/copyright:
     - Convert to DEP5 format.
     - Add Ken and Sebastien, according to changelog.
     - Add Aurélien Gâteau, according to headers.
 
- -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 11:37:08 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 20 Jun 2010 13:56:00 +0200
 
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index ed86b8a..f5e0b20 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,7 @@ Description: typelib file for libdbusmenu-gtk1
 
 Package: libdbusmenu-glib-doc
 Section: doc
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends}
 Description: library for passing menus over DBus - documentation
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -139,7 +139,7 @@ Description: library for passing menus over DBus - documentation
 
 Package: libdbusmenu-gtk-doc
 Section: doc
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends}
 Description: library for passing menus over DBus - GTK version documentation
  libdbusmenu passes a menu structure across DBus so that a program can
-- 
cgit v1.2.3


From 5259846f36df1eb4703c56cae6a08a4bd0b4ed15 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Sun, 20 Jun 2010 14:17:47 +0200
Subject: s/GTK/GTK+/

---
 debian/control | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index f5e0b20..8f4ca78 100644
--- a/debian/control
+++ b/debian/control
@@ -59,12 +59,12 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: library for passing menus over DBus - GTK version
+Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
- This package contains shared libraries to be used by GTK applications.
+ This package contains shared libraries to be used by GTK+ applications.
 
 Package: libdbusmenu-gtk-dev
 Section: libdevel
@@ -75,12 +75,12 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
-Description: library for passing menus over DBus - GTK version developement files
+Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
- This package contains files that are needed to build GTK applications.
+ This package contains files that are needed to build GTK+ applications.
 
 Package: libdbusmenu-tools
 Section: devel
@@ -141,7 +141,7 @@ Package: libdbusmenu-gtk-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: library for passing menus over DBus - GTK version documentation
+Description: library for passing menus over DBus - GTK+ version documentation
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
-- 
cgit v1.2.3


From 55338f48370c4e0007aff36c8b18add4ace435f6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Jun 2010 15:19:20 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6021bd6..a1a828a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * Adding support for menu shortcuts
     * Fixing distcheck of documentation builds
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Jun 2010 15:07:09 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Jun 2010 15:19:18 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From ba00c24b625805e7c3069165c6eea5bca5166e22 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 11:28:22 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa3

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cd73096..d5dfe16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ libdbusmenu (0.3.2-1ubuntu1~ppa3) lucid; urgency=low
   * Upstream Merge
     * Fixing getting accelerators from menuitems
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 11:10:59 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 11:28:20 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa2) lucid; urgency=low
 
-- 
cgit v1.2.3


From d80fb4eb8fc807b1b29b58aa179eb3e1798f37a3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 14:24:29 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa4~value1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb7d982..f0819eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa4~value1) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa4~value1) lucid; urgency=low
 
   * Upstream Merge
     * Checking to ensure our values are what we expect
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:21:45 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:24:27 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa3) lucid; urgency=low
 
-- 
cgit v1.2.3


From 8d57fff00109f049fc4f5341bc5c9ae09390d163 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 14:40:06 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa4~value2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f806527..45f2aaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa4~value2) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa4~value2) lucid; urgency=low
 
   * Upstream Merge
     * Looking further inside the boxes
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:37:39 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:40:04 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa4~value1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 686186c381b90215ddc737e71abb40b7ecaf31db Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 14:50:57 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa4~value3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 443006e..040b156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa4~value3) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa4~value3) lucid; urgency=low
 
   * Upstream Merge
     * Useful warning messages
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:48:56 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:50:52 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa4~value2) lucid; urgency=low
 
-- 
cgit v1.2.3


From d5550be789ee837d4fa591540fc323f6b39844d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 14:55:54 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8abbfdb..de20360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa4) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa4) lucid; urgency=low
 
   * Upstream Merge
     * Checking to ensure our values are what we expect
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:53:43 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 14:55:51 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa3) lucid; urgency=low
 
-- 
cgit v1.2.3


From b95497795ac8031074789ee3b6eee2be899ac909 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 16:40:13 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5~qtish1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ef6dd1..b22ff71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish1) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish1) lucid; urgency=low
 
   * Upstream Merge
     * Changing the format on the get side of things
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 16:37:31 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 16:40:11 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa4) lucid; urgency=low
 
-- 
cgit v1.2.3


From 4a45de3ee535be012fe60ec1595ba64fb24b5f47 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Jun 2010 16:52:52 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5~qtish2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e1682f..968394b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish2) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish2) lucid; urgency=low
 
   * Upstream merge
     * Lowering protection on type checking
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 16:51:01 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Jun 2010 16:52:50 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 5796a8b58028ecfea05170cff28e01b4a8b447da Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Jun 2010 09:23:34 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5~qtish3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f184645..1230117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish3) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish3) lucid; urgency=low
 
   * Upstream merge
   	* Checking for collections
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 09:19:02 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 09:23:31 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish2) lucid; urgency=low
 
-- 
cgit v1.2.3


From 63981f35032b58893c6ab436cfdb517b6c3d8b23 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Jun 2010 10:26:59 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5~qtish4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d4c85a..614f377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish4) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish4) lucid; urgency=low
 
   * Upstream merge
     * Switching to using collection iterators
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 10:18:49 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 10:26:57 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish3) lucid; urgency=low
 
-- 
cgit v1.2.3


From 79564f92477a33f79c3f157d16899a8eca770b8f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Jun 2010 11:03:33 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5~qtish5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b373824..b5a3ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish5) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish5) lucid; urgency=low
 
   * Upstream merge
     * No internal collections.  Eh, whatever.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 10:50:36 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 11:03:30 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish4) lucid; urgency=low
 
-- 
cgit v1.2.3


From 4cfd3c91edbc71fa9a5dea2e147eb07ca7b295cf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Jun 2010 14:53:10 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5~qtish6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35a2ad9..0ea7bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish6) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish6) lucid; urgency=low
 
   * Upstream Merge
     * Fixing our setting of the shortcut to match the same
       collection style structure.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 14:51:10 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Jun 2010 14:53:08 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish5) lucid; urgency=low
 
-- 
cgit v1.2.3


From e9980c6707db96611eecb0189e712422499c1e82 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Jun 2010 09:01:04 -0500
Subject: releasing version 0.3.2-1ubuntu1~ppa5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84d92ca..4950b42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.2-1ubuntu1~ppa5) UNRELEASED; urgency=low
+libdbusmenu (0.3.2-1ubuntu1~ppa5) lucid; urgency=low
 
   * Upstream merge
     * Changing the shortcut implementation to match the Qt
       implementation of dbusmenu.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Jun 2010 08:57:34 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Jun 2010 09:01:02 -0500
 
 libdbusmenu (0.3.2-1ubuntu1~ppa4) lucid; urgency=low
 
-- 
cgit v1.2.3


From cffbc900aed2cdf265dbde3fc94cd329890836ee Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Jun 2010 09:30:46 -0500
Subject: debian/rules: Updating shlibs to 0.3.3 for shortcut API additions

---
 debian/changelog | 3 ++-
 debian/rules     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e92735f..406ca2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ libdbusmenu (0.3.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * Merging in Debian branch
   * debian/control: Switching branch on this branch to be the
     dbusmenu-team.
+  * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Jun 2010 09:21:02 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Jun 2010 09:30:21 -0500
 
 libdbusmenu (0.3.2-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 4f08dbf..e274757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.1)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.3)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.3.3)'
 
-- 
cgit v1.2.3


From 32f588f06d63bc4742a4718f6212027aface0137 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Jun 2010 09:32:51 -0500
Subject: releasing version 0.3.3-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 406ca2f..0d72f63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Adding support for menu shortcuts (LP: #591293)
@@ -10,7 +10,7 @@ libdbusmenu (0.3.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
     dbusmenu-team.
   * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Jun 2010 09:30:21 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Jun 2010 09:32:42 -0500
 
 libdbusmenu (0.3.2-1) unstable; urgency=low
 
-- 
cgit v1.2.3


From 01780416e8c1267838892fb6d114a84fe33dc590 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Thu, 24 Jun 2010 18:18:44 +0200
Subject: releasing version 0.3.3-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5f1ecf8..d6a12b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.3-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
     * Adding support for menu shortcuts (LP: #591293)
-- 
cgit v1.2.3


From 14a121728b0b55a9328d89192f1e83700aa8e6c4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 13:12:21 -0500
Subject: releasing version 0.3.3-0ubuntu1~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10985b2..fcad74a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.3-0ubuntu1~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu1~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * Fixing up value handling in dbusmenu-dumper
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 13:01:00 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 13:12:19 -0500
 
 libdbusmenu (0.3.3-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 9dc2095a918b79246713d205b1716358f5d012ec Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 13:15:17 -0500
Subject: releasing version 0.3.3-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cc719c..243747c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.3-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Fixing up value handling in dbusmenu-dumper
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 13:14:13 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 13:15:12 -0500
 
 libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 5e54132c29425bd70fc89ed44e42a6e072aa1162 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 23:05:30 -0500
Subject: Autogen

---
 configure         |  31 +++--
 debian/changelog  |   3 +-
 tests/Makefile.in | 364 +++++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 330 insertions(+), 68 deletions(-)

diff --git a/configure b/configure
index 67253f8..a24c7a4 100755
--- a/configure
+++ b/configure
@@ -12684,6 +12684,7 @@ fi
 ###########################
 
 JSON_GLIB_REQUIRED_VERSION=0.6.0
+GIO_UNIX_REQUIRED_VERSION=2.24
 
 
 pkg_failed=no
@@ -12695,12 +12696,15 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUSMENUTESTS_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_DBUSMENUTESTS_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12713,12 +12717,15 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUSMENUTESTS_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_DBUSMENUTESTS_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12737,14 +12744,17 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION"`
+	        DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION"`
         else
-	        DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION"`
+	        DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUSMENUTESTS_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) were not met:
+	as_fn_error "Package requirements (json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION) were not met:
 
 $DBUSMENUTESTS_PKG_ERRORS
 
@@ -13673,7 +13683,7 @@ fi
 # Files
 ###########################
 
-ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"
+ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14698,6 +14708,7 @@ do
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "tests/dbusmenu-jsonloader.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader.pc" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;;
     "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;;
diff --git a/debian/changelog b/debian/changelog
index 9bd12d6..d10c32d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Adding more through JSON support for testing
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 23:00:07 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 23:05:22 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa1) lucid; urgency=low
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9fb9bc6..fb2d202 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -15,6 +15,8 @@
 
 @SET_MAKE@
 
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -36,8 +38,8 @@ build_triplet = @build@
 host_triplet = @host@
 TESTS = test-glib-objects-test test-glib-layout test-glib-properties \
 	test-glib-proxy test-glib-simple-items$(EXEEXT) \
-	test-gtk-objects-test test-glib-submenu test-gtk-label \
-	test-gtk-shortcut test-gtk-reorder
+	test-glib-submenu test-json test-gtk-objects-test \
+	test-gtk-label test-gtk-shortcut test-gtk-reorder
 check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 	test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \
 	test-glib-layout-server$(EXEEXT) \
@@ -51,26 +53,63 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 	test-gtk-shortcut-client$(EXEEXT) \
 	test-gtk-shortcut-server$(EXEEXT) \
 	test-glib-simple-items$(EXEEXT) \
-	test-gtk-reorder-server$(EXEEXT)
+	test-gtk-reorder-server$(EXEEXT) test-json-client$(EXEEXT) \
+	test-json-server$(EXEEXT)
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(libdbusmenu_jsonloaderinclude_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/dbusmenu-jsonloader.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = dbusmenu-jsonloader.pc
 CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesdir)" \
+	"$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libdbusmenu_jsonloader_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libdbusmenu_jsonloader_la_OBJECTS =  \
+	libdbusmenu_jsonloader_la-json-loader.lo
+libdbusmenu_jsonloader_la_OBJECTS =  \
+	$(am_libdbusmenu_jsonloader_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+libdbusmenu_jsonloader_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) \
+	$(libdbusmenu_jsonloader_la_LDFLAGS) $(LDFLAGS) -o $@
 am_glib_server_nomenu_OBJECTS =  \
 	glib_server_nomenu-glib-server-nomenu.$(OBJEXT)
 glib_server_nomenu_OBJECTS = $(am_glib_server_nomenu_OBJECTS)
-am__DEPENDENCIES_1 =
 glib_server_nomenu_DEPENDENCIES =  \
 	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
 glib_server_nomenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -194,7 +233,8 @@ am_test_gtk_label_server_OBJECTS =  \
 test_gtk_label_server_OBJECTS = $(am_test_gtk_label_server_OBJECTS)
 test_gtk_label_server_DEPENDENCIES =  \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la $(am__DEPENDENCIES_1) \
+	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	libdbusmenu-jsonloader.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 test_gtk_label_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -247,6 +287,27 @@ test_gtk_shortcut_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_test_json_client_OBJECTS =  \
+	test_json_client-test-json-client.$(OBJEXT)
+test_json_client_OBJECTS = $(am_test_json_client_OBJECTS)
+test_json_client_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+test_json_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_json_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_json_server_OBJECTS =  \
+	test_json_server-test-json-server.$(OBJEXT)
+test_json_server_OBJECTS = $(am_test_json_server_OBJECTS)
+test_json_server_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	libdbusmenu-jsonloader.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+test_json_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_json_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -273,7 +334,8 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(glib_server_nomenu_SOURCES) \
+SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
+	$(glib_server_nomenu_SOURCES) \
 	$(test_glib_layout_client_SOURCES) \
 	$(test_glib_layout_server_SOURCES) \
 	$(test_glib_objects_SOURCES) \
@@ -289,8 +351,10 @@ SOURCES = $(glib_server_nomenu_SOURCES) \
 	$(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \
 	$(test_gtk_reorder_server_SOURCES) \
 	$(test_gtk_shortcut_client_SOURCES) \
-	$(test_gtk_shortcut_server_SOURCES)
-DIST_SOURCES = $(glib_server_nomenu_SOURCES) \
+	$(test_gtk_shortcut_server_SOURCES) \
+	$(test_json_client_SOURCES) $(test_json_server_SOURCES)
+DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
+	$(glib_server_nomenu_SOURCES) \
 	$(test_glib_layout_client_SOURCES) \
 	$(test_glib_layout_server_SOURCES) \
 	$(test_glib_objects_SOURCES) \
@@ -306,30 +370,10 @@ DIST_SOURCES = $(glib_server_nomenu_SOURCES) \
 	$(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \
 	$(test_gtk_reorder_server_SOURCES) \
 	$(test_gtk_shortcut_client_SOURCES) \
-	$(test_gtk_shortcut_server_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)"
-DATA = $(examples_DATA) $(json_DATA)
+	$(test_gtk_shortcut_server_SOURCES) \
+	$(test_json_client_SOURCES) $(test_json_server_SOURCES)
+DATA = $(examples_DATA) $(json_DATA) $(pkgconfig_DATA)
+HEADERS = $(libdbusmenu_jsonloaderinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -499,8 +543,42 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DBUS_RUNNER = dbus-test-runner
+CLEANFILES = test-json-01.output.json \
+	dbusmenu-gtk/mago_tests/dbusmenu.pyc
 XVFB_RUN = ". $(srcdir)/run-xvfb.sh"
 
+######################
+# JSON Loader lib
+######################
+lib_LTLIBRARIES = libdbusmenu-jsonloader.la
+libdbusmenu_jsonloaderincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-jsonloader/
+libdbusmenu_jsonloaderinclude_HEADERS = \
+	json-loader.h
+
+libdbusmenu_jsonloader_la_SOURCES = \
+	json-loader.h \
+	json-loader.c
+
+libdbusmenu_jsonloader_la_LDFLAGS = \
+	-version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \
+	-no-undefined \
+	-export-symbols-regex "^[^_].*"
+
+libdbusmenu_jsonloader_la_CFLAGS = \
+	$(DBUSMENUGLIB_CFLAGS) \
+	$(DBUSMENUTESTS_CFLAGS) \
+	-I $(srcdir)/.. \
+	-Wall \
+	-Werror \
+	-DG_DISABLE_DEPRECATED \
+	-DG_LOG_DOMAIN="\"LIBDBUSMENU-JSONLOADER\""
+
+libdbusmenu_jsonloader_la_LIBADD = \
+	$(DBUSMENUGLIB_LIBS)
+
+pkgconfig_DATA = dbusmenu-jsonloader.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
 ######################
 # Test GLib server
 ######################
@@ -539,6 +617,34 @@ test_glib_layout_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+test_json_server_SOURCES = \
+	test-json-server.c
+
+test_json_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	-I $(srcdir) \
+	$(DBUSMENUGLIB_CFLAGS) \
+	$(DBUSMENUTESTS_CFLAGS) \
+	-Wall -Werror
+
+test_json_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	libdbusmenu-jsonloader.la \
+	$(DBUSMENUTESTS_LIBS) \
+	$(DBUSMENUGLIB_LIBS)
+
+test_json_client_SOURCES = \
+	test-json-client.c
+
+test_json_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_json_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUTESTS_LIBS) \
+	$(DBUSMENUGLIB_LIBS)
+
 test_glib_submenu_server_SOURCES = \
 	test-glib-submenu.h \
 	test-glib-submenu-server.c
@@ -687,6 +793,7 @@ test_gtk_label_server_CFLAGS = \
 test_gtk_label_server_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	libdbusmenu-jsonloader.la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -785,10 +892,8 @@ EXTRA_DIST = \
 	dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \
 	dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \
 	dbusmenu-gtk/mago_tests/data/static.json \
-	dbusmenu-gtk/mago_tests/data/test-gtk-label.json
-
-CLEANFILES = \
-	dbusmenu-gtk/mago_tests/dbusmenu.pyc
+	dbusmenu-gtk/mago_tests/data/test-gtk-label.json \
+	test-json-01.json
 
 DISTCLEANFILES = \
 	$(TESTS) \
@@ -829,6 +934,41 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+dbusmenu-jsonloader.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libdbusmenu-jsonloader.la: $(libdbusmenu_jsonloader_la_OBJECTS) $(libdbusmenu_jsonloader_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libdbusmenu_jsonloader_la_LINK) -rpath $(libdir) $(libdbusmenu_jsonloader_la_OBJECTS) $(libdbusmenu_jsonloader_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -892,6 +1032,12 @@ test-gtk-shortcut-client$(EXEEXT): $(test_gtk_shortcut_client_OBJECTS) $(test_gt
 test-gtk-shortcut-server$(EXEEXT): $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_DEPENDENCIES) 
 	@rm -f test-gtk-shortcut-server$(EXEEXT)
 	$(AM_V_CCLD)$(test_gtk_shortcut_server_LINK) $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_LDADD) $(LIBS)
+test-json-client$(EXEEXT): $(test_json_client_OBJECTS) $(test_json_client_DEPENDENCIES) 
+	@rm -f test-json-client$(EXEEXT)
+	$(AM_V_CCLD)$(test_json_client_LINK) $(test_json_client_OBJECTS) $(test_json_client_LDADD) $(LIBS)
+test-json-server$(EXEEXT): $(test_json_server_OBJECTS) $(test_json_server_DEPENDENCIES) 
+	@rm -f test-json-server$(EXEEXT)
+	$(AM_V_CCLD)$(test_json_server_LINK) $(test_json_server_OBJECTS) $(test_json_server_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -900,6 +1046,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@
@@ -917,6 +1064,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_client-test-gtk-shortcut-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_server-test-gtk-shortcut-server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_json_client-test-json-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_json_server-test-json-server.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -942,6 +1091,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libdbusmenu_jsonloader_la-json-loader.lo: json-loader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_jsonloader_la-json-loader.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Tpo -c -o libdbusmenu_jsonloader_la-json-loader.lo `test -f 'json-loader.c' || echo '$(srcdir)/'`json-loader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Tpo $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='json-loader.c' object='libdbusmenu_jsonloader_la-json-loader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_jsonloader_la-json-loader.lo `test -f 'json-loader.c' || echo '$(srcdir)/'`json-loader.c
+
 glib_server_nomenu-glib-server-nomenu.o: glib-server-nomenu.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -MT glib_server_nomenu-glib-server-nomenu.o -MD -MP -MF $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo -c -o glib_server_nomenu-glib-server-nomenu.o `test -f 'glib-server-nomenu.c' || echo '$(srcdir)/'`glib-server-nomenu.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po
@@ -1230,6 +1387,38 @@ test_gtk_shortcut_server-test-gtk-shortcut-server.obj: test-gtk-shortcut-server.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) -c -o test_gtk_shortcut_server-test-gtk-shortcut-server.obj `if test -f 'test-gtk-shortcut-server.c'; then $(CYGPATH_W) 'test-gtk-shortcut-server.c'; else $(CYGPATH_W) '$(srcdir)/test-gtk-shortcut-server.c'; fi`
 
+test_json_client-test-json-client.o: test-json-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -MT test_json_client-test-json-client.o -MD -MP -MF $(DEPDIR)/test_json_client-test-json-client.Tpo -c -o test_json_client-test-json-client.o `test -f 'test-json-client.c' || echo '$(srcdir)/'`test-json-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_json_client-test-json-client.Tpo $(DEPDIR)/test_json_client-test-json-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-json-client.c' object='test_json_client-test-json-client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -c -o test_json_client-test-json-client.o `test -f 'test-json-client.c' || echo '$(srcdir)/'`test-json-client.c
+
+test_json_client-test-json-client.obj: test-json-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -MT test_json_client-test-json-client.obj -MD -MP -MF $(DEPDIR)/test_json_client-test-json-client.Tpo -c -o test_json_client-test-json-client.obj `if test -f 'test-json-client.c'; then $(CYGPATH_W) 'test-json-client.c'; else $(CYGPATH_W) '$(srcdir)/test-json-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_json_client-test-json-client.Tpo $(DEPDIR)/test_json_client-test-json-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-json-client.c' object='test_json_client-test-json-client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -c -o test_json_client-test-json-client.obj `if test -f 'test-json-client.c'; then $(CYGPATH_W) 'test-json-client.c'; else $(CYGPATH_W) '$(srcdir)/test-json-client.c'; fi`
+
+test_json_server-test-json-server.o: test-json-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -MT test_json_server-test-json-server.o -MD -MP -MF $(DEPDIR)/test_json_server-test-json-server.Tpo -c -o test_json_server-test-json-server.o `test -f 'test-json-server.c' || echo '$(srcdir)/'`test-json-server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_json_server-test-json-server.Tpo $(DEPDIR)/test_json_server-test-json-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-json-server.c' object='test_json_server-test-json-server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -c -o test_json_server-test-json-server.o `test -f 'test-json-server.c' || echo '$(srcdir)/'`test-json-server.c
+
+test_json_server-test-json-server.obj: test-json-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -MT test_json_server-test-json-server.obj -MD -MP -MF $(DEPDIR)/test_json_server-test-json-server.Tpo -c -o test_json_server-test-json-server.obj `if test -f 'test-json-server.c'; then $(CYGPATH_W) 'test-json-server.c'; else $(CYGPATH_W) '$(srcdir)/test-json-server.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_json_server-test-json-server.Tpo $(DEPDIR)/test_json_server-test-json-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-json-server.c' object='test_json_server-test-json-server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -c -o test_json_server-test-json-server.obj `if test -f 'test-json-server.c'; then $(CYGPATH_W) 'test-json-server.c'; else $(CYGPATH_W) '$(srcdir)/test-json-server.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1275,6 +1464,46 @@ uninstall-jsonDATA:
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(jsondir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(jsondir)" && rm -f $$files
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+install-libdbusmenu_jsonloaderincludeHEADERS: $(libdbusmenu_jsonloaderinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdbusmenu_jsonloaderincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"
+	@list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" || exit $$?; \
+	done
+
+uninstall-libdbusmenu_jsonloaderincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1454,9 +1683,9 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -1488,8 +1717,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -1509,13 +1738,15 @@ info: info-am
 
 info-am:
 
-install-data-am: install-examplesDATA install-jsonDATA
+install-data-am: install-examplesDATA install-jsonDATA \
+	install-libdbusmenu_jsonloaderincludeHEADERS \
+	install-pkgconfigDATA
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
@@ -1555,24 +1786,32 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-examplesDATA uninstall-jsonDATA
+uninstall-am: uninstall-examplesDATA uninstall-jsonDATA \
+	uninstall-libLTLIBRARIES \
+	uninstall-libdbusmenu_jsonloaderincludeHEADERS \
+	uninstall-pkgconfigDATA
 
 .MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-local distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-examplesDATA install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-jsonDATA \
-	install-man install-pdf install-pdf-am install-ps \
+	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-local \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-examplesDATA install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-jsonDATA install-libLTLIBRARIES \
+	install-libdbusmenu_jsonloaderincludeHEADERS install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-examplesDATA uninstall-jsonDATA
+	uninstall-am uninstall-examplesDATA uninstall-jsonDATA \
+	uninstall-libLTLIBRARIES \
+	uninstall-libdbusmenu_jsonloaderincludeHEADERS \
+	uninstall-pkgconfigDATA
 
 
 ######################
@@ -1584,6 +1823,17 @@ test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
+######################
+# Test JSON
+######################
+
+test-json: test-json-client test-json-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(XVFB_RUN) >> $@
+	@echo $(DBUS_RUNNER) --task ./test-json-client --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@
+	@echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
+	@chmod +x $@
+
 ######################
 # Test Glib Submenu
 ######################
-- 
cgit v1.2.3


From fb676fe5663d49c0c4e15ec1785146082fa57202 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 23:10:43 -0500
Subject: debian/control, debian/libdbusmenu-jsonloader*install: Adding two
 binary packages for the jsonloader test library.

---
 debian/changelog                          |  4 +++-
 debian/control                            | 29 +++++++++++++++++++++++++++++
 debian/libdbusmenu-jsonloader-dev.install |  4 ++++
 debian/libdbusmenu-jsonloader0.install    |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 debian/libdbusmenu-jsonloader-dev.install
 create mode 100644 debian/libdbusmenu-jsonloader0.install

diff --git a/debian/changelog b/debian/changelog
index d10c32d..02e7bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) UNRELEASED; urgency=low
   * Upstream Merge
     * Adding more through JSON support for testing
   * Autogen
+  * debian/control, debian/libdbusmenu-jsonloader*install: Adding
+    two binary packages for the jsonloader test library.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 23:05:22 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 23:10:11 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa1) lucid; urgency=low
 
diff --git a/debian/control b/debian/control
index 18222ae..f05a0e6 100644
--- a/debian/control
+++ b/debian/control
@@ -149,3 +149,32 @@ Description: library for passing menus over DBus - GTK version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
+Package: libdbusmenu-jsonloader0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: library for passing menus over DBus - Test lib
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package contains shared libraries to be by test suites in applications
+ or libraries using dbusmenu.
+
+Package: libdbusmenu-jsonloader-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libdbus-glib-1-dev (>= 0.76),
+         libdbusmenu-glib-dev (= ${binary:Version}),
+         libjson-glib-dev
+Description: library for passing menus over DBus - Test lib
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package contains files that are needed to build test suites in applications
+ or libraries using dbusmenu.
+
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
new file mode 100644
index 0000000..27c41a5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc
+debian/tmp/usr/lib/libdbusmenu-jsonloader.a
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so
diff --git a/debian/libdbusmenu-jsonloader0.install b/debian/libdbusmenu-jsonloader0.install
new file mode 100644
index 0000000..bff47f5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
-- 
cgit v1.2.3


From 48e3270b1d530b376756ab979ab4c4509451be30 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 23:28:54 -0500
Subject: releasing version 0.3.3-0ubuntu2~ppa2~json1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02e7bd6..2213a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) lucid; urgency=low
 
   * Upstream Merge
     * Adding more through JSON support for testing
@@ -6,7 +6,7 @@ libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) UNRELEASED; urgency=low
   * debian/control, debian/libdbusmenu-jsonloader*install: Adding
     two binary packages for the jsonloader test library.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 23:10:11 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Jun 2010 23:28:49 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 520bea0764aeec95396984cbc491a3ff1bea26d2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 29 Jun 2010 08:21:55 -0500
Subject: debian/libdbusmenu-jsonloader0 moving to 1 to match library version.

---
 debian/changelog                       | 7 +++++++
 debian/control                         | 2 +-
 debian/libdbusmenu-jsonloader0.install | 1 -
 debian/libdbusmenu-jsonloader1.install | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 debian/libdbusmenu-jsonloader0.install
 create mode 100644 debian/libdbusmenu-jsonloader1.install

diff --git a/debian/changelog b/debian/changelog
index 2213a6f..5ddaa4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) UNRELEASED; urgency=low
+
+  * debian/libdbusmenu-jsonloader0 moving to 1 to match
+    library version.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 29 Jun 2010 08:20:52 -0500
+
 libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) lucid; urgency=low
 
   * Upstream Merge
diff --git a/debian/control b/debian/control
index f05a0e6..aefb40e 100644
--- a/debian/control
+++ b/debian/control
@@ -149,7 +149,7 @@ Description: library for passing menus over DBus - GTK version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader0
+Package: libdbusmenu-jsonloader1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/libdbusmenu-jsonloader0.install b/debian/libdbusmenu-jsonloader0.install
deleted file mode 100644
index bff47f5..0000000
--- a/debian/libdbusmenu-jsonloader0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
diff --git a/debian/libdbusmenu-jsonloader1.install b/debian/libdbusmenu-jsonloader1.install
new file mode 100644
index 0000000..bff47f5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
-- 
cgit v1.2.3


From b5238c818f7ce62d0e9f13b25a9a9ffe2b4621f7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 29 Jun 2010 08:45:58 -0500
Subject: releasing version 0.3.3-0ubuntu2~ppa2~json2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ddaa4a..f719612 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) lucid; urgency=low
 
   * debian/libdbusmenu-jsonloader0 moving to 1 to match
     library version.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 29 Jun 2010 08:20:52 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 29 Jun 2010 08:45:54 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) lucid; urgency=low
 
-- 
cgit v1.2.3


From b2e5fa7dd54d2d73201624b1411bf7387fde0157 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 29 Jun 2010 19:10:51 -0500
Subject: releasing version 0.3.3-0ubuntu2~ppa2~json3~subs1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 893f480..b25812d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.3-0ubuntu2~ppa2~json3~subs1) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu2~ppa2~json3~subs1) lucid; urgency=low
 
   * Upstream merge
     * Block building submenus on separators
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 29 Jun 2010 19:06:44 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 29 Jun 2010 19:10:49 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) lucid; urgency=low
 
-- 
cgit v1.2.3


From 77d8d38ae304d0ed893f39902e6e461b1e9f7c15 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 30 Jun 2010 11:32:13 -0500
Subject: releasing version 0.3.3-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09e6f2c..c774f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.3-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu2~ppa2) lucid; urgency=low
 
   * Upstream Merge
     * Adding more through JSON support for testing
@@ -6,7 +6,7 @@ libdbusmenu (0.3.3-0ubuntu2~ppa2) UNRELEASED; urgency=low
   * debian/control, debian/libdbusmenu-jsonloader*install: Adding
     two binary packages for the jsonloader test library.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 30 Jun 2010 11:29:14 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 30 Jun 2010 11:32:08 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From fb9b63c2247e5cc31c037f8e4cbd44b2962e930e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 30 Jun 2010 12:36:41 -0500
Subject: releasing version 0.3.3-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67081d4..6a11ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.3-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.3.3-0ubuntu2~ppa3) lucid; urgency=low
 
   * Upstream merge
     * Block building submenus on separators (LP: #598620)
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 30 Jun 2010 12:26:56 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 30 Jun 2010 12:36:37 -0500
 
 libdbusmenu (0.3.3-0ubuntu2~ppa2) lucid; urgency=low
 
-- 
cgit v1.2.3


From fa92b7508f63678353a05024c3b30bc770716907 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Thu, 1 Jul 2010 11:40:19 +0200
Subject: Standards-Version: 3.9.0

---
 debian/changelog | 3 ++-
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 091c2d1..43e4eff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdbusmenu (0.3.3-1) unstable; urgency=low
 
   * Merge Ubuntu.
     Preserve Maintainer and Vcs-* fields.
+  * Standards-Version: 3.9.0
 
- -- Evgeni Golov <evgeni@debian.org>  Thu, 01 Jul 2010 11:28:16 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 01 Jul 2010 11:40:04 +0200
 
 libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 8f4ca78..c11bb1c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                valac
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian
-- 
cgit v1.2.3


From 2404f2f70b5c1a110383b15694e5784cd2d6013c Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Thu, 1 Jul 2010 11:42:34 +0200
Subject: Source-Format: 1.0 for now

---
 debian/changelog     | 3 ++-
 debian/source/format | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 43e4eff..c25acb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libdbusmenu (0.3.3-1) unstable; urgency=low
   * Merge Ubuntu.
     Preserve Maintainer and Vcs-* fields.
   * Standards-Version: 3.9.0
+  * Source-Format: 1.0 for now
 
- -- Evgeni Golov <evgeni@debian.org>  Thu, 01 Jul 2010 11:40:04 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 01 Jul 2010 11:42:23 +0200
 
 libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
-- 
cgit v1.2.3


From f68faeacaf96ff5fd21310e5a096857ec675c8b0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 1 Jul 2010 09:00:19 -0500
Subject: releasing version 0.3.4-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0533309..d7c0833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.4-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Block building submenus on separators (LP: #598620)
@@ -7,7 +7,7 @@ libdbusmenu (0.3.4-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/control, debian/libdbusmenu-jsonloader*install: Adding
     two binary packages for the jsonloader test library.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 01 Jul 2010 08:56:25 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Jul 2010 09:00:16 -0500
 
 libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 78b810a93fbccde56192efa7cc6b4a520f03e35a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 8 Jul 2010 10:24:21 -0500
Subject: releasing version 0.3.5-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 985c127..3139067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.5-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.5-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     ∘ Protect against NULL nodes (LP: #602444)
     ∘ Remove extra warnings and messages
     ∘ Handle not having a session bus better (LP: #598715)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 08 Jul 2010 10:20:31 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 08 Jul 2010 10:24:18 -0500
 
 libdbusmenu (0.3.4-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 04371b23ce5172db703bbeeedd9a730c29eae514 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Wed, 14 Jul 2010 10:21:55 +0200
Subject: Add missing "used" to the json package description.

---
 debian/changelog | 6 ++++--
 debian/control   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf3ed67..70b4fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 libdbusmenu (0.3.5-1) unstable; urgency=low
 
-  * 
+  * Merge new upstream and changes from Ubuntu.
+  * debian/control:
+    + Add missing "used" to the json package description.
 
- -- Evgeni Golov <evgeni@debian.org>  Wed, 14 Jul 2010 10:19:38 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 14 Jul 2010 10:21:29 +0200
 
 libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 17ec9bf..abbe597 100644
--- a/debian/control
+++ b/debian/control
@@ -158,8 +158,8 @@ Description: library for passing menus over DBus - Test lib
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
- This package contains shared libraries to be by test suites in applications
- or libraries using dbusmenu.
+ This package contains shared libraries to be used by test suites in
+ applications or libraries using dbusmenu.
 
 Package: libdbusmenu-jsonloader-dev
 Section: libdevel
-- 
cgit v1.2.3


From 267513170831eeff1bc8fa76e5a6c6f56414da8c Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Wed, 14 Jul 2010 21:07:54 +0200
Subject: more description updates

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index abbe597..8e2234e 100644
--- a/debian/control
+++ b/debian/control
@@ -169,7 +169,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (= ${binary:Version}),
          libjson-glib-dev
-Description: library for passing menus over DBus - Test lib
+Description: library for passing menus over DBus - Test lib development files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
-- 
cgit v1.2.3


From e64fccb7a2a74a310ccc1a11490e0a8a0a871b2a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 15 Jul 2010 09:42:10 -0500
Subject: releasing version 0.3.6-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c584c1..a5a18c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.6-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.6-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     ∘ Protect against NULL values as event
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 15 Jul 2010 09:38:38 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 15 Jul 2010 09:42:07 -0500
 
 libdbusmenu (0.3.5-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 200f6ed7975b11257af8a3d7e0989c3c55dd4f28 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 20 Jul 2010 11:51:42 -0500
Subject: releasing version 0.3.6-0ubuntu2~ppa1~glob1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31f52b2..43f6e4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.6-0ubuntu2~ppa1~glob1) UNRELEASED; urgency=low
+libdbusmenu (0.3.6-0ubuntu2~ppa1~glob1) lucid; urgency=low
 
   * Upstream Merge
     * Globbing property requests into group requests
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 11:47:20 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 11:51:40 -0500
 
 libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From e7b8662134bf98f136abc9fef5b71e5e6cdecfbc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 20 Jul 2010 12:34:14 -0500
Subject: releasing version 0.3.6-0ubuntu2~ppa1~glob2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b3a37a..094fc7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.6-0ubuntu2~ppa1~glob2) UNRELEASED; urgency=low
+libdbusmenu (0.3.6-0ubuntu2~ppa1~glob2) lucid; urgency=low
 
   * Upstream Merge
     * Globbing layout signaling from the server
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 12:32:26 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 12:34:11 -0500
 
 libdbusmenu (0.3.6-0ubuntu2~ppa1~glob1) lucid; urgency=low
 
-- 
cgit v1.2.3


From c6c4c285c3844cb3ed50a41068bf7278604c41dd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 20 Jul 2010 15:24:10 -0500
Subject: releasing version 0.3.6-0ubuntu2~ppa1~glob3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48e47c2..82e2261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.6-0ubuntu2~ppa1~glob3) UNRELEASED; urgency=low
+libdbusmenu (0.3.6-0ubuntu2~ppa1~glob3) lucid; urgency=low
 
   * Upstream Merge
     * Making it so that properties are requested bredth first
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 15:22:10 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 15:24:08 -0500
 
 libdbusmenu (0.3.6-0ubuntu2~ppa1~glob2) lucid; urgency=low
 
-- 
cgit v1.2.3


From ec7452bf38e9e58c2a87ff460b861473b90f321d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 20 Jul 2010 16:38:48 -0500
Subject: Autogen update

---
 configure         | 145 ++++++++++++++++++++++++++++++++++++++++++++++++------
 debian/changelog  |   3 +-
 tools/Makefile.in |  12 +++--
 3 files changed, 142 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index 8d57d1f..479eed5 100755
--- a/configure
+++ b/configure
@@ -776,6 +776,8 @@ INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
 DBUSMENUTESTS_LIBS
 DBUSMENUTESTS_CFLAGS
+DBUSMENUDUMPER_LIBS
+DBUSMENUDUMPER_CFLAGS
 DBUSMENUGTK_LIBS
 DBUSMENUGTK_CFLAGS
 DBUSMENUGLIB_LIBS
@@ -981,6 +983,8 @@ DBUSMENUGLIB_CFLAGS
 DBUSMENUGLIB_LIBS
 DBUSMENUGTK_CFLAGS
 DBUSMENUGTK_LIBS
+DBUSMENUDUMPER_CFLAGS
+DBUSMENUDUMPER_LIBS
 DBUSMENUTESTS_CFLAGS
 DBUSMENUTESTS_LIBS'
 
@@ -1653,6 +1657,10 @@ Some influential environment variables:
               C compiler flags for DBUSMENUGTK, overriding pkg-config
   DBUSMENUGTK_LIBS
               linker flags for DBUSMENUGTK, overriding pkg-config
+  DBUSMENUDUMPER_CFLAGS
+              C compiler flags for DBUSMENUDUMPER, overriding pkg-config
+  DBUSMENUDUMPER_LIBS
+              linker flags for DBUSMENUDUMPER, overriding pkg-config
   DBUSMENUTESTS_CFLAGS
               C compiler flags for DBUSMENUTESTS, overriding pkg-config
   DBUSMENUTESTS_LIBS
@@ -6285,13 +6293,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6288: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6296: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6291: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6299: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6294: output\"" >&5)
+  (eval echo "\"\$as_me:6302: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7496,7 +7504,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7499 "configure"' > conftest.$ac_ext
+  echo '#line 7507 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8772,11 +8780,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8775: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8783: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8779: \$? = $ac_status" >&5
+   echo "$as_me:8787: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9111,11 +9119,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9114: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9122: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9118: \$? = $ac_status" >&5
+   echo "$as_me:9126: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9216,11 +9224,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9219: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9227: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9223: \$? = $ac_status" >&5
+   echo "$as_me:9231: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9271,11 +9279,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9274: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9282: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9278: \$? = $ac_status" >&5
+   echo "$as_me:9286: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11655,7 +11663,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11658 "configure"
+#line 11666 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11751,7 +11759,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11754 "configure"
+#line 11762 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12679,6 +12687,115 @@ fi
 
 
 
+###########################
+# Dependencies - dumper
+###########################
+
+X11_REQUIRED_VERSION=1.3
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUDUMPER" >&5
+$as_echo_n "checking for DBUSMENUDUMPER... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DBUSMENUDUMPER_CFLAGS"; then
+        pkg_cv_DBUSMENUDUMPER_CFLAGS="$DBUSMENUDUMPER_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+                                  x11 >= \$X11_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUSMENUDUMPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DBUSMENUDUMPER_LIBS"; then
+        pkg_cv_DBUSMENUDUMPER_LIBS="$DBUSMENUDUMPER_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+                                  x11 >= \$X11_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUSMENUDUMPER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        DBUSMENUDUMPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION"`
+        else
+	        DBUSMENUDUMPER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DBUSMENUDUMPER_PKG_ERRORS" >&5
+
+	as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                  x11 >= $X11_REQUIRED_VERSION) were not met:
+
+$DBUSMENUDUMPER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DBUSMENUDUMPER_CFLAGS
+and DBUSMENUDUMPER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DBUSMENUDUMPER_CFLAGS
+and DBUSMENUDUMPER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+	DBUSMENUDUMPER_CFLAGS=$pkg_cv_DBUSMENUDUMPER_CFLAGS
+	DBUSMENUDUMPER_LIBS=$pkg_cv_DBUSMENUDUMPER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+
+
+
 ###########################
 # Dependencies - Testing
 ###########################
diff --git a/debian/changelog b/debian/changelog
index 3e96017..a23c33d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdbusmenu (0.3.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Making dbusmenu-dumper have a click to dump feature.
+  * Autogen update
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 16:37:33 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 16:38:38 -0500
 
 libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2d2e865..59288b3 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -55,7 +55,8 @@ am_dbusmenu_dumper_OBJECTS =  \
 dbusmenu_dumper_OBJECTS = $(am_dbusmenu_dumper_OBJECTS)
 am__DEPENDENCIES_1 =
 dbusmenu_dumper_DEPENDENCIES =  \
-	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -173,6 +174,8 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUSMENUDUMPER_CFLAGS = @DBUSMENUDUMPER_CFLAGS@
+DBUSMENUDUMPER_LIBS = @DBUSMENUDUMPER_LIBS@
 DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@
 DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@
 DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@
@@ -325,11 +328,14 @@ dbusmenu_dumper_SOURCES = \
 
 dbusmenu_dumper_CFLAGS = \
 	-I $(srcdir)/.. \
-	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+	$(DBUSMENUGLIB_CFLAGS) \
+	$(DBUSMENUDUMPER_CFLAGS) \
+	-Wall -Werror
 
 dbusmenu_dumper_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	$(DBUSMENUGLIB_LIBS)
+	$(DBUSMENUGLIB_LIBS) \
+	$(DBUSMENUDUMPER_LIBS)
 
 doc_DATA = README.dbusmenu-bench
 EXTRA_DIST = \
-- 
cgit v1.2.3


From ba87ab7a9a65c5ed349dda5c472ae6c8adbef322 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 20 Jul 2010 16:40:32 -0500
Subject: releasing version 0.3.6-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a23c33d..8fcb649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.6-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Making dbusmenu-dumper have a click to dump feature.
   * Autogen update
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 16:38:38 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Jul 2010 16:40:29 -0500
 
 libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From d9fdc575e49d357c425826740e919447c4f1eb24 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Thu, 29 Jul 2010 12:00:16 +0200
Subject: Standards-Version: 3.9.1

---
 debian/changelog | 3 ++-
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 417559a..fc0cb2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 libdbusmenu (0.3.7-1) unstable; urgency=low
 
   * Merge latest upstream from Ubuntu.
+  * Standards-Version: 3.9.1
 
- -- Evgeni Golov <evgeni@debian.org>  Thu, 29 Jul 2010 11:53:46 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 29 Jul 2010 12:00:04 +0200
 
 libdbusmenu (0.3.7-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 8e29045..c10b31a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-gtk-2.0,
                libx11-dev (>= 1.3), 
                valac
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian
-- 
cgit v1.2.3


From d67f6d110e74b777721f2dd5086e655e4c16f085 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 2 Aug 2010 14:41:39 -0500
Subject: releasing version 0.3.8-0ubuntu2~ppa1~glob1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2520315..d3ad4a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.8-0ubuntu2~ppa1~glob1) UNRELEASED; urgency=low
+libdbusmenu (0.3.8-0ubuntu2~ppa1~glob1) lucid; urgency=low
 
   * Updating to packaging branch
   * Upstream Merge
@@ -6,7 +6,7 @@ libdbusmenu (0.3.8-0ubuntu2~ppa1~glob1) UNRELEASED; urgency=low
     * Globbing layout signaling from the server
     * Globbing property requests into group requests
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 14:37:28 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 14:41:36 -0500
 
 libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From c10566c3df251a2e116005c5f4a55568f6f4df77 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 2 Aug 2010 17:29:13 -0500
Subject: releasing version 0.3.8-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25b9004..df6daeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.8-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.8-0ubuntu2~ppa1) lucid; urgency=low
 
   * Upstream Merge
     * Making it so that properties are requested bredth first
     * Globbing layout signaling from the server
     * Globbing property requests into group requests
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 17:08:24 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 17:29:10 -0500
 
 libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 8d2364f47f60e5293800b880829f774efb5ac7dd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 2 Aug 2010 20:29:02 -0500
Subject: releasing version 0.3.9-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cb0e45..d650efa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.9-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.9-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
     * Making it so that properties are requested bredth first
     * Globbing layout signaling from the server
     * Globbing property requests into group requests
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 20:25:18 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 20:28:58 -0500
 
 libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From d6af8272daa4c4dc09d3ed04a052863688d7b515 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 2 Aug 2010 20:36:38 -0500
Subject: Adding bug number to change log

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d650efa..8a1d63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ libdbusmenu (0.3.9-0ubuntu1~ppa1) lucid; urgency=low
   * New upstream release.
     * Making it so that properties are requested bredth first
     * Globbing layout signaling from the server
-    * Globbing property requests into group requests
+    * Globbing property requests into group requests (LP: #604670)
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 02 Aug 2010 20:28:58 -0500
 
-- 
cgit v1.2.3


From d62037551cb0b27c1d4ed7ce7bb7865bd22d8fc7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 7 Aug 2010 16:13:41 -0500
Subject: debian/rules: Enabling running check at build time

---
 debian/changelog | 6 ++++++
 debian/rules     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ff1a6d2..d30dda9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) UNRELEASED; urgency=low
+
+  * debian/rules: Enabling running check at build time
+
+ -- Ted Gould <ted@ubuntu.com>  Sat, 07 Aug 2010 16:13:06 -0500
+
 libdbusmenu (0.3.9-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index e274757..c015803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
+DEB_MAKE_CHECK_TARGET := check
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-- 
cgit v1.2.3


From 8db3266683db254573da779ed43a63f14d2d0ce5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 7 Aug 2010 16:18:44 -0500
Subject: releasing version 0.3.9-0ubuntu1~ppa2~check1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d30dda9..24bd923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) UNRELEASED; urgency=low
+libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) lucid; urgency=low
 
   * debian/rules: Enabling running check at build time
 
- -- Ted Gould <ted@ubuntu.com>  Sat, 07 Aug 2010 16:13:06 -0500
+ -- Ted Gould <ted@ubuntu.com>  Sat, 07 Aug 2010 16:18:41 -0500
 
 libdbusmenu (0.3.9-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From aeac8ff44a799bf17dc9e2e7b52d9ea52bfa9c58 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 7 Aug 2010 16:22:18 -0500
Subject: debian/control: Adding build deps xvfb and dbus-test-runner for new
 make check rules

---
 debian/changelog | 7 +++++++
 debian/control   | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 24bd923..e7d2465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.9-0ubuntu1~ppa2~check2) UNRELEASED; urgency=low
+
+  * debian/control: Adding build deps xvfb and dbus-test-runner for new
+    make check rules
+
+ -- Ted Gould <ted@ubuntu.com>  Sat, 07 Aug 2010 16:21:38 -0500
+
 libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) lucid; urgency=low
 
   * debian/rules: Enabling running check at build time
diff --git a/debian/control b/debian/control
index 9fe2dd8..1039d9e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,10 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                libx11-dev (>= 1.3), 
-               valac
+               valac,
+#  Check dependencies
+               xvfb,
+               dbus-test-runner
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
-- 
cgit v1.2.3


From 9738a08bb801cb84c2695807933e7459681146a4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 7 Aug 2010 16:27:26 -0500
Subject: releasing version 0.3.9-0ubuntu1~ppa2~check2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7d2465..56d1847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.9-0ubuntu1~ppa2~check2) UNRELEASED; urgency=low
+libdbusmenu (0.3.9-0ubuntu1~ppa2~check2) lucid; urgency=low
 
   * debian/control: Adding build deps xvfb and dbus-test-runner for new
     make check rules
 
- -- Ted Gould <ted@ubuntu.com>  Sat, 07 Aug 2010 16:21:38 -0500
+ -- Ted Gould <ted@ubuntu.com>  Sat, 07 Aug 2010 16:27:24 -0500
 
 libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 9179d1be6405b5801b8ef50fb131f5ecbdeb4751 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 9 Aug 2010 09:18:20 -0500
Subject: releasing version 0.3.9-0ubuntu1~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a5d4d9..baec3ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.9-0ubuntu1~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.9-0ubuntu1~ppa2) lucid; urgency=low
 
   * debian/rules: Enabling running check at build time
   * debian/control: Adding build deps xvfb and dbus-test-runner for new
     make check rules
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 09 Aug 2010 09:06:49 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 09 Aug 2010 09:18:17 -0500
 
 libdbusmenu (0.3.9-0ubuntu1~ppa1) lucid; urgency=low
 
-- 
cgit v1.2.3


From 21da9f124d05ccd47429f971d790fb95918b8a89 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Tue, 10 Aug 2010 21:50:31 +0200
Subject: releasing version 0.3.9-0ubuntu2

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 36ad13b..b73281f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.9-0ubuntu2) maverick; urgency=low
+
+  * Rebuild with the current gobject introspection version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 10 Aug 2010 21:50:16 +0200
+
 libdbusmenu (0.3.9-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
-- 
cgit v1.2.3


From 085986320e5de6be3e1d6e1521eb6c5fa83234f2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 12 Aug 2010 11:28:42 -0500
Subject: releasing version 0.3.10-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92a9ab1..62b6109 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.10-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.10-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
     * Fixes to dbusmenu-dumper
@@ -6,7 +6,7 @@ libdbusmenu (0.3.10-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/control: Adding build deps xvfb and dbus-test-runner for new
     make check rules
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 11:21:48 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 11:28:37 -0500
 
 libdbusmenu (0.3.9-0ubuntu2) maverick; urgency=low
 
-- 
cgit v1.2.3


From ced95a80cc2cf2664c171879069b5c9753379dd9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 18 Aug 2010 09:39:11 -0500
Subject: releasing version 0.3.10-0ubuntu1~ppa2~activate1

---
 debian/changelog             |  5 +++--
 libdbusmenu-glib/Makefile.in | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e95d400..068282f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdbusmenu (0.3.10-0ubuntu1~ppa2~activate1) UNRELEASED; urgency=low
+libdbusmenu (0.3.10-0ubuntu1~ppa2~activate1) maverick; urgency=low
 
   * Upstream Merge
     * Support activation of menus client side
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 18 Aug 2010 09:17:46 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 18 Aug 2010 09:39:09 -0500
 
 libdbusmenu (0.3.10-0ubuntu1~ppa1) maverick; urgency=low
 
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index f04bf5a..2bcede7 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -43,7 +43,12 @@ subdir = libdbusmenu-glib
 DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -83,6 +88,7 @@ am_libdbusmenu_glib_la_OBJECTS = libdbusmenu_glib_la-menuitem.lo \
 	libdbusmenu_glib_la-menuitem-proxy.lo \
 	libdbusmenu_glib_la-server.lo \
 	libdbusmenu_glib_la-server-marshal.lo \
+	libdbusmenu_glib_la-client-marshal.lo \
 	libdbusmenu_glib_la-client-menuitem.lo \
 	libdbusmenu_glib_la-client.lo
 libdbusmenu_glib_la_OBJECTS = $(am_libdbusmenu_glib_la_OBJECTS)
@@ -297,6 +303,7 @@ CLEANFILES = $(am__append_2)
 EXTRA_DIST = \
 	dbusmenu-glib.pc.in \
 	dbus-menu.xml \
+	client-marshal.list \
 	menuitem-marshal.list \
 	server-marshal.list
 
@@ -324,6 +331,8 @@ libdbusmenu_glib_la_SOURCES = \
 	server.c \
 	server-marshal.h \
 	server-marshal.c \
+	client-marshal.h \
+	client-marshal.c \
 	client-menuitem.h \
 	client-menuitem.c \
 	client.h \
@@ -345,6 +354,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 BUILT_SOURCES = \
 	dbusmenu-client.h \
 	dbusmenu-server.h \
+	client-marshal.h \
+	client-marshal.c \
 	menuitem-marshal.h \
 	menuitem-marshal.c \
 	server-marshal.h \
@@ -452,6 +463,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client-menuitem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem-marshal.Plo@am__quote@
@@ -524,6 +536,14 @@ libdbusmenu_glib_la-server-marshal.lo: server-marshal.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_glib_la-server-marshal.lo `test -f 'server-marshal.c' || echo '$(srcdir)/'`server-marshal.c
 
+libdbusmenu_glib_la-client-marshal.lo: client-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_glib_la-client-marshal.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_glib_la-client-marshal.Tpo -c -o libdbusmenu_glib_la-client-marshal.lo `test -f 'client-marshal.c' || echo '$(srcdir)/'`client-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_glib_la-client-marshal.Tpo $(DEPDIR)/libdbusmenu_glib_la-client-marshal.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client-marshal.c' object='libdbusmenu_glib_la-client-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_glib_la-client-marshal.lo `test -f 'client-marshal.c' || echo '$(srcdir)/'`client-marshal.c
+
 libdbusmenu_glib_la-client-menuitem.lo: client-menuitem.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_glib_la-client-menuitem.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_glib_la-client-menuitem.Tpo -c -o libdbusmenu_glib_la-client-menuitem.lo `test -f 'client-menuitem.c' || echo '$(srcdir)/'`client-menuitem.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_glib_la-client-menuitem.Tpo $(DEPDIR)/libdbusmenu_glib_la-client-menuitem.Plo
@@ -876,6 +896,16 @@ dbusmenu-client.h: dbus-menu.xml
 		--output=dbusmenu-client.h \
 		$(srcdir)/dbus-menu.xml
 
+client-marshal.h: $(srcdir)/client-marshal.list
+	glib-genmarshal --header \
+		--prefix=_dbusmenu_client_marshal $(srcdir)/client-marshal.list \
+		> client-marshal.h
+
+client-marshal.c: $(srcdir)/client-marshal.list
+	glib-genmarshal --body \
+		--prefix=_dbusmenu_client_marshal $(srcdir)/client-marshal.list \
+		> client-marshal.c
+
 server-marshal.h: $(srcdir)/server-marshal.list
 	glib-genmarshal --header \
 		--prefix=_dbusmenu_server_marshal $(srcdir)/server-marshal.list \
-- 
cgit v1.2.3


From 65e8b999069536a87428abbae7f17ce9e63422a8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 19 Aug 2010 13:47:37 -0500
Subject: releasing version 0.3.11-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4f967e..267dab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.11-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.11-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
     * Fix to handle whitespace in layout XML better
     * Fixes to test scripts on ARM
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 19 Aug 2010 13:40:30 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 19 Aug 2010 13:47:33 -0500
 
 libdbusmenu (0.3.10-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 975425309deb55aebf4694f05d8a89c24d94b63e Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 19 Aug 2010 15:40:46 -0400
Subject: dropped build-deps for dbus-runner

---
 debian/control | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 1039d9e..9fe2dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -20,10 +20,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                libx11-dev (>= 1.3), 
-               valac,
-#  Check dependencies
-               xvfb,
-               dbus-test-runner
+               valac
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
-- 
cgit v1.2.3


From e8704dfe47c14af9c395449ad78fb3d8abd1b416 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 19 Aug 2010 16:18:01 -0400
Subject: releasing version 0.3.11-0ubuntu1

---
 debian/changelog | 2 +-
 debian/rules     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb13160..65d8354 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.11-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.11-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
     * Fix to handle whitespace in layout XML better
diff --git a/debian/rules b/debian/rules
index c015803..e274757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_MAKE_CHECK_TARGET := check
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-- 
cgit v1.2.3


From dbb73479cfd68cfc0e61dd8d9d65f5356e698aef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 25 Aug 2010 13:26:19 -0500
Subject: releasing version 0.3.11-0ubuntu1~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14081c6..abe3914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.11-0ubuntu1~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.11-0ubuntu1~ppa2) maverick; urgency=low
 
   * Upstream Merge
     * Support activation of menus client side
   * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 25 Aug 2010 13:20:30 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 25 Aug 2010 13:26:16 -0500
 
 libdbusmenu (0.3.11-0ubuntu1~ppa1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 411bc164d198eda669a4bf48de2510c80f94702d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 26 Aug 2010 15:35:47 -0500
Subject: releasing version 0.3.12-0ubuntu1~ppa1

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e422b0..af28c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.12-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.12-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
     * Support activation of menus client side
-    * Increase layout XML size
+    * Increase layout XML size (LP: #621238)
     * Display an event for the status of the signal to the server
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 26 Aug 2010 15:27:19 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 26 Aug 2010 15:35:19 -0500
 
 libdbusmenu (0.3.11-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 803503589b2e0ec2a66c64a38307a95a20a2519f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 27 Aug 2010 16:23:35 -0500
Subject: releasing version 0.3.12-0ubuntu2~ppa1~signal1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21e4dc3..3832c98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.12-0ubuntu2~ppa1~signal1) UNRELEASED; urgency=low
+libdbusmenu (0.3.12-0ubuntu2~ppa1~signal1) maverick; urgency=low
 
   * Upstream Merge
     * Fixing the passing of the value to the results signal
     * Adding a test for checking event results signal
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 27 Aug 2010 16:18:07 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 27 Aug 2010 16:23:33 -0500
 
 libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From c07baf97e1cf23f3529ede15ab56636c0888d5be Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 27 Aug 2010 17:11:30 -0500
Subject: releasing version 0.3.12-0ubuntu2~ppa1~signal2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bd86e5..d2a6c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.12-0ubuntu2~ppa1~signal2) UNRELEASED; urgency=low
+libdbusmenu (0.3.12-0ubuntu2~ppa1~signal2) maverick; urgency=low
 
   * Upstream Merge
     * Changing the timeouts
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 27 Aug 2010 17:01:22 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 27 Aug 2010 17:11:25 -0500
 
 libdbusmenu (0.3.12-0ubuntu2~ppa1~signal1) maverick; urgency=low
 
-- 
cgit v1.2.3


From c69489d0f100d3df9c0bcdcdb6d05cd4eca6c250 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 30 Aug 2010 10:26:04 -0500
Subject: releasing version 0.3.12-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39df245..ae9f9dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.12-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.12-0ubuntu2~ppa1) maverick; urgency=low
 
   * Upstream Merge
     * Fixing the passing of the value to the results signal
     * Adding a test for checking event results signal
     * Changing the timeouts on event calls
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 30 Aug 2010 09:48:25 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 30 Aug 2010 10:24:14 -0500
 
 libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From ef90f98f2367e1a5a84df4c8312849e9a540b78d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 9 Sep 2010 09:43:58 -0500
Subject: Handling window grabs on activated signals (LP: #633275)

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 96304fc..78498a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdbusmenu (0.3.13-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
   * New upstream release.
+    * Handling window grabs on activated signals (LP: #633275)
     * Fixing the passing of the value to the results signal
     * Adding a test for checking event results signal
     * Changing the timeouts on event calls for better detection
-- 
cgit v1.2.3


From be073ce65ee3a15a4e6aa14fcc88176df184caa6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 9 Sep 2010 09:50:20 -0500
Subject: releasing version 0.3.13-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78498a1..8cd05a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.13-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.13-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
     * Handling window grabs on activated signals (LP: #633275)
@@ -7,7 +7,7 @@ libdbusmenu (0.3.13-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Changing the timeouts on event calls for better detection
       of failing applications
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 09 Sep 2010 09:41:34 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Sep 2010 09:50:15 -0500
 
 libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From ba14febc25e422922d0b9b45ddb80579355f6ba3 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 9 Sep 2010 12:34:05 -0400
Subject: releasing version 0.3.13-0ubuntu1

---
 debian/changelog | 7 ++++++-
 debian/control   | 5 +----
 debian/rules     | 1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8813cf..c270d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.13-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
     * Handling window grabs on activated signals (LP: #633275)
@@ -7,6 +7,11 @@ libdbusmenu (0.3.13-0ubuntu1) UNRELEASED; urgency=low
     * Changing the timeouts on event calls for better detection
       of failing applications
 
+  [Ken VanDine]
+  * debian/control
+    - Dropped build depends for dbus-test-runner, it isn't in the archive
+      yet, we should add that next cycle
+
  -- Ted Gould <ted@ubuntu.com>  Thu, 09 Sep 2010 09:50:15 -0500
 
 libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low
diff --git a/debian/control b/debian/control
index 1039d9e..9fe2dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -20,10 +20,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                libx11-dev (>= 1.3), 
-               valac,
-#  Check dependencies
-               xvfb,
-               dbus-test-runner
+               valac
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
diff --git a/debian/rules b/debian/rules
index 1578fbf..496facc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_MAKE_CHECK_TARGET := check
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-- 
cgit v1.2.3


From 2ec51261588eec30900d6cf52f3cc206fe83641d Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 9 Sep 2010 14:46:53 -0400
Subject: releasing version 0.3.13-0ubuntu1

---
 .bzr-builddeb/default.conf | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .bzr-builddeb/default.conf

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index 36c28f8..0000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-merge = False
-- 
cgit v1.2.3


From 2a02f5bcac6023638644c08e21ee1027a986b513 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 14 Sep 2010 13:40:59 -0500
Subject: releasing version 0.3.13-0ubuntu1~ppa2~oobsignals1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f94935..1dad66d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.13-0ubuntu1~ppa2~oobsignals1) UNRELEASED; urgency=low
+libdbusmenu (0.3.13-0ubuntu1~ppa2~oobsignals1) maverick; urgency=low
 
   * Upstream Merge
     * Making a callback for the event dbus function happen off
       of the mainloop so it returns a response. (LP: #636756)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 14 Sep 2010 13:35:06 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 14 Sep 2010 13:40:55 -0500
 
 libdbusmenu (0.3.13-0ubuntu1~ppa1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 9fab94f1dac4f9313870e25cadbc36b10443bf2f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 14 Sep 2010 16:32:21 -0500
Subject: releasing version 0.3.13-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ee69cf..e91590f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.13-0ubuntu2~ppa1) maverick; urgency=low
 
   * Upstream Merge
     * Making a callback for the event dbus function happen off
       of the mainloop so it returns a response. (LP: #636756)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 14 Sep 2010 16:25:59 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 14 Sep 2010 16:32:18 -0500
 
 libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From e4fe9d088f9afabcc150361855209cf363b5c12c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 15 Sep 2010 11:36:12 -0500
Subject: releasing version 0.3.14-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3507d5d..b240caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.14-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.14-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
     * Fixing a memory leak by unref'ing a hashtable
     * Making a callback for the event dbus function happen off
       of the mainloop so it returns a response. (LP: #636756)
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 15 Sep 2010 11:29:32 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 15 Sep 2010 11:36:09 -0500
 
 libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From f561d3f108970043aaeac0377e69453e3c6173d4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 19 Sep 2010 14:38:55 -0500
Subject: releasing version 0.3.14-0ubuntu1~ppa2~ats1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2014451..b6c8cb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.14-0ubuntu1~ppa2~ats1) UNRELEASED; urgency=low
+libdbusmenu (0.3.14-0ubuntu1~ppa2~ats1) maverick; urgency=low
 
   * Upstream Merge
     * Passing up About-to-show as an activate signal
 
- -- Ted Gould <ted@ubuntu.com>  Sun, 19 Sep 2010 14:27:38 -0500
+ -- Ted Gould <ted@ubuntu.com>  Sun, 19 Sep 2010 14:38:52 -0500
 
 libdbusmenu (0.3.14-0ubuntu1~ppa1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 2deeeea4dac30da36bea21ae885162a7c6383f59 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 21 Sep 2010 16:52:20 -0500
Subject: releasing version 0.3.14-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c0deb0..fe42857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.14-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.14-0ubuntu2~ppa1) maverick; urgency=low
 
   * Upstream Merge
     * Passing up About-to-show as an activate signal (LP: #637692)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 21 Sep 2010 16:45:58 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 21 Sep 2010 16:52:17 -0500
 
 libdbusmenu (0.3.14-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 20744aaef8e99b0db58071e684a5d830074b2ec1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 22 Sep 2010 10:28:05 -0500
Subject: releasing version 0.3.16-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb702af..a86d848 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.16-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.16-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release:
     * Don't use a typedef in the signal handler in the class to
       avoid confusing vapigen.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 22 Sep 2010 10:22:01 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 22 Sep 2010 10:28:01 -0500
 
 libdbusmenu (0.3.15-0ubuntu1) UNRELEASED; urgency=low
 
-- 
cgit v1.2.3


From 4f4949c181a88e41354e338061c5be73dff6bbaf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 13 Oct 2010 12:45:37 -0500
Subject: debian/control, debian/libdbusmenu-glib2.install,
 debian/libdbusmenu-gtk2.install: Switching package names to match .so bump.

---
 debian/changelog                 |  5 ++++-
 debian/control                   | 22 +++++++++++-----------
 debian/libdbusmenu-glib1.install |  1 -
 debian/libdbusmenu-glib2.install |  1 +
 debian/libdbusmenu-gtk1.install  |  1 -
 debian/libdbusmenu-gtk2.install  |  1 +
 6 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 debian/libdbusmenu-glib1.install
 create mode 100644 debian/libdbusmenu-glib2.install
 delete mode 100644 debian/libdbusmenu-gtk1.install
 create mode 100644 debian/libdbusmenu-gtk2.install

diff --git a/debian/changelog b/debian/changelog
index 82206cb..ebeed5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Breaking ABI and getting reserved back
+  * debian/control, debian/libdbusmenu-glib2.install,
+    debian/libdbusmenu-gtk2.install: Switching package names to
+    match .so bump.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 13 Oct 2010 12:41:39 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 13 Oct 2010 12:44:07 -0500
 
 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 1039d9e..b162015 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 
-Package: libdbusmenu-glib1
+Package: libdbusmenu-glib2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -49,7 +49,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-glib1 (= ${binary:Version}),
+         libdbusmenu-glib2 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: library for passing menus over DBus - development files
@@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files
  .
  This package contains files that are needed to build applications.
 
-Package: libdbusmenu-gtk1
+Package: libdbusmenu-gtk2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -76,7 +76,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk1 (= ${binary:Version}),
+         libdbusmenu-gtk2 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
@@ -93,7 +93,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
-         libdbusmenu-glib1 (= ${binary:Version})
+         libdbusmenu-glib2 (= ${binary:Version})
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -106,30 +106,30 @@ Package: gir1.0-dbusmenu-glib-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-glib1 (= ${binary:Version}),
+         libdbusmenu-glib2 (= ${binary:Version}),
          gir1.0-glib-2.0
-Description: typelib file for libdbusmenu-glib1
+Description: typelib file for libdbusmenu-glib2
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-glib1.
+ generate dynamic bindings for libdbusmenu-glib2.
 
 Package: gir1.0-dbusmenu-gtk-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk1 (= ${binary:Version}),
+         libdbusmenu-gtk2 (= ${binary:Version}),
          gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
          gir1.0-gtk-2.0
-Description: typelib file for libdbusmenu-gtk1
+Description: typelib file for libdbusmenu-gtk2
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk1.
+ generate dynamic bindings for libdbusmenu-gtk2.
 
 Package: libdbusmenu-glib-doc
 Section: doc
diff --git a/debian/libdbusmenu-glib1.install b/debian/libdbusmenu-glib1.install
deleted file mode 100644
index acdbacf..0000000
--- a/debian/libdbusmenu-glib1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-glib2.install b/debian/libdbusmenu-glib2.install
new file mode 100644
index 0000000..acdbacf
--- /dev/null
+++ b/debian/libdbusmenu-glib2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-gtk1.install b/debian/libdbusmenu-gtk1.install
deleted file mode 100644
index d677935..0000000
--- a/debian/libdbusmenu-gtk1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-gtk.so.*
diff --git a/debian/libdbusmenu-gtk2.install b/debian/libdbusmenu-gtk2.install
new file mode 100644
index 0000000..d677935
--- /dev/null
+++ b/debian/libdbusmenu-gtk2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk.so.*
-- 
cgit v1.2.3


From e0f26491238c8bb1b013910e6c57f9ba48693599 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 13 Oct 2010 12:48:24 -0500
Subject: Autogen

---
 Makefile.in                                 |    7 +-
 aclocal.m4                                  | 8383 +--------------------------
 configure                                   |   28 +-
 debian/changelog                            |    3 +-
 docs/Makefile.in                            |    7 +-
 docs/libdbusmenu-glib/Makefile.in           |    7 +-
 docs/libdbusmenu-glib/reference/Makefile.in |    7 +-
 docs/libdbusmenu-gtk/Makefile.in            |    7 +-
 docs/libdbusmenu-gtk/reference/Makefile.in  |    7 +-
 libdbusmenu-glib/Makefile.in                |    7 +-
 libdbusmenu-gtk/Makefile.in                 |    7 +-
 m4/gtk-doc.m4                               |   61 +
 tests/Makefile.in                           |    7 +-
 tools/Makefile.in                           |    7 +-
 tools/testapp/Makefile.in                   |    7 +-
 15 files changed, 154 insertions(+), 8398 deletions(-)
 create mode 100644 m4/gtk-doc.m4

diff --git a/Makefile.in b/Makefile.in
index b344c4c..766ba7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	compile config.guess config.sub depcomp install-sh ltmain.sh \
 	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/aclocal.m4 b/aclocal.m4
index 8ff4d67..008fa35 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -452,8380 +452,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
-dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
-dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-AC_DEFUN([GNOME_DOC_DEFINES],
-[
-AC_ARG_WITH([help-dir],
-  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-  [with_help_dir='${datadir}/gnome/help'])
-HELP_DIR="$with_help_dir"
-AC_SUBST(HELP_DIR)
-
-AC_ARG_WITH([omf-dir],
-  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-  [with_omf_dir='${datadir}/omf'])
-OMF_DIR="$with_omf_dir"
-AC_SUBST(OMF_DIR)
-
-AC_ARG_WITH([help-formats],
-  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-  [with_help_formats=''])
-DOC_USER_FORMATS="$with_help_formats"
-AC_SUBST(DOC_USER_FORMATS)
-
-AC_ARG_ENABLE([scrollkeeper],
-	[AC_HELP_STRING([--disable-scrollkeeper],
-			[do not make updates to the scrollkeeper database])],,
-	enable_scrollkeeper=yes)
-AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-
-dnl disable scrollkeeper automatically for distcheck
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-])
-
-# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-#
-AC_DEFUN([GNOME_DOC_INIT],
-[AC_REQUIRE([AC_PROG_LN_S])dnl
-
-ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
-AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
-PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	AC_MSG_RESULT([yes])
-	ifelse([$2],,[:],[$2])
-else
-	AC_MSG_RESULT([no])
-	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-fi
-
-GNOME_DOC_DEFINES
-])
-
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
-  dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH([html-dir],
-    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST([HTML_DIR])
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE([gtk-doc],
-    AS_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [[default=no]]]),,
-    [enable_gtk_doc=no])
-
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-  fi
-
-  AC_MSG_CHECKING([whether to build gtk-doc documentation])
-  AC_MSG_RESULT($enable_gtk_doc)
-
-  dnl enable/disable output formats
-  AC_ARG_ENABLE([gtk-doc-html],
-    AS_HELP_STRING([--enable-gtk-doc-html],
-                   [build documentation in html format [[default=yes]]]),,
-    [enable_gtk_doc_html=yes])
-    AC_ARG_ENABLE([gtk-doc-pdf],
-      AS_HELP_STRING([--enable-gtk-doc-pdf],
-                     [build documentation in pdf format [[default=no]]]),,
-      [enable_gtk_doc_pdf=no])
-
-  if test -z "$GTKDOC_MKPDF"; then
-    enable_gtk_doc_pdf=no
-  fi
-
-
-  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])
-
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  xl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='echo'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=echo
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='echo'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${F77-"f77"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${FC-"f95"}
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
-    ;;
-  esac
-])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 3017 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 4 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
 # nls.m4 serial 5 (gettext-0.18)
 dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
 dnl Inc.
@@ -10061,3 +1687,12 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gnome-doc-utils.m4])
+m4_include([m4/gtk-doc.m4])
+m4_include([m4/intltool.m4])
+m4_include([m4/introspection.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
diff --git a/configure b/configure
index 531e46b..5de9335 100755
--- a/configure
+++ b/configure
@@ -8767,6 +8767,10 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8792,11 +8796,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8795: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8799: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8799: \$? = $ac_status" >&5
+   echo "$as_me:8803: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9131,11 +9135,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9134: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9138: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9138: \$? = $ac_status" >&5
+   echo "$as_me:9142: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9236,11 +9240,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9239: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9243: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9243: \$? = $ac_status" >&5
+   echo "$as_me:9247: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9291,11 +9295,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9294: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9298: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9298: \$? = $ac_status" >&5
+   echo "$as_me:9302: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11675,7 +11679,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11678 "configure"
+#line 11682 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11771,7 +11775,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11774 "configure"
+#line 11778 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13064,8 +13068,8 @@ fi
 # Lib versioning
 ###########################
 
-LIBDBUSMENU_CURRENT=1
-LIBDBUSMENU_REVISION=17
+LIBDBUSMENU_CURRENT=2
+LIBDBUSMENU_REVISION=0
 LIBDBUSMENU_AGE=0
 
 
diff --git a/debian/changelog b/debian/changelog
index ebeed5a..e57e945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/control, debian/libdbusmenu-glib2.install,
     debian/libdbusmenu-gtk2.install: Switching package names to
     match .so bump.
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 13 Oct 2010 12:44:07 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 13 Oct 2010 12:48:17 -0500
 
 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 2564fa6..7f4a52b 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -36,7 +36,12 @@ host_triplet = @host@
 subdir = docs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/docs/libdbusmenu-glib/Makefile.in b/docs/libdbusmenu-glib/Makefile.in
index b0bda36..4823a1d 100644
--- a/docs/libdbusmenu-glib/Makefile.in
+++ b/docs/libdbusmenu-glib/Makefile.in
@@ -36,7 +36,12 @@ host_triplet = @host@
 subdir = docs/libdbusmenu-glib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/docs/libdbusmenu-glib/reference/Makefile.in b/docs/libdbusmenu-glib/reference/Makefile.in
index a1f2a8f..cf17c7b 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.in
+++ b/docs/libdbusmenu-glib/reference/Makefile.in
@@ -43,7 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make
 subdir = docs/libdbusmenu-glib/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/docs/libdbusmenu-gtk/Makefile.in b/docs/libdbusmenu-gtk/Makefile.in
index c7a6883..c3bf5e8 100644
--- a/docs/libdbusmenu-gtk/Makefile.in
+++ b/docs/libdbusmenu-gtk/Makefile.in
@@ -36,7 +36,12 @@ host_triplet = @host@
 subdir = docs/libdbusmenu-gtk
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.in b/docs/libdbusmenu-gtk/reference/Makefile.in
index 40e30f7..b9e1d6d 100644
--- a/docs/libdbusmenu-gtk/reference/Makefile.in
+++ b/docs/libdbusmenu-gtk/reference/Makefile.in
@@ -43,7 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make
 subdir = docs/libdbusmenu-gtk/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index ba93681..2bcede7 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -43,7 +43,12 @@ subdir = libdbusmenu-glib
 DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index f7a09b9..7c56288 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -43,7 +43,12 @@ subdir = libdbusmenu-gtk
 DIST_COMMON = $(libdbusmenu_gtkinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
new file mode 100644
index 0000000..2cfa1e7
--- /dev/null
+++ b/m4/gtk-doc.m4
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+  dnl check for tools we added during development
+  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH([html-dir],
+    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST([HTML_DIR])
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE([gtk-doc],
+    AS_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [[default=no]]]),,
+    [enable_gtk_doc=no])
+
+  if test x$enable_gtk_doc = xyes; then
+    ifelse([$1],[],
+      [PKG_CHECK_EXISTS([gtk-doc],,
+                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+  fi
+
+  AC_MSG_CHECKING([whether to build gtk-doc documentation])
+  AC_MSG_RESULT($enable_gtk_doc)
+
+  dnl enable/disable output formats
+  AC_ARG_ENABLE([gtk-doc-html],
+    AS_HELP_STRING([--enable-gtk-doc-html],
+                   [build documentation in html format [[default=yes]]]),,
+    [enable_gtk_doc_html=yes])
+    AC_ARG_ENABLE([gtk-doc-pdf],
+      AS_HELP_STRING([--enable-gtk-doc-pdf],
+                     [build documentation in pdf format [[default=no]]]),,
+      [enable_gtk_doc_pdf=no])
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
+
+
+  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 260cf3c..a8ee723 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -64,7 +64,12 @@ DIST_COMMON = $(libdbusmenu_jsonloaderinclude_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/dbusmenu-jsonloader.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 39c3877..167f6d0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -40,7 +40,12 @@ libexec_PROGRAMS = dbusmenu-dumper$(EXEEXT)
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in
index f6703a1..94af85f 100644
--- a/tools/testapp/Makefile.in
+++ b/tools/testapp/Makefile.in
@@ -38,7 +38,12 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT)
 subdir = tools/testapp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-- 
cgit v1.2.3


From 0390f89935c4ef8c1fbc1d959d2bc95b66cad2e4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 13 Oct 2010 12:53:44 -0500
Subject: releasing version 0.4.0~dev-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e57e945..d353ba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) maverick; urgency=low
 
   * Upstream Merge
     * Breaking ABI and getting reserved back
@@ -7,7 +7,7 @@ libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
     match .so bump.
   * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 13 Oct 2010 12:48:17 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 13 Oct 2010 12:53:40 -0500
 
 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 6e1734e1ad6ea13270afc6c9730d3e4ded2cda02 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 11 Nov 2010 11:24:40 -0600
Subject: Dummy commit for merge-upstream

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d353ba8..5b7c02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) maverick; urgency=low
+libdbusmenu (0.3.16-0ubuntu1~ppa1) maverick; urgency=low
 
   * Upstream Merge
     * Breaking ABI and getting reserved back
-- 
cgit v1.2.3


From 395db9878504b28778b246ea658be5287e758e1f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 11 Nov 2010 11:34:03 -0600
Subject: releasing version 0.3.90-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa69b1b..3fc5e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
     * Breaking ABI and getting reserved back
@@ -9,7 +9,7 @@ libdbusmenu (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
     debian/libdbusmenu-gtk2.install: Switching package names to
     match .so bump.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 11 Nov 2010 11:28:07 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 11 Nov 2010 11:34:00 -0600
 
 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low
 
-- 
cgit v1.2.3


From 95e4fc742556e9cdb56ee1459549abd764ea30d8 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 12:04:18 -0500
Subject: Initial work on building with gtk3 as well as gtk2

---
 debian/changelog                        |  6 ++++
 debian/control                          | 55 +++++++++++++++++++++++++++++----
 debian/gir1.0-dbusmenu-gtk3-0.2.install |  1 +
 debian/libdbusmenu-gtk3-dev.install     |  5 +++
 debian/libdbusmenu-gtk3.install         |  1 +
 debian/rules                            | 41 +++++++++++++++++++++---
 6 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 debian/gir1.0-dbusmenu-gtk3-0.2.install
 create mode 100644 debian/libdbusmenu-gtk3-dev.install
 create mode 100644 debian/libdbusmenu-gtk3.install

diff --git a/debian/changelog b/debian/changelog
index 3fc5e60..f62f1da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.90.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 24 Nov 2010 12:00:04 -0500
+
 libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index b162015..bec5001 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.
 Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
-               libgtk2.0-dev (>= 2.12.0),
+               libgtk2.0-dev (>= 2.23.2-0ubuntu2),
+               libgtk3.0-dev (>= 2.91.4-0ubuntu1),
                libdbus-glib-1-dev,
                gnome-doc-utils,
                gtk-doc-tools,
@@ -16,14 +17,12 @@ Build-Depends: debhelper (>= 5.0),
                libjson-glib-dev,
                gobject-introspection,
                gir-repository-dev,
-               libgirepository1.0-dev,
+               libgirepository1.0-dev (>= 0.9.3),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
+               gir1.0-gtk-3.0,
                libx11-dev (>= 1.3), 
-               valac,
-#  Check dependencies
-               xvfb,
-               dbus-test-runner
+               valac
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
@@ -181,3 +180,47 @@ Description: library for passing menus over DBus - Test lib development files
  .
  This package contains files that are needed to build test suites in 
  applications or libraries using dbusmenu.
+
+Package: libdbusmenu-gtk3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: library for passing menus over DBus - GTK+ version
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package contains shared libraries to be used by GTK+ applications.
+
+Package: libdbusmenu-gtk3-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbus-glib-1-dev (>= 0.76),
+         libgtk3.0-dev (>= 2.91.4-0ubuntu1),
+         libdbusmenu-glib-dev
+Description: library for passing menus over DBus - GTK+ version developement files
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package contains files that are needed to build GTK+ applications.
+
+Package: gir1.0-dbusmenu-gtk3-0.2
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         libdbusmenu-gtk3 (= ${binary:Version}),
+         gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
+         gir1.0-gtk-3.0
+Description: typelib file for libdbusmenu-gtk2
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings for libdbusmenu-gtk2.
+
diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.0-dbusmenu-gtk3-0.2.install
new file mode 100644
index 0000000..2da3933
--- /dev/null
+++ b/debian/gir1.0-dbusmenu-gtk3-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
new file mode 100644
index 0000000..d81ce8b
--- /dev/null
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3.pc
+debian/tmp/usr/lib/libdbusmenu-gtk3.a
+debian/tmp/usr/lib/libdbusmenu-gtk3.so
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.2.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.2.vapi
diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install
new file mode 100644
index 0000000..af2e9a3
--- /dev/null
+++ b/debian/libdbusmenu-gtk3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/rules b/debian/rules
index 1578fbf..7a88781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,43 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_MAKE_CHECK_TARGET := check
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+DEB_SRCDIR = .
+DEB_BUILDDIR = $(DEB_SRCDIR)/build
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.12)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.3.12)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
+
+configure/libdbusmenu-gtk3:: stamp-configure-gtk3
+stamp-configure-gtk3:
+	: # configure for GTK+ 3.0
+	set -e; \
+	rm -rf build-gtk3; \
+	mkdir build-gtk3; \
+	cd build-gtk3; \
+	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \
+		$(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \
+		--enable-gtk-doc=no; \
+	cd ..;
+	touch stamp-configure-gtk3
+
+build/libdbusmenu-gtk3:: stamp-build-gtk3
+stamp-build-gtk3: stamp-configure-gtk3
+	: # build for GTK+ 3.0
+	$(MAKE) -C build-gtk3;
+	touch stamp-build-gtk3
+
+binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3
+	: # install for GTK+ 3.0
+	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
+
+binary-predeb/gir%::
+	dh_girepository -p$(cdbs_curpkg)
 
+clean::
+	rm -f stamp-*-gtk3
+	rm -rf build-gtk3
-- 
cgit v1.2.3


From d5fcf6e23110f1ce1e753dc78da6b425dab0c713 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 12:05:26 -0500
Subject: Revert version bump

---
 debian/changelog | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f62f1da..3fc5e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-libdbusmenu (0.3.90.1-0ubuntu1) UNRELEASED; urgency=low
-
-  * New upstream release
-
- -- Ken VanDine <ken.vandine@canonical.com>  Wed, 24 Nov 2010 12:00:04 -0500
-
 libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
 
   * New upstream release.
-- 
cgit v1.2.3


From 0d98749cbe9f405e4579adf0c30d534c277c2686 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 14:07:15 -0500
Subject: * debian/rules   - Added build targets to build with gtk3 enabled in
 additional to     default build with gtk2 * debian/control   - Updated build
 depends to support building with gtk+-3.0   - Added dh-autoreconf build
 depends   - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev,
 gir1.0-dbusmenu-gtk3-0.2     binaries   - build depend on
 libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed     for GIR fixes *
 docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am,  
 libdbusmenu-gtk/Makefile.am   - Fixes needed for building with-gtk=3

---
 debian/changelog                           | 19 +++++++++++++++++--
 debian/control                             | 10 ++++++----
 debian/libdbusmenu-gtk3-2.install          |  1 +
 debian/libdbusmenu-gtk3.install            |  1 -
 debian/libdbusmenu-jsonloader1.install     |  1 -
 debian/libdbusmenu-jsonloader2.install     |  1 +
 debian/rules                               | 10 +++++-----
 docs/libdbusmenu-gtk/reference/Makefile.am | 11 +++++++++--
 libdbusmenu-glib/Makefile.am               | 11 ++++++++---
 libdbusmenu-gtk/Makefile.am                | 15 +++++++++++----
 10 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 debian/libdbusmenu-gtk3-2.install
 delete mode 100644 debian/libdbusmenu-gtk3.install
 delete mode 100644 debian/libdbusmenu-jsonloader1.install
 create mode 100644 debian/libdbusmenu-jsonloader2.install

diff --git a/debian/changelog b/debian/changelog
index 3fc5e60..857b8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,20 @@
-libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
+libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
 
+  * debian/rules
+    - Added build targets to build with gtk3 enabled in additional to 
+      default build with gtk2
+  * debian/control
+    - Updated build depends to support building with gtk+-3.0
+    - Added dh-autoreconf build depends
+    - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2
+      binaries
+    - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed
+      for GIR fixes
+  * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, 
+    libdbusmenu-gtk/Makefile.am
+    - Fixes needed for building with-gtk=3
+
+  [ Ted Gould ]
   * New upstream release.
     * Breaking ABI and getting reserved back
     * Adding build support for GTK2/3 builds
@@ -9,7 +24,7 @@ libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
     debian/libdbusmenu-gtk2.install: Switching package names to
     match .so bump.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 11 Nov 2010 11:34:00 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 24 Nov 2010 12:05:39 -0500
 
 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index bec5001..6a16de9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.23.2-0ubuntu2),
                libgtk3.0-dev (>= 2.91.4-0ubuntu1),
+               libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
                gnome-doc-utils,
                gtk-doc-tools,
@@ -22,6 +23,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-gtk-2.0,
                gir1.0-gtk-3.0,
                libx11-dev (>= 1.3), 
+               dh-autoreconf,
                valac
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
@@ -152,7 +154,7 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader1
+Package: libdbusmenu-jsonloader2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -181,7 +183,7 @@ Description: library for passing menus over DBus - Test lib development files
  This package contains files that are needed to build test suites in 
  applications or libraries using dbusmenu.
 
-Package: libdbusmenu-gtk3
+Package: libdbusmenu-gtk3-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -198,7 +200,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk3-2 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk3.0-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
@@ -213,7 +215,7 @@ Package: gir1.0-dbusmenu-gtk3-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk3-2 (= ${binary:Version}),
          gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
          gir1.0-gtk-3.0
 Description: typelib file for libdbusmenu-gtk2
diff --git a/debian/libdbusmenu-gtk3-2.install b/debian/libdbusmenu-gtk3-2.install
new file mode 100644
index 0000000..af2e9a3
--- /dev/null
+++ b/debian/libdbusmenu-gtk3-2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install
deleted file mode 100644
index af2e9a3..0000000
--- a/debian/libdbusmenu-gtk3.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-jsonloader1.install b/debian/libdbusmenu-jsonloader1.install
deleted file mode 100644
index bff47f5..0000000
--- a/debian/libdbusmenu-jsonloader1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
diff --git a/debian/libdbusmenu-jsonloader2.install b/debian/libdbusmenu-jsonloader2.install
new file mode 100644
index 0000000..bff47f5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
diff --git a/debian/rules b/debian/rules
index 7a88781..cd1d01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_SRCDIR = .
 DEB_BUILDDIR = $(DEB_SRCDIR)/build
@@ -10,10 +11,10 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-in
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)'
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
 
-configure/libdbusmenu-gtk3:: stamp-configure-gtk3
+configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3
 stamp-configure-gtk3:
 	: # configure for GTK+ 3.0
 	set -e; \
@@ -26,16 +27,15 @@ stamp-configure-gtk3:
 	cd ..;
 	touch stamp-configure-gtk3
 
-build/libdbusmenu-gtk3:: stamp-build-gtk3
+build/libdbusmenu-gtk3-2:: stamp-build-gtk3
 stamp-build-gtk3: stamp-configure-gtk3
 	: # build for GTK+ 3.0
 	$(MAKE) -C build-gtk3;
 	touch stamp-build-gtk3
 
-binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3
+common-install-prehook-arch:: stamp-build-gtk3
 	: # install for GTK+ 3.0
 	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
-	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-predeb/gir%::
 	dh_girepository -p$(cdbs_curpkg)
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am
index ec1bd28..6e44a23 100644
--- a/docs/libdbusmenu-gtk/reference/Makefile.am
+++ b/docs/libdbusmenu-gtk/reference/Makefile.am
@@ -1,5 +1,12 @@
+
 ## Process this file with automake to produce Makefile.in
 
+if USE_GTK3
+VER=3
+else
+VER=
+endif
+
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 
@@ -9,7 +16,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=libdbusmenu-gtk
+DOC_MODULE=libdbusmenu-gtk$(VER)
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -68,7 +75,7 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la 
+GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.local.make
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 0a6513f..adf4607 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -114,9 +114,12 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(srcdir) \
-	$(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+        --add-include-path=$(srcdir) \
+        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
+        --symbol-prefix=dbusmenu \
+        --identifier-prefix=Dbusmenu
+
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
@@ -131,6 +134,8 @@ Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
 Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
 Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
 Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
+Dbusmenu_Glib_0_2_gir_PACKAGES = dbusmenu-glib
+Dbusmenu_Glib_0_2_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 
 INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir
 
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index b30cac9..e539aa6 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -66,10 +66,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(srcdir) \
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
-	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
+	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
+	--symbol-prefix=dbusmenu \
+	--identifier-prefix=DbusmenuGtk
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 
 if HAVE_INTROSPECTION
@@ -80,16 +81,22 @@ DbusmenuGtk$(VER)-0.2.gir: libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_2_gir_INCLUDES = \
 	GObject-2.0 \
 	$(GTKGIR) \
-	Dbusmenu-Glib-0.2
+	Dbusmenu-Glib-0.2 
 DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
 DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER)
+DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
+DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER)
 
 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
 DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
 DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)
 DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
 DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
+DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE)
+DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS)
+DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES)
 
 INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir
 
-- 
cgit v1.2.3


From de669471f0df99a6ea165d3e13b50410f7aaa500 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 1 Dec 2010 15:17:32 -0500
Subject:   - Removed build depends for gir-repository-dev (LP: #677382)   -
 Use gir:Depends

---
 debian/changelog |  2 ++
 debian/control   | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 857b8c6..5b24f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
       binaries
     - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed
       for GIR fixes
+    - Removed build depends for gir-repository-dev (LP: #677382)
+    - Use gir:Depends
   * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, 
     libdbusmenu-gtk/Makefile.am
     - Fixes needed for building with-gtk=3
diff --git a/debian/control b/debian/control
index 6a16de9..bef3fd0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,14 +17,13 @@ Build-Depends: debhelper (>= 5.0),
                libxml2-dev,
                libjson-glib-dev,
                gobject-introspection,
-               gir-repository-dev,
                libgirepository1.0-dev (>= 0.9.3),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                gir1.0-gtk-3.0,
                libx11-dev (>= 1.3), 
                dh-autoreconf,
-               valac
+               valac-0.12
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
@@ -108,7 +107,7 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-glib2 (= ${binary:Version}),
-         gir1.0-glib-2.0
+         ${gir:Depends}
 Description: typelib file for libdbusmenu-glib2
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -122,8 +121,7 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-gtk2 (= ${binary:Version}),
-         gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
-         gir1.0-gtk-2.0
+         ${gir:Depends}
 Description: typelib file for libdbusmenu-gtk2
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -216,8 +214,7 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-gtk3-2 (= ${binary:Version}),
-         gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
-         gir1.0-gtk-3.0
+         ${gir:Depends}
 Description: typelib file for libdbusmenu-gtk2
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
-- 
cgit v1.2.3


From 39b36ed6a1773a1a336414262e3923914596208b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 7 Dec 2010 10:00:57 -0600
Subject: debian/*.install: Changing to be the 0.4 version of the dbusmenu API
 of all the filenames and paths.

---
 debian/changelog                          | 4 +++-
 debian/gir1.0-dbusmenu-glib-0.2.install   | 2 +-
 debian/gir1.0-dbusmenu-gtk-0.2.install    | 2 +-
 debian/gir1.0-dbusmenu-gtk3-0.2.install   | 2 +-
 debian/libdbusmenu-glib-dev.install       | 8 ++++----
 debian/libdbusmenu-gtk-dev.install        | 8 ++++----
 debian/libdbusmenu-gtk3-dev.install       | 6 +++---
 debian/libdbusmenu-jsonloader-dev.install | 4 ++--
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 309ad63..a2ddd53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Porting from dbus-glib to GDBus
+  * debian/*.install: Changing to be the 0.4 version of the dbusmenu
+    API of all the filenames and paths.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 07 Dec 2010 09:45:06 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 07 Dec 2010 10:00:29 -0600
 
 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
 
diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install
index 86f7711..bca065f 100644
--- a/debian/gir1.0-dbusmenu-glib-0.2.install
+++ b/debian/gir1.0-dbusmenu-glib-0.2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib
+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib
diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install
index 829a344..16bad97 100644
--- a/debian/gir1.0-dbusmenu-gtk-0.2.install
+++ b/debian/gir1.0-dbusmenu-gtk-0.2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib
diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.0-dbusmenu-gtk3-0.2.install
index 2da3933..abf6fab 100644
--- a/debian/gir1.0-dbusmenu-gtk3-0.2.install
+++ b/debian/gir1.0-dbusmenu-gtk3-0.2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index b693fda..35c7805 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-glib/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
-debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.2.gir
-debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.2.vapi
+debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.4.gir
+debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.4.vapi
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 3fa028f..0ce2419 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-gtk/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-gtk.a
 debian/tmp/usr/lib/libdbusmenu-gtk.so
-debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.2.gir
-debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.2.vapi
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index d81ce8b..2c9d2e3 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3.pc
+debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-gtk3.a
 debian/tmp/usr/lib/libdbusmenu-gtk3.so
-debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.2.gir
-debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.2.vapi
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
index 27c41a5..9594064 100644
--- a/debian/libdbusmenu-jsonloader-dev.install
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-jsonloader.a
 debian/tmp/usr/lib/libdbusmenu-jsonloader.so
-- 
cgit v1.2.3


From 6fe974028fbc908d56e58fc6f262359782a37089 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 7 Dec 2010 10:03:05 -0600
Subject: Autogen

---
 Makefile.in                                 |   8 +-
 configure                                   | 153 +++++++++++++++++++---------
 debian/changelog                            |   3 +-
 docs/Makefile.in                            |   1 +
 docs/libdbusmenu-glib/Makefile.in           |   1 +
 docs/libdbusmenu-glib/reference/Makefile.in |   1 +
 docs/libdbusmenu-gtk/Makefile.in            |   1 +
 docs/libdbusmenu-gtk/reference/Makefile.in  |   7 +-
 libdbusmenu-glib/Makefile.in                |  94 ++++++++++-------
 libdbusmenu-gtk/Makefile.in                 |  81 +++++++++------
 tests/Makefile.in                           |   9 +-
 tools/Makefile.in                           |   1 +
 tools/testapp/Makefile.in                   |   8 +-
 13 files changed, 242 insertions(+), 126 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 10932aa..b123f90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	compile config.guess config.sub depcomp install-sh ltmain.sh \
 	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -223,6 +228,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/configure b/configure
index 221ec41..4c50547 100755
--- a/configure
+++ b/configure
@@ -763,7 +763,10 @@ GETTEXT_PACKAGE
 LIBDBUSMENU_AGE
 LIBDBUSMENU_REVISION
 LIBDBUSMENU_CURRENT
+XSLT_PROC
 VALA_API_GEN
+INTROSPECTION_TEN_FALSE
+INTROSPECTION_TEN_TRUE
 HAVE_INTROSPECTION_FALSE
 HAVE_INTROSPECTION_TRUE
 INTROSPECTION_MAKEFILE
@@ -6312,13 +6315,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6315: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6318: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6318: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6321: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6321: output\"" >&5)
+  (eval echo "\"\$as_me:6324: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7523,7 +7526,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7526 "configure"' > conftest.$ac_ext
+  echo '#line 7529 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8773,6 +8776,10 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8798,11 +8805,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8801: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8808: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8805: \$? = $ac_status" >&5
+   echo "$as_me:8812: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9137,11 +9144,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9140: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9147: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9144: \$? = $ac_status" >&5
+   echo "$as_me:9151: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9242,11 +9249,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9245: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9252: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9249: \$? = $ac_status" >&5
+   echo "$as_me:9256: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9297,11 +9304,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9300: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9307: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9304: \$? = $ac_status" >&5
+   echo "$as_me:9311: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11681,7 +11688,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11684 "configure"
+#line 11691 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11777,7 +11784,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11780 "configure"
+#line 11787 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12477,8 +12484,7 @@ fi
 # Dependencies - GLib
 ###########################
 
-GLIB_REQUIRED_VERSION=2.18
-DBUS_REQUIRED_VERSION=0.76
+GLIB_REQUIRED_VERSION=2.26
 XML_REQUIRED_VERSION=2.6
 
 
@@ -12491,16 +12497,16 @@ if test -n "$DBUSMENUGLIB_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
+                                gio-2.0 >= \$GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUSMENUGLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -12513,16 +12519,16 @@ if test -n "$DBUSMENUGLIB_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
+                                gio-2.0 >= \$GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUSMENUGLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -12544,18 +12550,18 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1`
         else
 	        DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUSMENUGLIB_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION) were not met:
 
 $DBUSMENUGLIB_PKG_ERRORS
@@ -12619,18 +12625,15 @@ if test -n "$DBUSMENUGTK_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
                                          glib-2.0 >= \$GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUSMENUGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -12644,18 +12647,15 @@ if test -n "$DBUSMENUGTK_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
                                          glib-2.0 >= \$GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUSMENUGTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -12678,12 +12678,10 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1`
         else
 	        DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -12691,7 +12689,6 @@ fi
 
 	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION) were not met:
 
 $DBUSMENUGTK_PKG_ERRORS
@@ -12742,18 +12739,15 @@ if test -n "$DBUSMENUGTK_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
                                          glib-2.0 >= \$GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUSMENUGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -12767,18 +12761,15 @@ if test -n "$DBUSMENUGTK_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
                                          glib-2.0 >= \$GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUSMENUGTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -12801,12 +12792,10 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1`
         else
 	        DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -12814,7 +12803,6 @@ fi
 
 	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION) were not met:
 
 $DBUSMENUGTK_PKG_ERRORS
@@ -13181,6 +13169,26 @@ fi
 
 
 
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.10\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  introspection_ten=yes
+else
+  introspection_ten=no
+fi
+
+ if test "x$introspection_ten" = "xyes"; then
+  INTROSPECTION_TEN_TRUE=
+  INTROSPECTION_TEN_FALSE='#'
+else
+  INTROSPECTION_TEN_TRUE='#'
+  INTROSPECTION_TEN_FALSE=
+fi
+
+
 ###########################
 # Vala API Generation
 ###########################
@@ -13226,6 +13234,51 @@ fi
 
 
 
+###########################
+# XSLT Processor
+###########################
+
+# Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XSLT_PROC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSLT_PROC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSLT_PROC="$XSLT_PROC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSLT_PROC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSLT_PROC=$ac_cv_path_XSLT_PROC
+if test -n "$XSLT_PROC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLT_PROC" >&5
+$as_echo "$XSLT_PROC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 ###########################
 # Lib versioning
 ###########################
@@ -13977,7 +14030,7 @@ fi
 # Files
 ###########################
 
-ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc libdbusmenu-gtk/dbusmenu-gtk3.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"
+ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib-0.4.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk-0.4.pc libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader-0.4.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14141,6 +14194,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${INTROSPECTION_TEN_TRUE}" && test -z "${INTROSPECTION_TEN_FALSE}"; then
+  as_fn_error $? "conditional \"INTROSPECTION_TEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -15007,14 +15064,14 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES libdbusmenu-glib/Makefile" ;;
-    "libdbusmenu-glib/dbusmenu-glib.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-glib/dbusmenu-glib.pc" ;;
+    "libdbusmenu-glib/dbusmenu-glib-0.4.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-glib/dbusmenu-glib-0.4.pc" ;;
     "libdbusmenu-gtk/Makefile") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/Makefile" ;;
-    "libdbusmenu-gtk/dbusmenu-gtk.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk.pc" ;;
-    "libdbusmenu-gtk/dbusmenu-gtk3.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk3.pc" ;;
+    "libdbusmenu-gtk/dbusmenu-gtk-0.4.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk-0.4.pc" ;;
+    "libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "tests/dbusmenu-jsonloader.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader.pc" ;;
+    "tests/dbusmenu-jsonloader-0.4.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader-0.4.pc" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;;
     "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;;
diff --git a/debian/changelog b/debian/changelog
index a2ddd53..ceabf87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low
     * Porting from dbus-glib to GDBus
   * debian/*.install: Changing to be the 0.4 version of the dbusmenu
     API of all the filenames and paths.
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 07 Dec 2010 10:00:29 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 07 Dec 2010 10:02:55 -0600
 
 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7f4a52b..c47df3f 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -212,6 +212,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/docs/libdbusmenu-glib/Makefile.in b/docs/libdbusmenu-glib/Makefile.in
index 4823a1d..d18dc84 100644
--- a/docs/libdbusmenu-glib/Makefile.in
+++ b/docs/libdbusmenu-glib/Makefile.in
@@ -212,6 +212,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/docs/libdbusmenu-glib/reference/Makefile.in b/docs/libdbusmenu-glib/reference/Makefile.in
index cf17c7b..acd1735 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.in
+++ b/docs/libdbusmenu-glib/reference/Makefile.in
@@ -179,6 +179,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/docs/libdbusmenu-gtk/Makefile.in b/docs/libdbusmenu-gtk/Makefile.in
index c3bf5e8..1dd1094 100644
--- a/docs/libdbusmenu-gtk/Makefile.in
+++ b/docs/libdbusmenu-gtk/Makefile.in
@@ -212,6 +212,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.in b/docs/libdbusmenu-gtk/reference/Makefile.in
index b9e1d6d..a9548c4 100644
--- a/docs/libdbusmenu-gtk/reference/Makefile.in
+++ b/docs/libdbusmenu-gtk/reference/Makefile.in
@@ -179,6 +179,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -231,6 +232,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@VER = 
+@USE_GTK3_TRUE@VER = 3
 
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
@@ -241,7 +244,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE = libdbusmenu-gtk
+DOC_MODULE = libdbusmenu-gtk$(VER)
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
@@ -300,7 +303,7 @@ expand_content_files =
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES = -I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la 
+GTKDOC_LIBS = $(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index 2bcede7..86c95f4 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -36,12 +36,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.2.gir
+@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.4.gir
 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \
 @HAVE_INTROSPECTION_TRUE@	$(vapi_DATA)
 subdir = libdbusmenu-glib
 DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in
+	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib-0.4.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
@@ -53,7 +53,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = dbusmenu-glib.pc
+CONFIG_CLEAN_FILES = dbusmenu-glib-0.4.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -83,7 +83,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libdbusmenu_glib_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libdbusmenu_glib_la_OBJECTS = libdbusmenu_glib_la-menuitem.lo \
+am_libdbusmenu_glib_la_OBJECTS =  \
+	libdbusmenu_glib_la-dbus-menu-clean.xml.lo \
+	libdbusmenu_glib_la-menuitem.lo \
 	libdbusmenu_glib_la-menuitem-marshal.lo \
 	libdbusmenu_glib_la-menuitem-proxy.lo \
 	libdbusmenu_glib_la-server.lo \
@@ -247,6 +249,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -299,9 +302,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-CLEANFILES = $(am__append_2)
+CLEANFILES = dbus-menu-clean.xml $(BUILT_SOURCES) $(am__append_2)
 EXTRA_DIST = \
-	dbusmenu-glib.pc.in \
+	clean-namespaces.xslt \
+	dbusmenu-glib-0.4.pc.in \
 	dbus-menu.xml \
 	client-marshal.list \
 	menuitem-marshal.list \
@@ -310,7 +314,7 @@ EXTRA_DIST = \
 lib_LTLIBRARIES = \
 	libdbusmenu-glib.la
 
-libdbusmenu_glibincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-glib/
+libdbusmenu_glibincludedir = $(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
 libdbusmenu_glibinclude_HEADERS = \
 	menuitem.h \
 	menuitem-proxy.h \
@@ -318,8 +322,8 @@ libdbusmenu_glibinclude_HEADERS = \
 	client.h
 
 libdbusmenu_glib_la_SOURCES = \
-	dbusmenu-server.h \
-	dbusmenu-client.h \
+	dbus-menu-clean.xml.h \
+	dbus-menu-clean.xml.c \
 	menuitem.h \
 	menuitem.c \
 	menuitem-marshal.h \
@@ -349,11 +353,11 @@ libdbusmenu_glib_la_CFLAGS = \
 libdbusmenu_glib_la_LIBADD = \
 	$(DBUSMENUGLIB_LIBS)
 
-pkgconfig_DATA = dbusmenu-glib.pc
+pkgconfig_DATA = dbusmenu-glib-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 BUILT_SOURCES = \
-	dbusmenu-client.h \
-	dbusmenu-server.h \
+	dbus-menu-clean.xml.c \
+	dbus-menu-clean.xml.h \
 	client-marshal.h \
 	client-marshal.c \
 	menuitem-marshal.h \
@@ -362,20 +366,28 @@ BUILT_SOURCES = \
 	server-marshal.c
 
 INTROSPECTION_GIRS = $(am__append_1)
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(srcdir) \
-	$(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+@INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_FALSE@        --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_FALSE@        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+
+@INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_TRUE@        --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_TRUE@        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
+@INTROSPECTION_TEN_TRUE@        --symbol-prefix=dbusmenu \
+@INTROSPECTION_TEN_TRUE@        --identifier-prefix=Dbusmenu
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_INCLUDES = \
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_INCLUDES = \
 @HAVE_INTROSPECTION_TRUE@	GObject-2.0
 
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_PACKAGES = dbusmenu-glib
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
@@ -385,7 +397,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 # VAPI Files
 #########################
 @HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
-@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.2.vapi
+@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.4.vapi
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -421,7 +433,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-dbusmenu-glib.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-glib.pc.in
+dbusmenu-glib-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-glib-0.4.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -466,6 +478,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client-menuitem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem-proxy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem.Plo@am__quote@
@@ -496,6 +509,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libdbusmenu_glib_la-dbus-menu-clean.xml.lo: dbus-menu-clean.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_glib_la-dbus-menu-clean.xml.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Tpo -c -o libdbusmenu_glib_la-dbus-menu-clean.xml.lo `test -f 'dbus-menu-clean.xml.c' || echo '$(srcdir)/'`dbus-menu-clean.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Tpo $(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dbus-menu-clean.xml.c' object='libdbusmenu_glib_la-dbus-menu-clean.xml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_glib_la-dbus-menu-clean.xml.lo `test -f 'dbus-menu-clean.xml.c' || echo '$(srcdir)/'`dbus-menu-clean.xml.c
+
 libdbusmenu_glib_la-menuitem.lo: menuitem.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_glib_la-menuitem.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_glib_la-menuitem.Tpo -c -o libdbusmenu_glib_la-menuitem.lo `test -f 'menuitem.c' || echo '$(srcdir)/'`menuitem.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_glib_la-menuitem.Tpo $(DEPDIR)/libdbusmenu_glib_la-menuitem.Plo
@@ -882,19 +903,16 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 	uninstall-vapiDATA
 
 
-dbusmenu-server.h: dbus-menu.xml
-	dbus-binding-tool \
-		--prefix=_dbusmenu_server \
-		--mode=glib-server \
-		--output=dbusmenu-server.h \
-		$(srcdir)/dbus-menu.xml
+%.xml.h: %.xml
+	echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@
+
+%.xml.c: %.xml
+	echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@
+	sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	echo ";" >> $@
 
-dbusmenu-client.h: dbus-menu.xml
-	dbus-binding-tool \
-		--prefix=_dbusmenu_client \
-		--mode=glib-client \
-		--output=dbusmenu-client.h \
-		$(srcdir)/dbus-menu.xml
+dbus-menu-clean.xml: dbus-menu.xml
+	$(XSLT_PROC) $(srcdir)/clean-namespaces.xslt $< > $@ || (rm -f $@ && /bin/false)
 
 client-marshal.h: $(srcdir)/client-marshal.list
 	glib-genmarshal --header \
@@ -932,10 +950,10 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list
 
 -include $(INTROSPECTION_MAKEFILE)
 
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
 
-@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.2.vapi: Dbusmenu-Glib-0.2.gir
-@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $<
+@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir
+@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index 59434eb..777906b 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -36,22 +36,27 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@HAVE_INTROSPECTION_TRUE@am__append_1 = DbusmenuGtk$(VER)-0.2.gir
+@HAVE_INTROSPECTION_TRUE@am__append_1 = DbusmenuGtk$(VER)-0.4.gir
 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \
 @HAVE_INTROSPECTION_TRUE@	$(vapi_DATA) \
-@HAVE_INTROSPECTION_TRUE@	DbusmenuGtk$(VER)-0.2.tmp.gir
+@HAVE_INTROSPECTION_TRUE@	DbusmenuGtk$(VER)-0.4.tmp.gir
 subdir = libdbusmenu-gtk
 DIST_COMMON = $(libdbusmenu_gtk3include_HEADERS) \
 	$(libdbusmenu_gtkinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk.pc.in \
-	$(srcdir)/dbusmenu-gtk3.pc.in
+	$(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk-0.4.pc.in \
+	$(srcdir)/dbusmenu-gtk3-0.4.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = dbusmenu-gtk.pc dbusmenu-gtk3.pc
+CONFIG_CLEAN_FILES = dbusmenu-gtk-0.4.pc dbusmenu-gtk3-0.4.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -258,6 +263,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -320,10 +326,10 @@ CLEANFILES = $(am__append_2)
 @USE_GTK3_FALSE@lib_LTLIBRARIES = libdbusmenu-gtk.la
 @USE_GTK3_TRUE@lib_LTLIBRARIES = libdbusmenu-gtk3.la
 EXTRA_DIST = \
-	dbusmenu-gtk.pc.in \
-	dbusmenu-gtk3.pc.in
+	dbusmenu-gtk-0.4.pc.in \
+	dbusmenu-gtk3-0.4.pc.in
 
-libdbusmenu_gtkincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-gtk$(VER)/
+libdbusmenu_gtkincludedir = $(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/
 libdbusmenu_gtkinclude_HEADERS = \
 	client.h \
 	menu.h \
@@ -362,30 +368,43 @@ libdbusmenu_gtk3_la_SOURCES = $(libdbusmenu_gtk_la_SOURCES)
 libdbusmenu_gtk3_la_LDFLAGS = $(libdbusmenu_gtk_la_LDFLAGS)
 libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS)
 libdbusmenu_gtk3_la_LIBADD = $(libdbusmenu_gtk_la_LIBADD)
-pkgconfig_DATA = dbusmenu-gtk$(VER).pc
+pkgconfig_DATA = dbusmenu-gtk$(VER)-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 INTROSPECTION_GIRS = $(am__append_1)
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(srcdir) \
-	--add-include-path=$(top_builddir)/libdbusmenu-glib \
-	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
+@INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_FALSE@	--add-include-path=$(top_builddir)/libdbusmenu-glib \
+@INTROSPECTION_TEN_FALSE@	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
+@INTROSPECTION_TEN_FALSE@	--symbol-prefix=dbusmenu \
+@INTROSPECTION_TEN_FALSE@	--identifier-prefix=DbusmenuGtk
+
+@INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_TRUE@	--add-include-path=$(top_builddir)/libdbusmenu-glib \
+@INTROSPECTION_TEN_TRUE@	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
+@INTROSPECTION_TEN_TRUE@	--symbol-prefix=dbusmenu \
+@INTROSPECTION_TEN_TRUE@	--identifier-prefix=DbusmenuGtk
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_gtkinclude_HEADERS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_INCLUDES = \
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_INCLUDES = \
 @HAVE_INTROSPECTION_TRUE@	GObject-2.0 \
 @HAVE_INTROSPECTION_TRUE@	$(GTKGIR) \
-@HAVE_INTROSPECTION_TRUE@	Dbusmenu-Glib-0.2
+@HAVE_INTROSPECTION_TRUE@	Dbusmenu-Glib-0.4 
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_PACKAGES = dbusmenu-gtk$(VER)
 
 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_INCLUDES = $(DbusmenuGtk_0_4_gir_INCLUDES)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_CFLAGS = $(DbusmenuGtk_0_4_gir_CFLAGS)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_LIBS = $(DbusmenuGtk_0_4_gir_LIBS)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_FILES = $(DbusmenuGtk_0_4_gir_FILES)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_NAMESPACE = $(DbusmenuGtk_0_4_gir_NAMESPACE)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_SCANNERFLAGS = $(DbusmenuGtk_0_4_gir_SCANNERFLAGS)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_PACKAGES = $(DbusmenuGtk_0_4_gir_PACKAGES)
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
@@ -395,7 +414,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_buildd
 # VAPI Files
 #########################
 @HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
-@HAVE_INTROSPECTION_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.2.vapi
+@HAVE_INTROSPECTION_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
 all: all-am
 
 .SUFFIXES:
@@ -430,9 +449,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-dbusmenu-gtk.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk.pc.in
+dbusmenu-gtk-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk-0.4.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-dbusmenu-gtk3.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk3.pc.in
+dbusmenu-gtk3-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk3-0.4.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -922,18 +941,18 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 
 -include $(INTROSPECTION_MAKEFILE)
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.2.gir: libdbusmenu-gtk$(VER).la
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.2.vapi: DbusmenuGtk$(VER)-0.2.tmp.gir Makefile.am
-@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.2 \
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
 @HAVE_INTROSPECTION_TRUE@		--pkg gdk-pixbuf-2.0 \
 @HAVE_INTROSPECTION_TRUE@		--pkg $(GTKVALA) \
 @HAVE_INTROSPECTION_TRUE@		--pkg atk \
-@HAVE_INTROSPECTION_TRUE@		--pkg Dbusmenu-Glib-0.2 \
+@HAVE_INTROSPECTION_TRUE@		--pkg Dbusmenu-Glib-0.4 \
 @HAVE_INTROSPECTION_TRUE@		--vapidir=$(top_builddir)/libdbusmenu-glib \
 @HAVE_INTROSPECTION_TRUE@		$<
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.2.tmp.gir: DbusmenuGtk$(VER)-0.2.gir
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.tmp.gir: DbusmenuGtk$(VER)-0.4.gir
 @HAVE_INTROSPECTION_TRUE@	$(SED) \
 @HAVE_INTROSPECTION_TRUE@		-e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \
 @HAVE_INTROSPECTION_TRUE@		-e "s|Atk.ImplementorIface|Atk.Implementor|g" \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a8ee723..30851b3 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -62,7 +62,7 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 subdir = tests
 DIST_COMMON = $(libdbusmenu_jsonloaderinclude_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/dbusmenu-jsonloader.pc.in
+	$(srcdir)/dbusmenu-jsonloader-0.4.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
@@ -74,7 +74,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = dbusmenu-jsonloader.pc
+CONFIG_CLEAN_FILES = dbusmenu-jsonloader-0.4.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -557,6 +557,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -645,7 +646,7 @@ libdbusmenu_jsonloader_la_LIBADD = \
 	$(DBUSMENUGLIB_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
-pkgconfig_DATA = dbusmenu-jsonloader.pc
+pkgconfig_DATA = dbusmenu-jsonloader-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 ######################
@@ -1055,7 +1056,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-dbusmenu-jsonloader.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader.pc.in
+dbusmenu-jsonloader-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader-0.4.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 167f6d0..7d48bd7 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -276,6 +276,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in
index 8a7a441..387c6bb 100644
--- a/tools/testapp/Makefile.in
+++ b/tools/testapp/Makefile.in
@@ -38,7 +38,12 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT)
 subdir = tools/testapp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -207,6 +212,7 @@ USE_NLS = @USE_NLS@
 VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XSLT_PROC = @XSLT_PROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
-- 
cgit v1.2.3


From b11d9481ab38cce236e87463206eb489777e5bfa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 7 Dec 2010 21:13:17 -0600
Subject: Update marshallers

---
 libdbusmenu-glib/client-marshal.c   | 12 ++++++------
 libdbusmenu-glib/client-marshal.h   |  4 ++--
 libdbusmenu-glib/menuitem-marshal.c | 12 ++++++------
 libdbusmenu-glib/menuitem-marshal.h |  4 ++--
 libdbusmenu-glib/server-marshal.c   | 12 ++++++------
 libdbusmenu-glib/server-marshal.h   |  4 ++--
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/libdbusmenu-glib/client-marshal.c b/libdbusmenu-glib/client-marshal.c
index 56b0100..1fabb99 100644
--- a/libdbusmenu-glib/client-marshal.c
+++ b/libdbusmenu-glib/client-marshal.c
@@ -86,23 +86,23 @@ _dbusmenu_client_marshal_VOID__OBJECT_UINT (GClosure     *closure,
             data2);
 }
 
-/* VOID:OBJECT,STRING,POINTER,UINT,POINTER (./client-marshal.list:2) */
+/* VOID:OBJECT,STRING,VARIANT,UINT,POINTER (./client-marshal.list:2) */
 void
-_dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER (GClosure     *closure,
+_dbusmenu_client_marshal_VOID__OBJECT_STRING_VARIANT_UINT_POINTER (GClosure     *closure,
                                                                    GValue       *return_value G_GNUC_UNUSED,
                                                                    guint         n_param_values,
                                                                    const GValue *param_values,
                                                                    gpointer      invocation_hint G_GNUC_UNUSED,
                                                                    gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__OBJECT_STRING_POINTER_UINT_POINTER) (gpointer     data1,
+  typedef void (*GMarshalFunc_VOID__OBJECT_STRING_VARIANT_UINT_POINTER) (gpointer     data1,
                                                                          gpointer     arg_1,
                                                                          gpointer     arg_2,
                                                                          gpointer     arg_3,
                                                                          guint        arg_4,
                                                                          gpointer     arg_5,
                                                                          gpointer     data2);
-  register GMarshalFunc_VOID__OBJECT_STRING_POINTER_UINT_POINTER callback;
+  register GMarshalFunc_VOID__OBJECT_STRING_VARIANT_UINT_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
@@ -118,12 +118,12 @@ _dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER (GClosure
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__OBJECT_STRING_POINTER_UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__OBJECT_STRING_VARIANT_UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_object (param_values + 1),
             g_marshal_value_peek_string (param_values + 2),
-            g_marshal_value_peek_pointer (param_values + 3),
+            g_marshal_value_peek_variant (param_values + 3),
             g_marshal_value_peek_uint (param_values + 4),
             g_marshal_value_peek_pointer (param_values + 5),
             data2);
diff --git a/libdbusmenu-glib/client-marshal.h b/libdbusmenu-glib/client-marshal.h
index 9c43fc9..f12ddde 100644
--- a/libdbusmenu-glib/client-marshal.h
+++ b/libdbusmenu-glib/client-marshal.h
@@ -14,8 +14,8 @@ extern void _dbusmenu_client_marshal_VOID__OBJECT_UINT (GClosure     *closure,
                                                         gpointer      invocation_hint,
                                                         gpointer      marshal_data);
 
-/* VOID:OBJECT,STRING,POINTER,UINT,POINTER (./client-marshal.list:2) */
-extern void _dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER (GClosure     *closure,
+/* VOID:OBJECT,STRING,VARIANT,UINT,POINTER (./client-marshal.list:2) */
+extern void _dbusmenu_client_marshal_VOID__OBJECT_STRING_VARIANT_UINT_POINTER (GClosure     *closure,
                                                                                GValue       *return_value,
                                                                                guint         n_param_values,
                                                                                const GValue *param_values,
diff --git a/libdbusmenu-glib/menuitem-marshal.c b/libdbusmenu-glib/menuitem-marshal.c
index d6ac0a6..bb2b6d7 100644
--- a/libdbusmenu-glib/menuitem-marshal.c
+++ b/libdbusmenu-glib/menuitem-marshal.c
@@ -49,20 +49,20 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* VOID:STRING,POINTER (./menuitem-marshal.list:1) */
+/* VOID:STRING,VARIANT (./menuitem-marshal.list:1) */
 void
-_dbusmenu_menuitem_marshal_VOID__STRING_POINTER (GClosure     *closure,
+_dbusmenu_menuitem_marshal_VOID__STRING_VARIANT (GClosure     *closure,
                                                  GValue       *return_value G_GNUC_UNUSED,
                                                  guint         n_param_values,
                                                  const GValue *param_values,
                                                  gpointer      invocation_hint G_GNUC_UNUSED,
                                                  gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer     data1,
+  typedef void (*GMarshalFunc_VOID__STRING_VARIANT) (gpointer     data1,
                                                      gpointer     arg_1,
                                                      gpointer     arg_2,
                                                      gpointer     data2);
-  register GMarshalFunc_VOID__STRING_POINTER callback;
+  register GMarshalFunc_VOID__STRING_VARIANT callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
@@ -78,11 +78,11 @@ _dbusmenu_menuitem_marshal_VOID__STRING_POINTER (GClosure     *closure,
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__STRING_VARIANT) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_string (param_values + 1),
-            g_marshal_value_peek_pointer (param_values + 2),
+            g_marshal_value_peek_variant (param_values + 2),
             data2);
 }
 
diff --git a/libdbusmenu-glib/menuitem-marshal.h b/libdbusmenu-glib/menuitem-marshal.h
index c072d4a..0cde7ad 100644
--- a/libdbusmenu-glib/menuitem-marshal.h
+++ b/libdbusmenu-glib/menuitem-marshal.h
@@ -6,8 +6,8 @@
 
 G_BEGIN_DECLS
 
-/* VOID:STRING,POINTER (./menuitem-marshal.list:1) */
-extern void _dbusmenu_menuitem_marshal_VOID__STRING_POINTER (GClosure     *closure,
+/* VOID:STRING,VARIANT (./menuitem-marshal.list:1) */
+extern void _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT (GClosure     *closure,
                                                              GValue       *return_value,
                                                              guint         n_param_values,
                                                              const GValue *param_values,
diff --git a/libdbusmenu-glib/server-marshal.c b/libdbusmenu-glib/server-marshal.c
index 68552f6..61393f4 100644
--- a/libdbusmenu-glib/server-marshal.c
+++ b/libdbusmenu-glib/server-marshal.c
@@ -49,21 +49,21 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* VOID:INT,STRING,POINTER (./server-marshal.list:1) */
+/* VOID:INT,STRING,VARIANT (./server-marshal.list:1) */
 void
-_dbusmenu_server_marshal_VOID__INT_STRING_POINTER (GClosure     *closure,
+_dbusmenu_server_marshal_VOID__INT_STRING_VARIANT (GClosure     *closure,
                                                    GValue       *return_value G_GNUC_UNUSED,
                                                    guint         n_param_values,
                                                    const GValue *param_values,
                                                    gpointer      invocation_hint G_GNUC_UNUSED,
                                                    gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__INT_STRING_POINTER) (gpointer     data1,
+  typedef void (*GMarshalFunc_VOID__INT_STRING_VARIANT) (gpointer     data1,
                                                          gint         arg_1,
                                                          gpointer     arg_2,
                                                          gpointer     arg_3,
                                                          gpointer     data2);
-  register GMarshalFunc_VOID__INT_STRING_POINTER callback;
+  register GMarshalFunc_VOID__INT_STRING_VARIANT callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
@@ -79,12 +79,12 @@ _dbusmenu_server_marshal_VOID__INT_STRING_POINTER (GClosure     *closure,
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__INT_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__INT_STRING_VARIANT) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_int (param_values + 1),
             g_marshal_value_peek_string (param_values + 2),
-            g_marshal_value_peek_pointer (param_values + 3),
+            g_marshal_value_peek_variant (param_values + 3),
             data2);
 }
 
diff --git a/libdbusmenu-glib/server-marshal.h b/libdbusmenu-glib/server-marshal.h
index a561738..3123132 100644
--- a/libdbusmenu-glib/server-marshal.h
+++ b/libdbusmenu-glib/server-marshal.h
@@ -6,8 +6,8 @@
 
 G_BEGIN_DECLS
 
-/* VOID:INT,STRING,POINTER (./server-marshal.list:1) */
-extern void _dbusmenu_server_marshal_VOID__INT_STRING_POINTER (GClosure     *closure,
+/* VOID:INT,STRING,VARIANT (./server-marshal.list:1) */
+extern void _dbusmenu_server_marshal_VOID__INT_STRING_VARIANT (GClosure     *closure,
                                                                GValue       *return_value,
                                                                guint         n_param_values,
                                                                const GValue *param_values,
-- 
cgit v1.2.3


From 59eb3099efa8d7d8f4be86a626a79da16a5c2899 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 7 Dec 2010 21:22:16 -0600
Subject: releasing version 0.3.90-0ubuntu2~ppa1~gdbus1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ceabf87..e25b513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) natty; urgency=low
 
   * Upstream Merge
     * Porting from dbus-glib to GDBus
@@ -6,7 +6,7 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low
     API of all the filenames and paths.
   * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 07 Dec 2010 10:02:55 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 07 Dec 2010 21:22:12 -0600
 
 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
 
-- 
cgit v1.2.3


From c8543838d28f4db39effdc0bac1eb7621ceb26d3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 8 Dec 2010 09:33:35 -0600
Subject: releasing version 0.3.90-0ubuntu2~ppa1~gdbus2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b22d110..969466a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus2) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus2) natty; urgency=low
 
   * Upstream Merge
     * Fixing the pc files
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 09:28:08 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 09:33:32 -0600
 
 libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) natty; urgency=low
 
-- 
cgit v1.2.3


From 8a45c95d29e19e453a63ebef41da26462a85ddfa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 8 Dec 2010 10:31:50 -0600
Subject: releasing version 0.3.90-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8cfd0a..aa3dd69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Porting from dbus-glib to GDBus
@@ -6,7 +6,7 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low
     API of all the filenames and paths.
   * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 10:26:05 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 10:31:48 -0600
 
 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
 
-- 
cgit v1.2.3


From 107da7d1c1b15189576df0d5ff0c37c9690e9676 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 9 Dec 2010 12:56:53 -0500
Subject: releasing version 0.3.90-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b24f81..efc5d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu1) natty; urgency=low
 
   * debian/rules
     - Added build targets to build with gtk3 enabled in additional to 
-- 
cgit v1.2.3


From 38c611a94f1bf07f33e5e9470c06812bce32088f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 9 Dec 2010 16:54:26 -0600
Subject: debian/control: Bumping ABI version in package names

---
 debian/changelog                  |  3 ++-
 debian/control                    | 32 ++++++++++++++++----------------
 debian/libdbusmenu-glib2.install  |  1 -
 debian/libdbusmenu-glib3.install  |  1 +
 debian/libdbusmenu-gtk2.install   |  1 -
 debian/libdbusmenu-gtk3-2.install |  1 -
 debian/libdbusmenu-gtk3-3.install |  1 +
 debian/libdbusmenu-gtk3.install   |  1 +
 8 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 debian/libdbusmenu-glib2.install
 create mode 100644 debian/libdbusmenu-glib3.install
 delete mode 100644 debian/libdbusmenu-gtk2.install
 delete mode 100644 debian/libdbusmenu-gtk3-2.install
 create mode 100644 debian/libdbusmenu-gtk3-3.install
 create mode 100644 debian/libdbusmenu-gtk3.install

diff --git a/debian/changelog b/debian/changelog
index 3edcafd..9079b54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libdbusmenu (0.3.90-0ubuntu2~ppa2) UNRELEASED; urgency=low
   * Upstream Merge
     * Fixing check items
     * Bumping the library ABI version
+  * debian/control: Bumping ABI version in package names
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 16:50:31 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 16:54:05 -0600
 
 libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index bef3fd0..b8f965c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 
-Package: libdbusmenu-glib2
+Package: libdbusmenu-glib3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -49,7 +49,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-glib2 (= ${binary:Version}),
+         libdbusmenu-glib3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: library for passing menus over DBus - development files
@@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files
  .
  This package contains files that are needed to build applications.
 
-Package: libdbusmenu-gtk2
+Package: libdbusmenu-gtk3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -76,7 +76,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk2 (= ${binary:Version}),
+         libdbusmenu-gtk3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
@@ -93,7 +93,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
-         libdbusmenu-glib2 (= ${binary:Version})
+         libdbusmenu-glib3 (= ${binary:Version})
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -106,29 +106,29 @@ Package: gir1.0-dbusmenu-glib-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-glib2 (= ${binary:Version}),
+         libdbusmenu-glib3 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-glib2
+Description: typelib file for libdbusmenu-glib3
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-glib2.
+ generate dynamic bindings for libdbusmenu-glib3.
 
 Package: gir1.0-dbusmenu-gtk-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk2 (= ${binary:Version}),
+         libdbusmenu-gtk3 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk2
+Description: typelib file for libdbusmenu-gtk3
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk2.
+ generate dynamic bindings for libdbusmenu-gtk3.
 
 Package: libdbusmenu-glib-doc
 Section: doc
@@ -181,7 +181,7 @@ Description: library for passing menus over DBus - Test lib development files
  This package contains files that are needed to build test suites in 
  applications or libraries using dbusmenu.
 
-Package: libdbusmenu-gtk3-2
+Package: libdbusmenu-gtk3-3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -198,7 +198,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3-2 (= ${binary:Version}),
+         libdbusmenu-gtk3-3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk3.0-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
@@ -213,13 +213,13 @@ Package: gir1.0-dbusmenu-gtk3-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3-2 (= ${binary:Version}),
+         libdbusmenu-gtk3-3 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk2
+Description: typelib file for libdbusmenu-gtk3-3
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk2.
+ generate dynamic bindings for libdbusmenu-gtk3.
 
diff --git a/debian/libdbusmenu-glib2.install b/debian/libdbusmenu-glib2.install
deleted file mode 100644
index acdbacf..0000000
--- a/debian/libdbusmenu-glib2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-glib3.install b/debian/libdbusmenu-glib3.install
new file mode 100644
index 0000000..acdbacf
--- /dev/null
+++ b/debian/libdbusmenu-glib3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-gtk2.install b/debian/libdbusmenu-gtk2.install
deleted file mode 100644
index d677935..0000000
--- a/debian/libdbusmenu-gtk2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-gtk.so.*
diff --git a/debian/libdbusmenu-gtk3-2.install b/debian/libdbusmenu-gtk3-2.install
deleted file mode 100644
index af2e9a3..0000000
--- a/debian/libdbusmenu-gtk3-2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3-3.install b/debian/libdbusmenu-gtk3-3.install
new file mode 100644
index 0000000..af2e9a3
--- /dev/null
+++ b/debian/libdbusmenu-gtk3-3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install
new file mode 100644
index 0000000..d677935
--- /dev/null
+++ b/debian/libdbusmenu-gtk3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk.so.*
-- 
cgit v1.2.3


From 458082e650f570306eef18601aee0a6ff60e82f2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 9 Dec 2010 16:57:04 -0600
Subject: releasing version 0.3.90-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9079b54..14669d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.90-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low
 
   * Upstream Merge
     * Fixing check items
     * Bumping the library ABI version
   * debian/control: Bumping ABI version in package names
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 16:54:05 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 16:56:55 -0600
 
 libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From 8b80249372e0050fd6daf2ad73b4abd94feda477 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 9 Dec 2010 16:58:17 -0600
Subject: debian/control: Forgot jsonloader

---
 debian/changelog                       | 6 ++++++
 debian/control                         | 2 +-
 debian/libdbusmenu-jsonloader2.install | 1 -
 debian/libdbusmenu-jsonloader3.install | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 debian/libdbusmenu-jsonloader2.install
 create mode 100644 debian/libdbusmenu-jsonloader3.install

diff --git a/debian/changelog b/debian/changelog
index 14669d8..318a782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.90-0ubuntu2~ppa3) UNRELEASED; urgency=low
+
+  * debian/control: Forgot jsonloader
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 16:58:02 -0600
+
 libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low
 
   * Upstream Merge
diff --git a/debian/control b/debian/control
index b8f965c..084f794 100644
--- a/debian/control
+++ b/debian/control
@@ -152,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader2
+Package: libdbusmenu-jsonloader3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/libdbusmenu-jsonloader2.install b/debian/libdbusmenu-jsonloader2.install
deleted file mode 100644
index bff47f5..0000000
--- a/debian/libdbusmenu-jsonloader2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
diff --git a/debian/libdbusmenu-jsonloader3.install b/debian/libdbusmenu-jsonloader3.install
new file mode 100644
index 0000000..bff47f5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
-- 
cgit v1.2.3


From 9b52fc3b27335fa6b7582c7a25bb1a39532ece05 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 9 Dec 2010 17:00:49 -0600
Subject: releasing version 0.3.90-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 318a782..df70c71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.3.90-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu2~ppa3) natty; urgency=low
 
   * debian/control: Forgot jsonloader
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 16:58:02 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Dec 2010 17:00:47 -0600
 
 libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low
 
-- 
cgit v1.2.3


From 6cc24ff51aab2888b854fb61d2c5b12d89b77f29 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 16 Dec 2010 10:10:58 -0500
Subject: releasing version 0.3.90-0ubuntu3

---
 debian/changelog                        |  6 ++++++
 debian/control                          | 18 ++++++++++++------
 debian/gir1.0-dbusmenu-glib-0.2.install |  1 -
 debian/gir1.0-dbusmenu-gtk-0.2.install  |  1 -
 debian/gir1.0-dbusmenu-gtk3-0.2.install |  1 -
 debian/gir1.2-dbusmenu-glib-0.2.install |  1 +
 debian/gir1.2-dbusmenu-gtk-0.2.install  |  1 +
 debian/gir1.2-dbusmenu-gtk3-0.2.install |  1 +
 8 files changed, 21 insertions(+), 9 deletions(-)
 delete mode 100644 debian/gir1.0-dbusmenu-glib-0.2.install
 delete mode 100644 debian/gir1.0-dbusmenu-gtk-0.2.install
 delete mode 100644 debian/gir1.0-dbusmenu-gtk3-0.2.install
 create mode 100644 debian/gir1.2-dbusmenu-glib-0.2.install
 create mode 100644 debian/gir1.2-dbusmenu-gtk-0.2.install
 create mode 100644 debian/gir1.2-dbusmenu-gtk3-0.2.install

diff --git a/debian/changelog b/debian/changelog
index ee204ca..86e7dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
+
+  * Updated for the gir abi transition
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 16 Dec 2010 10:06:26 -0500
+
 libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low
 
   * libdbusmenu-gtk/genericmenuitem.c
diff --git a/debian/control b/debian/control
index bef3fd0..e63b108 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 5.0),
                libjson-glib-dev,
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
-               gir1.0-glib-2.0,
-               gir1.0-gtk-2.0,
-               gir1.0-gtk-3.0,
+               gir1.2-glib-2.0,
+               gir1.2-gtk-2.0,
+               gir1.2-gtk-3.0,
                libx11-dev (>= 1.3), 
                dh-autoreconf,
                valac-0.12
@@ -102,7 +102,9 @@ Description: tools useful during development with libdbusmenu
  This package contains tools that are useful when developing and building
  applications with libdbusmenu.
 
-Package: gir1.0-dbusmenu-glib-0.2
+Package: gir1.2-dbusmenu-glib-0.2
+Conflicts: gir1.0-dbusmenu-glib-0.2
+Replaces: gir1.0-dbusmenu-glib-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -116,7 +118,9 @@ Description: typelib file for libdbusmenu-glib2
  This package can be used by other packages using the GIRepository format to
  generate dynamic bindings for libdbusmenu-glib2.
 
-Package: gir1.0-dbusmenu-gtk-0.2
+Package: gir1.2-dbusmenu-gtk-0.2
+Conflicts: gir1.0-dbusmenu-gtk-0.2
+Replaces: gir1.0-dbusmenu-gtk-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -209,7 +213,9 @@ Description: library for passing menus over DBus - GTK+ version developement fil
  .
  This package contains files that are needed to build GTK+ applications.
 
-Package: gir1.0-dbusmenu-gtk3-0.2
+Package: gir1.2-dbusmenu-gtk3-0.2
+Conflicts: gir1.0-dbusmenu-gtk3-0.2
+Replaces: gir1.0-dbusmenu-gtk3-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install
deleted file mode 100644
index 86f7711..0000000
--- a/debian/gir1.0-dbusmenu-glib-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib
diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install
deleted file mode 100644
index 829a344..0000000
--- a/debian/gir1.0-dbusmenu-gtk-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib
diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.0-dbusmenu-gtk3-0.2.install
deleted file mode 100644
index 2da3933..0000000
--- a/debian/gir1.0-dbusmenu-gtk3-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib
diff --git a/debian/gir1.2-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install
new file mode 100644
index 0000000..86f7711
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-glib-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install
new file mode 100644
index 0000000..829a344
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-gtk-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install
new file mode 100644
index 0000000..2da3933
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-gtk3-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib
-- 
cgit v1.2.3


From 4df4ee42222a893f2f243bb58aae031225db32ee Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 5 Jan 2011 21:48:15 -0600
Subject: * Upstream Merge   * Supporting removing properties

---
 debian/changelog | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5a79cc..d2817a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.90-0ubuntu4~remove1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Supporting removing properties
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 05 Jan 2011 21:47:45 -0600
+
 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
 
   * Updated for the gir abi transition
@@ -12,13 +19,6 @@ libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 17:46:41 -0500
 
-libdbusmenu (0.3.90-0ubuntu2~ppa4~remove1) UNRELEASED; urgency=low
-
-  * Upstream Merge
-    * Supporting removing properties
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 05 Jan 2011 21:24:36 -0600
-
 libdbusmenu (0.3.90-0ubuntu2~ppa3) natty; urgency=low
 
   * debian/control: Forgot jsonloader
-- 
cgit v1.2.3


From 1f9dddfbc341fc73cce1854c5d3ca949f346e1ef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 5 Jan 2011 21:53:31 -0600
Subject: debian/control: Changing the GIR package names from "0.2" to "0.4"
 which now the names of the actual files.

---
 debian/changelog                        |  7 +++++++
 debian/control                          | 12 +++---------
 debian/gir1.2-dbusmenu-glib-0.2.install |  1 -
 debian/gir1.2-dbusmenu-glib-0.4.install |  1 +
 debian/gir1.2-dbusmenu-gtk-0.2.install  |  1 -
 debian/gir1.2-dbusmenu-gtk-0.4.install  |  1 +
 debian/gir1.2-dbusmenu-gtk3-0.2.install |  1 -
 debian/gir1.2-dbusmenu-gtk3-0.4.install |  1 +
 8 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 debian/gir1.2-dbusmenu-glib-0.2.install
 create mode 100644 debian/gir1.2-dbusmenu-glib-0.4.install
 delete mode 100644 debian/gir1.2-dbusmenu-gtk-0.2.install
 create mode 100644 debian/gir1.2-dbusmenu-gtk-0.4.install
 delete mode 100644 debian/gir1.2-dbusmenu-gtk3-0.2.install
 create mode 100644 debian/gir1.2-dbusmenu-gtk3-0.4.install

diff --git a/debian/changelog b/debian/changelog
index 2a8b0af..3a6d3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.90-0ubuntu4~ppa1) UNRELEASED; urgency=low
+
+  * debian/control: Changing the GIR package names from "0.2" to
+    "0.4" which now the names of the actual files.
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 05 Jan 2011 21:52:50 -0600
+
 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
 
   * Updated for the gir abi transition
diff --git a/debian/control b/debian/control
index a93dc6a..5d96966 100644
--- a/debian/control
+++ b/debian/control
@@ -102,9 +102,7 @@ Description: tools useful during development with libdbusmenu
  This package contains tools that are useful when developing and building
  applications with libdbusmenu.
 
-Package: gir1.2-dbusmenu-glib-0.2
-Conflicts: gir1.0-dbusmenu-glib-0.2
-Replaces: gir1.0-dbusmenu-glib-0.2
+Package: gir1.2-dbusmenu-glib-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -118,9 +116,7 @@ Description: typelib file for libdbusmenu-glib3
  This package can be used by other packages using the GIRepository format to
  generate dynamic bindings for libdbusmenu-glib3.
 
-Package: gir1.2-dbusmenu-gtk-0.2
-Conflicts: gir1.0-dbusmenu-gtk-0.2
-Replaces: gir1.0-dbusmenu-gtk-0.2
+Package: gir1.2-dbusmenu-gtk-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -213,9 +209,7 @@ Description: library for passing menus over DBus - GTK+ version developement fil
  .
  This package contains files that are needed to build GTK+ applications.
 
-Package: gir1.2-dbusmenu-gtk3-0.2
-Conflicts: gir1.0-dbusmenu-gtk3-0.2
-Replaces: gir1.0-dbusmenu-gtk3-0.2
+Package: gir1.2-dbusmenu-gtk3-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
diff --git a/debian/gir1.2-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install
deleted file mode 100644
index bca065f..0000000
--- a/debian/gir1.2-dbusmenu-glib-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install
new file mode 100644
index 0000000..bca065f
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-glib-0.4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install
deleted file mode 100644
index 16bad97..0000000
--- a/debian/gir1.2-dbusmenu-gtk-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install
new file mode 100644
index 0000000..16bad97
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-gtk-0.4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install
deleted file mode 100644
index abf6fab..0000000
--- a/debian/gir1.2-dbusmenu-gtk3-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install
new file mode 100644
index 0000000..abf6fab
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib
-- 
cgit v1.2.3


From 2af93062f8a8fb18e84c8b3f9704fdcd970c5219 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 5 Jan 2011 21:53:59 -0600
Subject: releasing version 0.3.90-0ubuntu4~remove1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2817a3..429c600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.90-0ubuntu4~remove1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu4~remove1) natty; urgency=low
 
   * Upstream Merge
     * Supporting removing properties
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 05 Jan 2011 21:47:45 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 05 Jan 2011 21:53:56 -0600
 
 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From 13f405d76a1549715e153d5634dd82eb7dee0a82 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 6 Jan 2011 10:32:18 -0600
Subject: releasing version 0.3.90-0ubuntu4~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a6d3ab..4f8a751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.90-0ubuntu4~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu4~ppa1) natty; urgency=low
 
   * debian/control: Changing the GIR package names from "0.2" to
     "0.4" which now the names of the actual files.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 05 Jan 2011 21:52:50 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 06 Jan 2011 10:32:15 -0600
 
 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From dd94c4c1fa27db3555c363abf130164e6c97d510 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 6 Jan 2011 10:36:46 -0600
Subject: releasing version 0.3.90-0ubuntu4~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d3c3ed..bc42561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.90-0ubuntu4~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu4~ppa2) natty; urgency=low
 
   * Upstream Merge
     * Supporting removing properties
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 06 Jan 2011 10:32:30 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 06 Jan 2011 10:36:43 -0600
 
 libdbusmenu (0.3.90-0ubuntu4~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From bdea6b479fe42197519c98900f726c53b9e8e66f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 13 Jan 2011 10:24:31 -0600
Subject: releasing version 0.3.91-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7935e4..526cb9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.91-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Porting from dbus-glib to GDBus
@@ -9,7 +9,7 @@ libdbusmenu (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/control: Changing the GIR package names from "0.2" to
     "0.4" which now the names of the actual files.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 13 Jan 2011 10:13:02 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 13 Jan 2011 10:24:28 -0600
 
 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From ece305e4b1b4eee4e3fb54faf8f9c291ef915e8c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 14 Jan 2011 09:56:49 -0600
Subject: 0.3.92

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index f1920b9..5c85da8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.3.91, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.3.92, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.3.91, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.3.92, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
-- 
cgit v1.2.3


From 153e20991e41ffe222193efc4ac3b3d2224b390e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 14 Jan 2011 10:43:48 -0600
Subject: releasing version 0.3.92-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c67f83..0ff5351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.92-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.92-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Fixing handle event to send unboxed values
     * Build fixes
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 14 Jan 2011 10:37:22 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 14 Jan 2011 10:43:44 -0600
 
 libdbusmenu (0.3.91-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From de9872351ee2646f577620956c6844c428cb2760 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Jan 2011 08:43:15 -0600
Subject: releasing version 0.3.93-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eba7735..85f7785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.93-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Fixing scanner export
@@ -6,7 +6,7 @@ libdbusmenu (0.3.93-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Signalling to DBus when object is registered
     * Handling errors in GVariant better than crashing
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 Jan 2011 08:36:37 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 Jan 2011 08:43:12 -0600
 
 libdbusmenu (0.3.92-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From 8320e25b7893fd9ad286defa6f94d6e4995e5aae Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 23 Jan 2011 16:13:33 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6548737..5d8b8d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.93-0ubuntu2~ted1) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted1) natty; urgency=low
 
   * Upstream Merge
     * Merging in the parser
     * Merging in serializable menu item
 
- -- Ted Gould <ted@ubuntu.com>  Sun, 23 Jan 2011 15:59:29 -0600
+ -- Ted Gould <ted@ubuntu.com>  Sun, 23 Jan 2011 16:13:31 -0600
 
 libdbusmenu (0.3.93-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 39e9a74d4ab667db2b492d1c0b98e2d72b7469b0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 24 Jan 2011 15:02:14 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ef1780..3a368e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.93-0ubuntu2~ted2) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted2) natty; urgency=low
 
   * Upstream Merge
     * Fixing shutdown messages on destruction
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 24 Jan 2011 14:56:22 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 24 Jan 2011 15:02:12 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted1) natty; urgency=low
 
-- 
cgit v1.2.3


From e53fadaf3142d03bcec14b1dd00673c5fc2a7121 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 25 Jan 2011 11:56:59 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bc600d..d0100c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.93-0ubuntu2~ted3) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted3) natty; urgency=low
 
   * Upstream Merge
     * Work with GtkMenu's as well
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 25 Jan 2011 11:51:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 25 Jan 2011 11:56:57 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted2) natty; urgency=low
 
-- 
cgit v1.2.3


From 59f267bfd9cbb6f9e6b7b5317c37346991f53190 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 25 Jan 2011 17:06:53 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f78b9c3..5f543d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.93-0ubuntu2~ted4) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted4) natty; urgency=low
 
   * Upstream Merge
     * Look for the serializable menuitems and use their
       build functions
     * Fix critical message from being printed 
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 25 Jan 2011 16:53:09 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 25 Jan 2011 17:06:51 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted3) natty; urgency=low
 
-- 
cgit v1.2.3


From a631bdcb32b183519b3f964c1b54aff77204237a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Jan 2011 10:25:47 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a193f4e..e482846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.93-0ubuntu2~ted5) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted5) natty; urgency=low
 
   * Upstream Merge
     * Fixing some memory leaks
     * Fixing signatures in GetChildren
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 10:18:50 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 10:25:45 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted4) natty; urgency=low
 
-- 
cgit v1.2.3


From fa16a4e84152c957c22252b20d4e87f6d85c53f3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Jan 2011 11:04:38 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68deef3..8620f55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.93-0ubuntu2~ted6) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted6) natty; urgency=low
 
   * Upstream Merge
     * Making explicit use of tuple to make more robust
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 10:57:14 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 11:04:36 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted5) natty; urgency=low
 
-- 
cgit v1.2.3


From 159b60e54bd5b0f6bb2f3dc1693488afffbdfb1a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Jan 2011 11:18:01 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted7

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3c410c..1fe8474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.93-0ubuntu2~ted7) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted7) natty; urgency=low
 
   * Upstream Merge
     * Changing tuple building
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 11:12:46 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 11:17:59 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted6) natty; urgency=low
 
-- 
cgit v1.2.3


From 708be7960d2df928bedddd7f7311dc81f0cb7477 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Jan 2011 16:25:07 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted8

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 806262d..268e8a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.93-0ubuntu2~ted8) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted8) natty; urgency=low
 
   * Upstream Merge
     * Factoring out the stack in the parser
     * Fixing setting toggle to a boolean
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 16:19:29 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 16:25:04 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted7) natty; urgency=low
 
-- 
cgit v1.2.3


From c5ba38c183260e6c91ef0a0d0db6a0edcda423e2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Jan 2011 16:35:07 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted9

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d13c95..1c7e0bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.93-0ubuntu2~ted9) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted9) natty; urgency=low
 
   * Upstream Merge
     * Only activate at the top level
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 16:28:02 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 16:35:05 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted8) natty; urgency=low
 
-- 
cgit v1.2.3


From db78a405701a56b3df9359293dd944a5d7b8bbe7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Jan 2011 16:59:27 -0600
Subject: releasing version 0.3.93-0ubuntu2~ted10

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9690cc0..bfc5604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.93-0ubuntu2~ted10) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ted10) natty; urgency=low
 
   * Upstream Merge
     * Only activate on menu bars
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 16:54:09 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 26 Jan 2011 16:59:25 -0600
 
 libdbusmenu (0.3.93-0ubuntu2~ted9) natty; urgency=low
 
-- 
cgit v1.2.3


From 788e7913d8e948876c70b7a7003a75caf8d5627a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 27 Jan 2011 14:19:07 -0600
Subject: releasing version 0.3.93-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3115eab..a082255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.93-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.93-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Fixing setting toggle to a boolean
@@ -12,7 +12,7 @@ libdbusmenu (0.3.93-0ubuntu2~ppa1) UNRELEASED; urgency=low
     * Adding a parser
     * Adding a serializable menu item
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 14:13:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 14:19:04 -0600
 
 libdbusmenu (0.3.93-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From ea3e23cd918f2b8c7b6f9a94b3d80499bc0ce550 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 27 Jan 2011 14:26:21 -0600
Subject: releasing version 0.3.94-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8eb30bf..c15029a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.94-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.94-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Fixing setting toggle to a boolean
@@ -12,7 +12,7 @@ libdbusmenu (0.3.94-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Adding a parser
     * Adding a serializable menu item
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 14:20:04 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 14:26:19 -0600
 
 libdbusmenu (0.3.93-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From ff4cd6cd6a3eb7de96101a02e84545059b9c71be Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 31 Jan 2011 16:03:10 -0600
Subject: releasing version 0.3.95-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83aa7be..f841f49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.95-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.95-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Fix crashes on rapidly creating and destroying client
@@ -7,7 +7,7 @@ libdbusmenu (0.3.95-0ubuntu1~ppa1) UNRELEASED; urgency=low
      (LP: #696896)
     * Fix bad signature on GetProperties with no hits 
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 31 Jan 2011 15:45:37 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 31 Jan 2011 16:03:06 -0600
 
 libdbusmenu (0.3.94-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From a699a3b1b64d46196e63db1e501cad2099fca510 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 3 Feb 2011 14:11:20 -0600
Subject: releasing version 0.3.96-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5dcb9a..0e2156e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.96-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.96-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Remove signal handlers for correct objects
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 03 Feb 2011 14:01:31 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 03 Feb 2011 14:11:16 -0600
 
 libdbusmenu (0.3.95-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 496b6ee260d93a2428e65946438dfe522d8702dd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 4 Feb 2011 15:16:50 -0600
Subject: releasing version 0.3.96-0ubuntu3~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ce8dc9..7a3738a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.96-0ubuntu3~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.96-0ubuntu3~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Parser fixes for children added in GtkMenuShell (LP: #)
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Feb 2011 13:35:34 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Feb 2011 15:16:47 -0600
 
 libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low
 
-- 
cgit v1.2.3


From 680497cd7a666d1a33396aacf4cce82d7133898c Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Mon, 7 Feb 2011 09:51:35 -0500
Subject: releasing version 0.3.96-0ubuntu3

---
 debian/changelog         |   8 ++++
 libdbusmenu-gtk/parser.c | 101 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d276818..122d0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low
+
+  * libdbusmenu-gtk/parser.c
+    - Handle ChildAdded on GtkShell items and clean up the code so that it 
+      has single functions for doing common operations. (LP: #709839)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 07 Feb 2011 09:29:09 -0500
+
 libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low
 
   * libdbusmenu-glib/menuitem.c
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index db1d8dd..70cde53 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -38,6 +38,7 @@ typedef struct _ParserData
   GtkWidget *label;
   GtkAction *action;
   GtkWidget *widget;
+  GtkWidget *shell;
 } ParserData;
 
 typedef struct _RecurseContext
@@ -63,6 +64,9 @@ static void           label_notify_cb          (GtkWidget *         widget,
 static void           action_notify_cb         (GtkAction *         action,
                                                 GParamSpec *        pspec,
                                                 gpointer            data);
+static void           child_added_cb           (GtkContainer *      menu,
+                                                GtkWidget *         widget,
+                                                gpointer            data);
 static void           item_activated           (DbusmenuMenuitem *  item,
                                                 guint               timestamp,
                                                 gpointer            user_data);
@@ -109,7 +113,6 @@ dbusmenu_cache_freed (gpointer data, GObject * obj)
 	/* If the dbusmenu item is killed we don't need to remove
 	   the weak ref as well. */
 	g_object_steal_data(G_OBJECT(data), CACHED_MENUITEM);
-	g_signal_handlers_disconnect_by_func(data, G_CALLBACK(widget_notify_cb), obj);
 
 	ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(obj), PARSER_DATA);
 
@@ -128,6 +131,11 @@ dbusmenu_cache_freed (gpointer data, GObject * obj)
 		g_object_remove_weak_pointer(G_OBJECT(pdata->widget), (gpointer*)&pdata->widget);
 	}
 
+	if (pdata != NULL && pdata->shell != NULL) {
+		g_signal_handlers_disconnect_by_func(pdata->shell, G_CALLBACK(child_added_cb), obj);
+		g_object_remove_weak_pointer(G_OBJECT(pdata->shell), (gpointer*)&pdata->shell);
+	}
+
 	return;
 }
 
@@ -143,6 +151,49 @@ object_cache_freed (gpointer data)
 	return;
 }
 
+/* Gets the positon of the child with its' parent if it has one.
+   Returns -1 if the position is unable to be calculated. */
+static gint
+get_child_position (GtkWidget * child)
+{
+	GtkWidget * parent = gtk_widget_get_parent (child);
+	if (parent == NULL || !GTK_IS_CONTAINER (parent))
+		return -1;
+
+	GList * children = gtk_container_get_children (GTK_CONTAINER (parent));
+	GList * iter;
+	gint position = 0;
+
+	for (iter = children; iter != NULL; iter = iter->next) {
+		if (iter->data == child)
+			break;
+		++position;
+	}
+
+	g_list_free (children);
+
+	if (iter == NULL)
+		return -1;
+	else
+		return position;
+}
+
+/* Creates a new menu item that is attached to the widget and has
+   the data linkages hooked up.  Also allocates the ParserData */
+static DbusmenuMenuitem *
+new_menuitem (GtkWidget * widget)
+{
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+
+	ParserData *pdata = g_new0 (ParserData, 1);
+	g_object_set_data_full(G_OBJECT(item), PARSER_DATA, pdata, g_free);
+
+	g_object_set_data_full(G_OBJECT(widget), CACHED_MENUITEM, item, object_cache_freed);
+	g_object_weak_ref(G_OBJECT(item), dbusmenu_cache_freed, widget);
+
+	return item;
+}
+
 static void
 parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 {
@@ -161,10 +212,11 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 		 */
 		if (recurse->parent == NULL && GTK_IS_MENU_BAR(widget)) {
 			GList *children = gtk_container_get_children (GTK_CONTAINER (widget));
+			GList *iter;
 
-			for (; children != NULL; children = children->next) {
+			for (iter = children; iter != NULL; iter = iter->next) {
 				gtk_menu_shell_activate_item (GTK_MENU_SHELL (widget),
-				                              children->data,
+				                              iter->data,
 				                              TRUE);
 			}
 
@@ -172,9 +224,18 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 		}
 
 		if (recurse->parent == NULL) {
-			recurse->parent = dbusmenu_menuitem_new();
+			recurse->parent = new_menuitem(widget);
 		}
 
+		ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(recurse->parent), PARSER_DATA);
+
+		pdata->shell = widget;
+		g_signal_connect (G_OBJECT (widget),
+			          "child-added",
+			          G_CALLBACK (child_added_cb),
+			          recurse->parent);
+		g_object_add_weak_pointer(G_OBJECT (widget), (gpointer*)&pdata->shell);
+
 		gtk_container_foreach (GTK_CONTAINER (widget),
 		                       (GtkCallback)parse_menu_structure_helper,
 		                       recurse);
@@ -194,8 +255,6 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 		/* We don't have one, so we'll need to build it */
 		if (thisitem == NULL) {
 			thisitem = construct_dbusmenu_for_widget (widget);
-			g_object_set_data_full(G_OBJECT(widget), CACHED_MENUITEM, thisitem, object_cache_freed);
-			g_object_weak_ref(G_OBJECT(thisitem), dbusmenu_cache_freed, widget);
 
 			if (!gtk_widget_get_visible (widget)) {
 				g_signal_connect (G_OBJECT (widget),
@@ -227,8 +286,14 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 				g_object_set_data (G_OBJECT (thisitem),
 				                   "dbusmenu-parent",
 				                   recurse->parent);
-				dbusmenu_menuitem_child_append (recurse->parent,
-				                                thisitem);
+				gint pos = get_child_position (widget);
+				if (pos >= 0)
+					dbusmenu_menuitem_child_add_position (recurse->parent,
+					                                      thisitem,
+					                                      pos);
+				else
+					dbusmenu_menuitem_child_append (recurse->parent,
+					                                thisitem);
 			}
 		}
 
@@ -265,10 +330,9 @@ construct_dbusmenu_for_widget (GtkWidget * widget)
   /* If it's a standard GTK Menu Item we need to do some of our own work */
   if (GTK_IS_MENU_ITEM (widget))
     {
-      DbusmenuMenuitem *mi = dbusmenu_menuitem_new ();
+      DbusmenuMenuitem *mi = new_menuitem(widget);
 
-      ParserData *pdata = g_new0 (ParserData, 1);
-      g_object_set_data_full (G_OBJECT (mi), PARSER_DATA, pdata, g_free);
+      ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(mi), PARSER_DATA);
 
       gboolean visible = FALSE;
       gboolean sensitive = FALSE;
@@ -414,7 +478,7 @@ construct_dbusmenu_for_widget (GtkWidget * widget)
 
 	/* If it's none of those we're going to just create a
 	   generic menuitem as a place holder for it. */
-	return dbusmenu_menuitem_new();
+	return new_menuitem(widget);
 }
 
 static void
@@ -720,6 +784,19 @@ widget_notify_cb (GtkWidget  *widget,
     }
 }
 
+/* A child item was added to a menu we're watching.  Let's try to integrate it. */
+static void
+child_added_cb (GtkContainer *menu, GtkWidget *widget, gpointer data)
+{
+	DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data;
+
+	RecurseContext recurse = {0};
+	recurse.toplevel = gtk_widget_get_toplevel(GTK_WIDGET(menu));
+	recurse.parent = menuitem;
+
+	parse_menu_structure_helper(widget, &recurse);
+}
+
 static gboolean
 should_show_image (GtkImage *image)
 {
-- 
cgit v1.2.3


From fbb66e32fc9aaa74636d09b9940eaf9d0fb07c18 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Feb 2011 14:40:18 -0600
Subject: releasing version 0.3.97-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34fd74e..b655fcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.97-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.97-0ubuntu1~ppa1) natty; urgency=low
 
   [Ted Gould]
   * New upstream release.
@@ -11,7 +11,7 @@ libdbusmenu (0.3.97-0ubuntu1~ppa1) UNRELEASED; urgency=low
     debian/libdbusmenu-glib-dev.install: Changing gir, typelib and vala
     file names
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Feb 2011 14:33:51 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Feb 2011 14:40:14 -0600
 
 libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From 2bfb5ca0d47f56df86bb96c768e5952316cccb00 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Feb 2011 11:06:37 -0600
Subject: debian/control: Removing libxml2 Build-Dep

---
 debian/changelog | 3 ++-
 debian/control   | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80d143e..09cef34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ libdbusmenu (0.3.98-0ubuntu1~ppa1) UNRELEASED; urgency=low
     ∘ Removing XML from the GetLayout function
     ∘ Clean up icon handling in the parser (LP: #715864)
     ∘ Fixing signatures on dbusmenu-dumper
+  * debian/control: Removing libxml2 Build-Dep
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 11:05:30 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 11:06:22 -0600
 
 libdbusmenu (0.3.97-0ubuntu1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 90af90f..3b01816 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 5.0),
                gtk-doc-tools,
                libtool,
                intltool,
-               libxml2-dev,
                libjson-glib-dev,
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
-- 
cgit v1.2.3


From db28eb71b4052a6843842060cca54a0f7b4b6a8e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Feb 2011 11:11:44 -0600
Subject: releasing version 0.3.98-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09cef34..7f11a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.98-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     ∘ Fixing distcheck
@@ -8,7 +8,7 @@ libdbusmenu (0.3.98-0ubuntu1~ppa1) UNRELEASED; urgency=low
     ∘ Fixing signatures on dbusmenu-dumper
   * debian/control: Removing libxml2 Build-Dep
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 11:06:22 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 11:11:40 -0600
 
 libdbusmenu (0.3.97-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 40d15866ffb7b0de3d993091fec112fab9fce0cc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 22:35:17 -0600
Subject: Adding in the generated enum-types

---
 libdbusmenu-glib/enum-types.c | 183 ++++++++++++++++++++++++++++++++++++++++++
 libdbusmenu-glib/enum-types.h |  56 +++++++++++++
 2 files changed, 239 insertions(+)
 create mode 100644 libdbusmenu-glib/enum-types.c
 create mode 100644 libdbusmenu-glib/enum-types.h

diff --git a/libdbusmenu-glib/enum-types.c b/libdbusmenu-glib/enum-types.c
new file mode 100644
index 0000000..dae615c
--- /dev/null
+++ b/libdbusmenu-glib/enum-types.c
@@ -0,0 +1,183 @@
+
+/* Generated data (by glib-mkenums) */
+
+/*
+Enums from the dbusmenu headers
+
+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/>
+*/
+
+#include "enum-types.h"
+
+#include "./types.h"
+/**
+	dbusmenu_text_direction_get_type:
+
+	Builds a GLib type for the #DbusmenuTextDirection enumeration.
+
+	Return value: A unique #GType for the #DbusmenuTextDirection enum.
+*/
+GType
+dbusmenu_text_direction_get_type (void)
+{
+	static GType etype = 0;
+	if (G_UNLIKELY(etype == 0)) {
+		static const GEnumValue values[] = {
+			{ DBUSMENU_TEXT_DIRECTION_NONE,  "DBUSMENU_TEXT_DIRECTION_NONE", "none" },
+			{ DBUSMENU_TEXT_DIRECTION_LTR,  "DBUSMENU_TEXT_DIRECTION_LTR", "ltr" },
+			{ DBUSMENU_TEXT_DIRECTION_RTL,  "DBUSMENU_TEXT_DIRECTION_RTL", "rtl" },
+			{ 0, NULL, NULL}
+		};
+		
+		etype = g_enum_register_static (g_intern_static_string("DbusmenuTextDirection"), values);
+	}
+
+	return etype;
+}
+
+/**
+	dbusmenu_text_direction_get_nick:
+	@value: The value of DbusmenuTextDirection to get the nick of
+
+	Looks up in the enum table for the nick of @value.
+
+	Return value: The nick for the given value or #NULL on error
+*/
+const gchar *
+dbusmenu_text_direction_get_nick (DbusmenuTextDirection value)
+{
+	GEnumClass * class = G_ENUM_CLASS(g_type_class_ref(dbusmenu_text_direction_get_type()));
+	g_return_val_if_fail(class != NULL, NULL);
+
+	const gchar * ret = NULL;
+	GEnumValue * val = g_enum_get_value(class, value);
+	if (val != NULL) {
+		ret = val->value_nick;
+	}
+
+	g_type_class_unref(class);
+	return ret;
+}
+
+/**
+	dbusmenu_text_direction_get_value_from_nick:
+	@nick: The enum nick to lookup
+
+	Looks up in the enum table for the value of @nick.
+
+	Return value: The value for the given @nick
+*/
+DbusmenuTextDirection
+dbusmenu_text_direction_get_value_from_nick (const gchar * nick)
+{
+	GEnumClass * class = G_ENUM_CLASS(g_type_class_ref(dbusmenu_text_direction_get_type()));
+	g_return_val_if_fail(class != NULL, 0);
+
+	DbusmenuTextDirection ret = 0;
+	GEnumValue * val = g_enum_get_value_by_nick(class, nick);
+	if (val != NULL) {
+		ret = val->value;
+	}
+
+	g_type_class_unref(class);
+	return ret;
+}
+
+
+/**
+	dbusmenu_status_get_type:
+
+	Builds a GLib type for the #DbusmenuStatus enumeration.
+
+	Return value: A unique #GType for the #DbusmenuStatus enum.
+*/
+GType
+dbusmenu_status_get_type (void)
+{
+	static GType etype = 0;
+	if (G_UNLIKELY(etype == 0)) {
+		static const GEnumValue values[] = {
+			{ DBUSMENU_STATUS_NORMAL,  "DBUSMENU_STATUS_NORMAL", "normal" },
+			{ DBUSMENU_STATUS_NOTICE,  "DBUSMENU_STATUS_NOTICE", "notice" },
+			{ 0, NULL, NULL}
+		};
+		
+		etype = g_enum_register_static (g_intern_static_string("DbusmenuStatus"), values);
+	}
+
+	return etype;
+}
+
+/**
+	dbusmenu_status_get_nick:
+	@value: The value of DbusmenuStatus to get the nick of
+
+	Looks up in the enum table for the nick of @value.
+
+	Return value: The nick for the given value or #NULL on error
+*/
+const gchar *
+dbusmenu_status_get_nick (DbusmenuStatus value)
+{
+	GEnumClass * class = G_ENUM_CLASS(g_type_class_ref(dbusmenu_status_get_type()));
+	g_return_val_if_fail(class != NULL, NULL);
+
+	const gchar * ret = NULL;
+	GEnumValue * val = g_enum_get_value(class, value);
+	if (val != NULL) {
+		ret = val->value_nick;
+	}
+
+	g_type_class_unref(class);
+	return ret;
+}
+
+/**
+	dbusmenu_status_get_value_from_nick:
+	@nick: The enum nick to lookup
+
+	Looks up in the enum table for the value of @nick.
+
+	Return value: The value for the given @nick
+*/
+DbusmenuStatus
+dbusmenu_status_get_value_from_nick (const gchar * nick)
+{
+	GEnumClass * class = G_ENUM_CLASS(g_type_class_ref(dbusmenu_status_get_type()));
+	g_return_val_if_fail(class != NULL, 0);
+
+	DbusmenuStatus ret = 0;
+	GEnumValue * val = g_enum_get_value_by_nick(class, nick);
+	if (val != NULL) {
+		ret = val->value;
+	}
+
+	g_type_class_unref(class);
+	return ret;
+}
+
+
+
+/* Generated data ends here */
+
diff --git a/libdbusmenu-glib/enum-types.h b/libdbusmenu-glib/enum-types.h
new file mode 100644
index 0000000..c370210
--- /dev/null
+++ b/libdbusmenu-glib/enum-types.h
@@ -0,0 +1,56 @@
+
+/* Generated data (by glib-mkenums) */
+
+/*
+Enums from the dbusmenu headers
+
+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_ENUM_TYPES_H__
+#define __DBUSMENU_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* Enumerations from file: "./types.h" */
+#include "./types.h"
+GType dbusmenu_text_direction_get_type (void) G_GNUC_CONST;
+const gchar * dbusmenu_text_direction_get_nick (DbusmenuTextDirection value) G_GNUC_CONST;
+DbusmenuTextDirection dbusmenu_text_direction_get_value_from_nick (const gchar * nick) G_GNUC_CONST;
+#define DBUSMENU_TYPE_TEXT_DIRECTION (dbusmenu_text_direction_get_type())
+
+GType dbusmenu_status_get_type (void) G_GNUC_CONST;
+const gchar * dbusmenu_status_get_nick (DbusmenuStatus value) G_GNUC_CONST;
+DbusmenuStatus dbusmenu_status_get_value_from_nick (const gchar * nick) G_GNUC_CONST;
+#define DBUSMENU_TYPE_STATUS (dbusmenu_status_get_type())
+
+
+G_END_DECLS
+
+#endif /* __DBUSMENU_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+
-- 
cgit v1.2.3


From 01507bb44599bd24ef7b5b5f421663ff1176ab08 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 22:40:45 -0600
Subject: releasing version 0.3.98-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bae4272..8dc1bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.98-0ubuntu2~ppa1) UNRELASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Only send the requested properties and request fewer
@@ -8,7 +8,7 @@ libdbusmenu (0.3.98-0ubuntu2~ppa1) UNRELASED; urgency=low
     * Add a property for text direction.
     * Add a property for needing attention.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Feb 2011 22:30:06 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Feb 2011 22:40:36 -0600
 
 libdbusmenu (0.3.98-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 157172689fde2b5b59eb9c3c94183ecc8caa62b1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 23:09:05 -0600
Subject: releasing version 0.3.98-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10d27e5..e2dcb5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.98-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu2~ppa2) natty; urgency=low
 
   * Upstream Merge
     * Protection from unref'ing NULL variants
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Feb 2011 23:03:06 -0600
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Feb 2011 23:09:02 -0600
 
 libdbusmenu (0.3.98-0ubuntu2~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From 29af5b7724fa9ec4eda16a96a9d65bbf73905d57 Mon Sep 17 00:00:00 2001
From: unknown <robert.ancell@canonical.com>
Date: Tue, 22 Feb 2011 16:17:07 +1100
Subject: * debian/control:   - Use new libgtk-3-dev build-depends

---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f11a77..948aeca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.98-0ubuntu2) natty; urgency=low
+
+  * debian/control:
+    - Use new libgtk-3-dev build-depends
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 22 Feb 2011 16:16:44 +1100
+
 libdbusmenu (0.3.98-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3b01816..0703fed 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.23.2-0ubuntu2),
-               libgtk3.0-dev (>= 2.99.2-1ubuntu2),
+               libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
                gnome-doc-utils,
@@ -199,7 +199,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libdbusmenu-gtk3-3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
-         libgtk3.0-dev (>= 2.91.4-0ubuntu1),
+         libgtk-3-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
-- 
cgit v1.2.3


From 2131d3baa3f476b13eba0f6305306e37f0745df6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 09:53:05 -0600
Subject: Adding a needed marshaller

---
 libdbusmenu-glib/menuitem-marshal.c | 43 +++++++++++++++++++++++++++++++++++++
 libdbusmenu-glib/menuitem-marshal.h |  8 +++++++
 2 files changed, 51 insertions(+)

diff --git a/libdbusmenu-glib/menuitem-marshal.c b/libdbusmenu-glib/menuitem-marshal.c
index bb2b6d7..de227fd 100644
--- a/libdbusmenu-glib/menuitem-marshal.c
+++ b/libdbusmenu-glib/menuitem-marshal.c
@@ -168,3 +168,46 @@ _dbusmenu_menuitem_marshal_VOID__OBJECT_UINT (GClosure     *closure,
 
 /* VOID:UINT (./menuitem-marshal.list:6) */
 
+/* BOOLEAN:STRING,VARIANT,UINT (./menuitem-marshal.list:7) */
+void
+_dbusmenu_menuitem_marshal_BOOLEAN__STRING_VARIANT_UINT (GClosure     *closure,
+                                                         GValue       *return_value G_GNUC_UNUSED,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint G_GNUC_UNUSED,
+                                                         gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_VARIANT_UINT) (gpointer     data1,
+                                                                 gpointer     arg_1,
+                                                                 gpointer     arg_2,
+                                                                 guint        arg_3,
+                                                                 gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_VARIANT_UINT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_VARIANT_UINT) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_variant (param_values + 2),
+                       g_marshal_value_peek_uint (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
diff --git a/libdbusmenu-glib/menuitem-marshal.h b/libdbusmenu-glib/menuitem-marshal.h
index 0cde7ad..0315ae8 100644
--- a/libdbusmenu-glib/menuitem-marshal.h
+++ b/libdbusmenu-glib/menuitem-marshal.h
@@ -39,6 +39,14 @@ extern void _dbusmenu_menuitem_marshal_VOID__OBJECT_UINT (GClosure     *closure,
 /* VOID:UINT (./menuitem-marshal.list:6) */
 #define _dbusmenu_menuitem_marshal_VOID__UINT	g_cclosure_marshal_VOID__UINT
 
+/* BOOLEAN:STRING,VARIANT,UINT (./menuitem-marshal.list:7) */
+extern void _dbusmenu_menuitem_marshal_BOOLEAN__STRING_VARIANT_UINT (GClosure     *closure,
+                                                                     GValue       *return_value,
+                                                                     guint         n_param_values,
+                                                                     const GValue *param_values,
+                                                                     gpointer      invocation_hint,
+                                                                     gpointer      marshal_data);
+
 G_END_DECLS
 
 #endif /* ___dbusmenu_menuitem_marshal_MARSHAL_H__ */
-- 
cgit v1.2.3


From a3a68e624f2c0c375d41899547d775d399ffda76 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 10:09:35 -0600
Subject: releasing version 0.3.98-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e335929..150b9a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.3.98-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu2~ppa3) natty; urgency=low
 
   * Upstream Merge
     * Add a signal on the menuitem for generic event support
     * Memory handling fixes in the parser
     * Fix dbus-menu.xml to have more consistent signatures.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 09:48:16 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 10:09:31 -0600
 
 libdbusmenu (0.3.98-0ubuntu2~ppa2) natty; urgency=low
 
-- 
cgit v1.2.3


From 5d4e1c63e3e0fc2bcce9e1217e6565b8d16a83b4 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 23 Feb 2011 11:59:23 -0500
Subject: releasing version 0.3.98-0ubuntu4

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 75ebd37..7e08ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.98-0ubuntu4) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu4) natty; urgency=low
 
   * Merged from trunk (rev 220) 
     - Cleaning up cleaning up so we don't unref twice and crash
-- 
cgit v1.2.3


From 5da1cb455109b7138c7b13ff4214569f0fa0cc40 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 11:08:24 -0600
Subject: releasing version 0.3.98-0ubuntu2~ppa4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55bb1f0..974f607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.98-0ubuntu2~ppa4) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu2~ppa4) natty; urgency=low
 
   * Upstream merge
     * Fixing fixed recursion states
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 11:00:35 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 11:08:22 -0600
 
 libdbusmenu (0.3.98-0ubuntu2~ppa3) natty; urgency=low
 
-- 
cgit v1.2.3


From 0345e27ccc36b166c403f2d0e259fbc17f46f901 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 13:37:44 -0600
Subject: releasing version 0.3.98-0ubuntu2~ppa5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 116e6a8..bc59073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.98-0ubuntu2~ppa5) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu2~ppa5) natty; urgency=low
 
   * Upstream merge
     * Handle the case of a single NULL entry as well.
@@ -8,7 +8,7 @@ libdbusmenu (0.3.98-0ubuntu2~ppa5) UNRELEASED; urgency=low
     * When requesting new layouts get 'enabled' and 'visible'
       as well
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 13:30:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 13:36:34 -0600
 
 libdbusmenu (0.3.98-0ubuntu2~ppa4) natty; urgency=low
 
-- 
cgit v1.2.3


From b1cd403bcc3ad008445fc45c907a1a9de624df58 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 20:44:40 -0600
Subject: * Fix   * Adding a generated .c file

---
 debian/changelog                       | 7 +++++++
 libdbusmenu-glib/dbus-menu-clean.xml.c | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bc59073..d9bd055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.98-0ubuntu2~ppa6) UNRELEASED; urgency=low
+
+  * Fix
+    * Adding a generated .c file
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 20:44:23 -0600
+
 libdbusmenu (0.3.98-0ubuntu2~ppa5) natty; urgency=low
 
   * Upstream merge
diff --git a/libdbusmenu-glib/dbus-menu-clean.xml.c b/libdbusmenu-glib/dbus-menu-clean.xml.c
index 475adb5..4925a3e 100644
--- a/libdbusmenu-glib/dbus-menu-clean.xml.c
+++ b/libdbusmenu-glib/dbus-menu-clean.xml.c
@@ -10,6 +10,14 @@ const char * dbus_menu_clean_xml =
 "			\n"
 "		</property>\n"
 "\n"
+"		<property name=\"text-direction\" type=\"s\" access=\"read\">\n"
+"			\n"
+"		</property>\n"
+"\n"
+"		<property name=\"state\" type=\"s\" access=\"read\">\n"
+"			\n"
+"		</property>\n"
+"\n"
 "\n"
 "\n"
 "		<method name=\"GetLayout\">\n"
-- 
cgit v1.2.3


From e13383fbe886022ec4183ce55f8108ef1c68185d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 08:51:20 -0600
Subject: releasing version 0.3.98-0ubuntu2~ppa6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9bd055..2721315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.98-0ubuntu2~ppa6) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu2~ppa6) natty; urgency=low
 
   * Fix
     * Adding a generated .c file
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Feb 2011 20:44:23 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 08:51:18 -0600
 
 libdbusmenu (0.3.98-0ubuntu2~ppa5) natty; urgency=low
 
-- 
cgit v1.2.3


From 8a35898a425f15ee144e7b87e0dec9f8e38431de Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 13:16:14 -0600
Subject: releasing version 0.3.98-0ubuntu5~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3860865..4400cd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.98-0ubuntu5~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu5~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Add a signal on the menuitem for generic event support
@@ -18,7 +18,7 @@ libdbusmenu (0.3.98-0ubuntu5~ppa1) UNRELEASED; urgency=low
     * Resolving property changes by looking at the properties
       directly.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 12:50:34 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 13:16:11 -0600
 
 libdbusmenu (0.3.98-0ubuntu4) natty; urgency=low
 
-- 
cgit v1.2.3


From f5bcaf5cdf5515d0c55ba848fcd1639c9d2ba79b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 14:05:12 -0600
Subject: Grabbing the generated file as well

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

diff --git a/libdbusmenu-glib/dbus-menu-clean.xml.c b/libdbusmenu-glib/dbus-menu-clean.xml.c
index 4925a3e..215c19c 100644
--- a/libdbusmenu-glib/dbus-menu-clean.xml.c
+++ b/libdbusmenu-glib/dbus-menu-clean.xml.c
@@ -14,7 +14,7 @@ const char * dbus_menu_clean_xml =
 "			\n"
 "		</property>\n"
 "\n"
-"		<property name=\"state\" type=\"s\" access=\"read\">\n"
+"		<property name=\"status\" type=\"s\" access=\"read\">\n"
 "			\n"
 "		</property>\n"
 "\n"
@@ -96,8 +96,8 @@ const char * dbus_menu_clean_xml =
 "\n"
 "		<signal name=\"ItemsPropertiesUpdated\">\n"
 "			\n"
-"			<arg type=\"a(ia(sv))\" name=\"props\" direction=\"out\"/>\n"
-"			<arg type=\"a(ia(s))\" name=\"props_removed\" direction=\"out\"/>\n"
+"			<arg type=\"a(ia{sv})\" name=\"updatedProps\" direction=\"out\"/>\n"
+"			<arg type=\"a(ias)\" name=\"removedProps\" direction=\"out\"/>\n"
 "		</signal>\n"
 "		<signal name=\"LayoutUpdated\">\n"
 "			\n"
-- 
cgit v1.2.3


From 1f45ae88c3eb012fdae94ffe4e70f467baf4b8d2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 14:11:07 -0600
Subject: releasing version 0.3.98-0ubuntu5~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 731930b..7d75832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.98-0ubuntu5~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.98-0ubuntu5~ppa2) natty; urgency=low
 
   * Upstream Merge
     * Fixing state property
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 14:04:08 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 14:11:05 -0600
 
 libdbusmenu (0.3.98-0ubuntu5~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From 9e20f80e0b1b0e804c6b9d37c8faaf719ace90ff Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 15:16:45 -0600
Subject: releasing version 0.3.99-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9e284d..ab00694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.99-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.99-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Add a signal on the menuitem for generic event support
@@ -18,7 +18,7 @@ libdbusmenu (0.3.99-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Resolving property changes by looking at the properties
       directly.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 15:05:44 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 15:16:43 -0600
 
 libdbusmenu (0.3.98-0ubuntu4) natty; urgency=low
 
-- 
cgit v1.2.3


From 5788fe09fa3a433ac617690c5ed27abf591f608d Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 1 Mar 2011 12:09:57 -0500
Subject: releasing version 0.3.99-0ubuntu3

---
 debian/changelog                             | 17 ++++++++
 debian/control                               |  1 +
 debian/patches/disconnect-more-signals.patch | 18 ++++++++
 debian/patches/fix-defaults-in-client.patch  | 65 ++++++++++++++++++++++++++++
 debian/patches/series                        |  2 +
 debian/rules                                 |  1 +
 6 files changed, 104 insertions(+)
 create mode 100644 debian/patches/disconnect-more-signals.patch
 create mode 100644 debian/patches/fix-defaults-in-client.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 132e39d..74b174e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libdbusmenu (0.3.99-0ubuntu3) natty; urgency=low
+
+  * Fix LP: #723873 - ensure that changing a menuitem property to a default
+    value gets propagated properly in the client
+    - add debian/patches/fix-defaults-in-client.patch
+    - update debian/patches/series
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 01 Mar 2011 00:47:24 +0000
+
+libdbusmenu (0.3.99-0ubuntu2) natty; urgency=low
+
+  * debian/patches/disconnect-more-signals.patch:
+    - Fix some crashes by disconnecting more signals when a menuitem is
+      deleted.  LP: #725980 and LP: #726153
+
+ -- Michael Terry <mterry@ubuntu.com>  Mon, 28 Feb 2011 10:09:57 -0500
+
 libdbusmenu (0.3.99-0ubuntu1) natty; urgency=low
 
   [ Ted Gould ]
diff --git a/debian/control b/debian/control
index 0703fed..6d879d8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.
 Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
+               quilt,
                libgtk2.0-dev (>= 2.23.2-0ubuntu2),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
diff --git a/debian/patches/disconnect-more-signals.patch b/debian/patches/disconnect-more-signals.patch
new file mode 100644
index 0000000..653d32c
--- /dev/null
+++ b/debian/patches/disconnect-more-signals.patch
@@ -0,0 +1,18 @@
+=== modified file 'libdbusmenu-gtk/parser.c'
+Index: libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c
+===================================================================
+--- libdbusmenu-0.3.99.orig/libdbusmenu-gtk/parser.c	2011-02-28 10:09:40.907065942 -0500
++++ libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c	2011-02-28 10:09:43.037065942 -0500
+@@ -129,6 +129,12 @@
+ 	if (pdata != NULL && pdata->widget != NULL) {
+ 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
+ 						     0, 0, NULL, G_CALLBACK(widget_notify_cb), NULL);
++		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
++						     0, 0, NULL, G_CALLBACK(accel_changed), NULL);
++		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
++						     0, 0, NULL, G_CALLBACK(checkbox_toggled), NULL);
++		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
++						     0, 0, NULL, G_CALLBACK(menuitem_notify_cb), NULL);
+ 		g_object_remove_weak_pointer(G_OBJECT(pdata->widget), (gpointer*)&pdata->widget);
+ 	}
+ 
diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch
new file mode 100644
index 0000000..a299b32
--- /dev/null
+++ b/debian/patches/fix-defaults-in-client.patch
@@ -0,0 +1,65 @@
+=== modified file 'libdbusmenu-glib/menuitem.c'
+Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
+===================================================================
+--- libdbusmenu-0.3.99.orig/libdbusmenu-glib/menuitem.c	2011-02-25 03:30:16 +0000
++++ libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c	2011-02-28 22:51:34 +0000
+@@ -1150,9 +1150,9 @@
+ 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+ 	GVariant * default_value = NULL;
+ 
++	const gchar * type = menuitem_get_type(mi);
++
+ 	if (value != NULL) {
+-		const gchar * type = menuitem_get_type(mi);
+-
+ 		/* 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) {
+@@ -1163,22 +1163,23 @@
+ 				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. */
++	default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
++	if (default_value != NULL && 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;
+ 		}
+ 	}
+ 
++
+ 	gboolean replaced = FALSE;
+ 	gpointer currentval = g_hash_table_lookup(priv->properties, property);
+ 
+@@ -1371,9 +1372,7 @@
+ 	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+ 	g_return_if_fail(property != NULL);
+ 
+-	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+-
+-	g_hash_table_remove(priv->properties, property);
++	dbusmenu_menuitem_property_set_variant(mi, property, NULL);
+ 
+ 	return;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ab2b338
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+disconnect-more-signals.patch
+fix-defaults-in-client.patch
diff --git a/debian/rules b/debian/rules
index cd1d01f..10140ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_SRCDIR = .
 DEB_BUILDDIR = $(DEB_SRCDIR)/build
-- 
cgit v1.2.3


From 333935cdc35607f5c357226db2060100cba332c6 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 1 Mar 2011 12:13:01 -0500
Subject: releasing version 0.3.99-0ubuntu4

---
 debian/changelog                            | 10 ++++++++
 debian/patches/bluetooth-applet-fix.patch   | 20 +++++++++++++++
 debian/patches/fix-defaults-in-client.patch | 38 +++++++++++++++++++----------
 debian/patches/series                       |  1 +
 4 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 debian/patches/bluetooth-applet-fix.patch

diff --git a/debian/changelog b/debian/changelog
index 74b174e..9029486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdbusmenu (0.3.99-0ubuntu4) natty; urgency=low
+
+  * Fix a warning in gedit
+    - update debian/patches/fix-defaults-in-client.patch
+  * Fix missing submenus in bluetooth-applet
+    - add debian/patches/bluetooth-applet-fix.patch
+    - update debian/patches/series
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 01 Mar 2011 15:13:00 +0000
+
 libdbusmenu (0.3.99-0ubuntu3) natty; urgency=low
 
   * Fix LP: #723873 - ensure that changing a menuitem property to a default
diff --git a/debian/patches/bluetooth-applet-fix.patch b/debian/patches/bluetooth-applet-fix.patch
new file mode 100644
index 0000000..34e0e48
--- /dev/null
+++ b/debian/patches/bluetooth-applet-fix.patch
@@ -0,0 +1,20 @@
+--- a/libdbusmenu-gtk/parser.c
++++ b/libdbusmenu-gtk/parser.c
+@@ -456,6 +456,17 @@ construct_dbusmenu_for_widget (GtkWidget
+                 }
+             }
+ 
++          GtkWidget *submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
++          if (submenu)
++            {
++              pdata->shell = submenu;
++              g_signal_connect (G_OBJECT (submenu),
++                                "child-added",
++                                G_CALLBACK (child_added_cb),
++                                mi);
++              g_object_add_weak_pointer(G_OBJECT(submenu), (gpointer*)&pdata->shell);
++            }
++
+           if (!g_object_get_data (G_OBJECT (widget), "gtk-empty-menu-item") && !GTK_IS_TEAROFF_MENU_ITEM (widget))
+             {
+               visible = gtk_widget_get_visible (widget);
diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch
index a299b32..8e422db 100644
--- a/debian/patches/fix-defaults-in-client.patch
+++ b/debian/patches/fix-defaults-in-client.patch
@@ -1,21 +1,18 @@
-=== modified file 'libdbusmenu-glib/menuitem.c'
-Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
-===================================================================
---- libdbusmenu-0.3.99.orig/libdbusmenu-glib/menuitem.c	2011-02-25 03:30:16 +0000
-+++ libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c	2011-02-28 22:51:34 +0000
-@@ -1150,9 +1150,9 @@
+--- a/libdbusmenu-glib/menuitem.c
++++ b/libdbusmenu-glib/menuitem.c
+@@ -1150,9 +1150,9 @@ dbusmenu_menuitem_property_set_variant (
  	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
  	GVariant * default_value = NULL;
  
-+	const gchar * type = menuitem_get_type(mi);
-+
- 	if (value != NULL) {
+-	if (value != NULL) {
 -		const gchar * type = menuitem_get_type(mi);
--
++	const gchar * type = menuitem_get_type(mi);
+ 
++	if (value != 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) {
-@@ -1163,22 +1163,23 @@
+@@ -1163,22 +1163,23 @@ dbusmenu_menuitem_property_set_variant (
  				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));
  			}
  		}
@@ -51,7 +48,7 @@ Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
  	gboolean replaced = FALSE;
  	gpointer currentval = g_hash_table_lookup(priv->properties, property);
  
-@@ -1371,9 +1372,7 @@
+@@ -1371,9 +1372,7 @@ dbusmenu_menuitem_property_remove (Dbusm
  	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
  	g_return_if_fail(property != NULL);
  
@@ -62,4 +59,19 @@ Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
  
  	return;
  }
-
+@@ -1753,13 +1752,8 @@ dbusmenu_menuitem_property_is_default (D
+ 		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;
++	/* If we haven't stored it locally, then it's the default */
++	return TRUE;
+ }
+ 
+ /* Check to see if this menu item has been sent into the bus yet or
diff --git a/debian/patches/series b/debian/patches/series
index ab2b338..6be76c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disconnect-more-signals.patch
 fix-defaults-in-client.patch
+bluetooth-applet-fix.patch
-- 
cgit v1.2.3


From 86cabf670968df8056246d2f6c3b2c4f6b19399a Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 1 Mar 2011 12:26:20 -0500
Subject: releasing version 0.3.99-0ubuntu5

---
 debian/changelog              |  7 +++++++
 debian/patches/lp726678.patch | 17 +++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 debian/patches/lp726678.patch

diff --git a/debian/changelog b/debian/changelog
index 9029486..3216091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.99-0ubuntu5) natty; urgency=low
+
+  * debian/patches/lp726678.patch
+    - GTK application menus are not correctly displayed (LP: #726678)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 01 Mar 2011 12:14:35 -0500
+
 libdbusmenu (0.3.99-0ubuntu4) natty; urgency=low
 
   * Fix a warning in gedit
diff --git a/debian/patches/lp726678.patch b/debian/patches/lp726678.patch
new file mode 100644
index 0000000..e784b60
--- /dev/null
+++ b/debian/patches/lp726678.patch
@@ -0,0 +1,17 @@
+=== modified file 'libdbusmenu-glib/server.c'
+--- a/libdbusmenu-glib/server.c	2011-02-24 19:52:01 +0000
++++ b/libdbusmenu-glib/server.c	2011-03-01 16:51:50 +0000
+@@ -1180,7 +1180,11 @@
+ 	GVariant * items = NULL;
+ 
+ 	if (priv->root != NULL) {
+-		items = dbusmenu_menuitem_build_variant(priv->root, props, recurse);
++		DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, parent);
++
++		if (mi != NULL) {
++			items = dbusmenu_menuitem_build_variant(mi, props, recurse);
++		}
+ 	}
+ 
+ 	/* What happens if we don't have anything? */
+
diff --git a/debian/patches/series b/debian/patches/series
index 6be76c6..3467a18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disconnect-more-signals.patch
 fix-defaults-in-client.patch
 bluetooth-applet-fix.patch
+lp726678.patch
-- 
cgit v1.2.3


From 5613a63657992289badc274a52ed3421bf174e06 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 3 Mar 2011 13:49:26 -0600
Subject: debian/patches: All submitted upstream

---
 debian/changelog                             |  3 +-
 debian/patches/bluetooth-applet-fix.patch    | 20 --------
 debian/patches/disconnect-more-signals.patch | 18 -------
 debian/patches/fix-defaults-in-client.patch  | 77 ----------------------------
 debian/patches/lp726678.patch                | 17 ------
 debian/patches/series                        |  4 --
 6 files changed, 2 insertions(+), 137 deletions(-)
 delete mode 100644 debian/patches/bluetooth-applet-fix.patch
 delete mode 100644 debian/patches/disconnect-more-signals.patch
 delete mode 100644 debian/patches/fix-defaults-in-client.patch
 delete mode 100644 debian/patches/lp726678.patch
 delete mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 3012233..e883800 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ libdbusmenu (0.3.100-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Restricting GIR scanner to exported interfaces
     * Use the library i18n libraries instead of the app ones
     * Make GetLayout use the parent parameter
+  * debian/patches: All submitted upstream
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 03 Mar 2011 13:43:48 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 03 Mar 2011 13:49:09 -0600
 
 libdbusmenu (0.3.99-0ubuntu5) natty; urgency=low
 
diff --git a/debian/patches/bluetooth-applet-fix.patch b/debian/patches/bluetooth-applet-fix.patch
deleted file mode 100644
index 34e0e48..0000000
--- a/debian/patches/bluetooth-applet-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libdbusmenu-gtk/parser.c
-+++ b/libdbusmenu-gtk/parser.c
-@@ -456,6 +456,17 @@ construct_dbusmenu_for_widget (GtkWidget
-                 }
-             }
- 
-+          GtkWidget *submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
-+          if (submenu)
-+            {
-+              pdata->shell = submenu;
-+              g_signal_connect (G_OBJECT (submenu),
-+                                "child-added",
-+                                G_CALLBACK (child_added_cb),
-+                                mi);
-+              g_object_add_weak_pointer(G_OBJECT(submenu), (gpointer*)&pdata->shell);
-+            }
-+
-           if (!g_object_get_data (G_OBJECT (widget), "gtk-empty-menu-item") && !GTK_IS_TEAROFF_MENU_ITEM (widget))
-             {
-               visible = gtk_widget_get_visible (widget);
diff --git a/debian/patches/disconnect-more-signals.patch b/debian/patches/disconnect-more-signals.patch
deleted file mode 100644
index 653d32c..0000000
--- a/debian/patches/disconnect-more-signals.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-=== modified file 'libdbusmenu-gtk/parser.c'
-Index: libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c
-===================================================================
---- libdbusmenu-0.3.99.orig/libdbusmenu-gtk/parser.c	2011-02-28 10:09:40.907065942 -0500
-+++ libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c	2011-02-28 10:09:43.037065942 -0500
-@@ -129,6 +129,12 @@
- 	if (pdata != NULL && pdata->widget != NULL) {
- 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
- 						     0, 0, NULL, G_CALLBACK(widget_notify_cb), NULL);
-+		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
-+						     0, 0, NULL, G_CALLBACK(accel_changed), NULL);
-+		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
-+						     0, 0, NULL, G_CALLBACK(checkbox_toggled), NULL);
-+		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
-+						     0, 0, NULL, G_CALLBACK(menuitem_notify_cb), NULL);
- 		g_object_remove_weak_pointer(G_OBJECT(pdata->widget), (gpointer*)&pdata->widget);
- 	}
- 
diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch
deleted file mode 100644
index 8e422db..0000000
--- a/debian/patches/fix-defaults-in-client.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/libdbusmenu-glib/menuitem.c
-+++ b/libdbusmenu-glib/menuitem.c
-@@ -1150,9 +1150,9 @@ dbusmenu_menuitem_property_set_variant (
- 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
- 	GVariant * default_value = NULL;
- 
--	if (value != NULL) {
--		const gchar * type = menuitem_get_type(mi);
-+	const gchar * type = menuitem_get_type(mi);
- 
-+	if (value != 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) {
-@@ -1163,22 +1163,23 @@ dbusmenu_menuitem_property_set_variant (
- 				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. */
-+	default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
-+	if (default_value != NULL && 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;
- 		}
- 	}
- 
-+
- 	gboolean replaced = FALSE;
- 	gpointer currentval = g_hash_table_lookup(priv->properties, property);
- 
-@@ -1371,9 +1372,7 @@ dbusmenu_menuitem_property_remove (Dbusm
- 	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
- 	g_return_if_fail(property != NULL);
- 
--	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
--
--	g_hash_table_remove(priv->properties, property);
-+	dbusmenu_menuitem_property_set_variant(mi, property, NULL);
- 
- 	return;
- }
-@@ -1753,13 +1752,8 @@ dbusmenu_menuitem_property_is_default (D
- 		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;
-+	/* If we haven't stored it locally, then it's the default */
-+	return TRUE;
- }
- 
- /* Check to see if this menu item has been sent into the bus yet or
diff --git a/debian/patches/lp726678.patch b/debian/patches/lp726678.patch
deleted file mode 100644
index e784b60..0000000
--- a/debian/patches/lp726678.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'libdbusmenu-glib/server.c'
---- a/libdbusmenu-glib/server.c	2011-02-24 19:52:01 +0000
-+++ b/libdbusmenu-glib/server.c	2011-03-01 16:51:50 +0000
-@@ -1180,7 +1180,11 @@
- 	GVariant * items = NULL;
- 
- 	if (priv->root != NULL) {
--		items = dbusmenu_menuitem_build_variant(priv->root, props, recurse);
-+		DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, parent);
-+
-+		if (mi != NULL) {
-+			items = dbusmenu_menuitem_build_variant(mi, props, recurse);
-+		}
- 	}
- 
- 	/* What happens if we don't have anything? */
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3467a18..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-disconnect-more-signals.patch
-fix-defaults-in-client.patch
-bluetooth-applet-fix.patch
-lp726678.patch
-- 
cgit v1.2.3


From 2949b7cdafe7c7e4204ca441c14ced5672ddcdd9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 3 Mar 2011 13:54:38 -0600
Subject: releasing version 0.3.100-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e883800..47253ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.100-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.100-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * GTK application menus are not correctly displayed (LP: #726678)
@@ -18,7 +18,7 @@ libdbusmenu (0.3.100-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Make GetLayout use the parent parameter
   * debian/patches: All submitted upstream
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 03 Mar 2011 13:49:09 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 03 Mar 2011 13:54:31 -0600
 
 libdbusmenu (0.3.99-0ubuntu5) natty; urgency=low
 
-- 
cgit v1.2.3


From 5f36ab3e6268f99221d4f558bf1a1f16f8c11467 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 4 Mar 2011 09:31:12 -0600
Subject: releasing version 0.3.100-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 610cf88..463c5f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.100-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.100-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Fix the enum-types.h header in the dist
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Mar 2011 09:24:01 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Mar 2011 09:31:09 -0600
 
 libdbusmenu (0.3.100-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From fdf83d543a30e6c94bbca52bd98b7a3ee5c259a5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Mar 2011 11:12:55 -0600
Subject: releasing version 0.3.101-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b34c80..d4b8272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.101-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.101-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     ∘ Add helper to get cached menuitem from widget
@@ -13,7 +13,7 @@ libdbusmenu (0.3.101-0ubuntu1~ppa1) UNRELEASED; urgency=low
       without error
     ∘ Setting the cached menu item (LP: #723463) (LP: #729128) (LP: #729194)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Mar 2011 11:03:27 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Mar 2011 11:12:50 -0600
 
 libdbusmenu (0.3.100-0ubuntu4) natty; urgency=low
 
-- 
cgit v1.2.3


From 96cc1dcb427121de0592ce78230d31412c75bda4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 16 Mar 2011 14:08:16 -0500
Subject: releasing version 0.3.102-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c25405d..59d3c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.3.102-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.102-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     ∘ Remove child items when they're removed by GTK
@@ -9,7 +9,7 @@ libdbusmenu (0.3.102-0ubuntu1~ppa1) UNRELEASED; urgency=low
     ∘ Handle NULL labels (LP: #733688)
     ∘ Fix memory leaks from variants (LP: #722972)
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 16 Mar 2011 14:01:33 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 16 Mar 2011 14:08:13 -0500
 
 libdbusmenu (0.3.101-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 7a250968365a7d840ea30f48f9cc8dc016f1481e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Mar 2011 09:09:02 -0500
Subject: releasing version 0.3.102-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8d9d7d..191f077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.3.102-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.3.102-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Enter and exit the GDK threads before calling GTK (LP: #717162)
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 21 Mar 2011 09:02:41 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 21 Mar 2011 09:08:59 -0500
 
 libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 2eda7d871f7ece27a8c824e16616989d16203b5e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Mar 2011 15:05:10 -0500
Subject: releasing version 0.3.102-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8e254f..819f65a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.102-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.3.102-0ubuntu2~ppa2) natty; urgency=low
 
   * Upstream Merge
     * Protecting properties that are getting updated from an
       extra remove signal.  (LP: #730925)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 22 Mar 2011 14:56:01 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Mar 2011 15:05:05 -0500
 
 libdbusmenu (0.3.102-0ubuntu2~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From 1b43bb9660c247722dd306a46cea2924c29c3b6c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Mar 2011 12:05:57 -0500
Subject: releasing version 0.3.102-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f10ae0f..c9019de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.3.102-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.3.102-0ubuntu2~ppa3) natty; urgency=low
 
   * Upstream Merge
     * Protect from NULL variants by using iter_loop (LP: #737844)
     * Look for accellerators inside the labels as well
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Mar 2011 11:42:42 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Mar 2011 12:05:54 -0500
 
 libdbusmenu (0.3.102-0ubuntu2~ppa2) natty; urgency=low
 
-- 
cgit v1.2.3


From fe1b40cc146c28681b6473ab28198def62c5a38d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Mar 2011 14:56:27 -0500
Subject: releasing version 0.4.0-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ed0304..7c87bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.0-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Protect from NULL variants by using iter_loop (LP: #737844)
@@ -7,7 +7,7 @@ libdbusmenu (0.4.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
       extra remove signal.  (LP: #730925)
     * Enter and exit the GDK threads before calling GTK (LP: #717162)
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 23 Mar 2011 14:47:22 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 23 Mar 2011 14:56:24 -0500
 
 libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 772adc56eb6e748cbbf9029a1b670b8176840924 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Mar 2011 11:40:08 -0500
Subject: releasing version 0.4.0-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51b6266..676899b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.4.0-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.0-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Putting in protections on properties that we don't quite
       understand.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Mar 2011 11:33:28 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Mar 2011 11:40:06 -0500
 
 libdbusmenu (0.4.0-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 9c185d30a98e09ee062533861a8c7e65a00183d2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Mar 2011 21:33:41 -0500
Subject: releasing version 0.4.0-0ubuntu2~ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f32c2a..49b0bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.4.0-0ubuntu2~ppa2) UNRELEASED; urgency=low
+libdbusmenu (0.4.0-0ubuntu2~ppa2) natty; urgency=low
 
   * Upstream Merge
     * Protecting the parent variant throughout it's usage in the
       iterator in the while loop.  (LP: #741726)
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Mar 2011 21:24:16 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Mar 2011 21:33:38 -0500
 
 libdbusmenu (0.4.0-0ubuntu2~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From e89388723962f7cdc6da15369da3af5c83e75c5b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Mar 2011 22:01:20 -0500
Subject: releasing version 0.4.0-0ubuntu2~ppa3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 842b26c..cebdbaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.4.0-0ubuntu2~ppa3) UNRELEASED; urgency=low
+libdbusmenu (0.4.0-0ubuntu2~ppa3) natty; urgency=low
 
   * Upstream Merge
     * Don't unref the variant we didn't have a ref to
       when we error out.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Mar 2011 21:55:07 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 28 Mar 2011 22:01:17 -0500
 
 libdbusmenu (0.4.0-0ubuntu2~ppa2) natty; urgency=low
 
-- 
cgit v1.2.3


From a99c80a3e190e61a8d06dbc17065909d5b9dbc7a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 29 Mar 2011 10:07:11 -0500
Subject: releasing version 0.4.0-0ubuntu2~ppa4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff40f6a..eb46756 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.4.0-0ubuntu2~ppa4) UNRELEASED; urgency=low
+libdbusmenu (0.4.0-0ubuntu2~ppa4) natty; urgency=low
 
   * Upstream Merge
     * Protections and keeping the child variant for the
       iterator around longer.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 29 Mar 2011 09:56:04 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 29 Mar 2011 10:07:09 -0500
 
 libdbusmenu (0.4.0-0ubuntu2~ppa3) natty; urgency=low
 
-- 
cgit v1.2.3


From 20e9ad7bb749f130d7d03b637d5b1cfb97c30ea3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 31 Mar 2011 13:57:21 -0500
Subject: releasing version 0.4.1-0ubuntu1~ppa1

---
 debian/changelog | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0004a2..bbaa9d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.4.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.1-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     * Managed variant iterators better to stop crash when dealing
       with apps that have multiple shortcuts (LP: #741726)
     * Handled GtkMenuItems with no labels as separators (LP: #729187)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 31 Mar 2011 13:48:40 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 31 Mar 2011 13:56:54 -0500
 
 libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low
 
@@ -14,38 +14,6 @@ libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Mon, 28 Mar 2011 14:56:59 -0400
 
-libdbusmenu (0.4.0-0ubuntu2~ppa4) natty; urgency=low
-
-  * Upstream Merge
-    * Protections and keeping the child variant for the
-      iterator around longer.
-
- -- Ted Gould <ted@ubuntu.com>  Tue, 29 Mar 2011 10:07:09 -0500
-
-libdbusmenu (0.4.0-0ubuntu2~ppa3) natty; urgency=low
-
-  * Upstream Merge
-    * Don't unref the variant we didn't have a ref to
-      when we error out.
-
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Mar 2011 22:01:17 -0500
-
-libdbusmenu (0.4.0-0ubuntu2~ppa2) natty; urgency=low
-
-  * Upstream Merge
-    * Protecting the parent variant throughout it's usage in the
-      iterator in the while loop.  (LP: #741726)
-
- -- Ted Gould <ted@ubuntu.com>  Mon, 28 Mar 2011 21:33:38 -0500
-
-libdbusmenu (0.4.0-0ubuntu2~ppa1) natty; urgency=low
-
-  * Upstream Merge
-    * Putting in protections on properties that we don't quite
-      understand.
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Mar 2011 11:40:06 -0500
-
 libdbusmenu (0.4.0-0ubuntu1) natty; urgency=low
 
   * New upstream release.
-- 
cgit v1.2.3


From 81cebd92254afdc5c9142672ee8c9dbcdfa36655 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 5 Apr 2011 16:29:04 -0500
Subject: releasing version 0.4.1-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d1d688..6ed6fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.1-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.1-0ubuntu2~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Fix GIR scan to not include duplicate namespaces (LP: #750575)
@@ -7,7 +7,7 @@ libdbusmenu (0.4.1-0ubuntu2~ppa1) UNRELEASED; urgency=low
     * Add GTK side handlers for the open/close events to ensure GTK
       apps can use those events still (LP: #750588)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 05 Apr 2011 16:20:11 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 05 Apr 2011 16:29:01 -0500
 
 libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 71bcd6d310bf7e67a030e222ab3694e5b32d741a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Apr 2011 10:32:58 -0500
Subject: releasing version 0.4.2-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d17db9a..71d2c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.2-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     ∘ Fix GIR scan to not include duplicate namespaces (LP: #750575)
@@ -10,7 +10,7 @@ libdbusmenu (0.4.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
       have told us they need them with the child-display property.
       (LP: #619811)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 07 Apr 2011 10:24:37 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 07 Apr 2011 10:32:51 -0500
 
 libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3


From 96083eb11f244c84d699c47762cb705da53c17ec Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Thu, 7 Apr 2011 20:25:08 -0400
Subject: * debian/libdbusmenu-gtk3-dev.install:   - Add missing header files
 to gtk3 dev package

---
 debian/changelog                    | 7 +++++++
 debian/libdbusmenu-gtk3-dev.install | 1 +
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f4209cc..8b00097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.4.2-0ubuntu2) natty; urgency=low
+
+  * debian/libdbusmenu-gtk3-dev.install:
+    - Add missing header files to gtk3 dev package
+
+ -- Michael Terry <mterry@ubuntu.com>  Thu, 07 Apr 2011 20:20:25 -0400
+
 libdbusmenu (0.4.2-0ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index 2c9d2e3..dcd24a3 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,3 +1,4 @@
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-gtk3.a
 debian/tmp/usr/lib/libdbusmenu-gtk3.so
-- 
cgit v1.2.3


From 0eda1b6e9338ec5c2d017760e2e58b8db25c72f1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 12 Apr 2011 22:14:01 -0500
Subject: releasing version 0.4.2-0ubuntu4~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1e73cf..482d046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.4.2-0ubuntu4~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.2-0ubuntu4~ppa1) natty; urgency=low
 
   * Upstream Merge
     * Handle cases where labels are added later as subwidgets in
       the menuitem (LP: #758759)
     * Fix the destruction of the attached GTK menuitem (LP: #746091)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Apr 2011 22:04:14 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 12 Apr 2011 22:13:59 -0500
 
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From 720066a82b4dd8d3b1793f85528d4d031381afaa Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 13 Apr 2011 16:49:24 -0400
Subject: * debian/rules   - Fixed package names for makeshlibs (LP: #760102)

---
 debian/changelog | 7 +++++++
 debian/rules     | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e668f7..2f38b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/rules
+    - Fixed package names for makeshlibs (LP: #760102)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 13 Apr 2011 16:48:13 -0400
+
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
   * Merged fix, guard against an activation that does not actually have 
diff --git a/debian/rules b/debian/rules
index 10140ea..8b346e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,9 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-3 += -V 'libdbusmenu-gtk3-3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib3 += -V 'libdbusmenu-glib3 (>= 0.3.90)'
 
 configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3
 stamp-configure-gtk3:
-- 
cgit v1.2.3


From 189ec71e2bcd15cb22f7161d42b2a4cc12321d0d Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 14 Apr 2011 08:56:58 -0400
Subject: Fixed package names for makeshlibs and build targets (LP: #760102)

---
 debian/changelog | 4 ++--
 debian/rules     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f38b21..401e6aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low
 
   * debian/rules
-    - Fixed package names for makeshlibs (LP: #760102)
+    - Fixed package names for makeshlibs and build targets (LP: #760102)
 
- -- Ken VanDine <ken.vandine@canonical.com>  Wed, 13 Apr 2011 16:48:13 -0400
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 14 Apr 2011 08:56:29 -0400
 
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 8b346e9..73068fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-3 += -V 'libdbusmenu-gtk3-3 (>= 0.3.90)'
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib3 += -V 'libdbusmenu-glib3 (>= 0.3.90)'
 
-configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3
+configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3
 stamp-configure-gtk3:
 	: # configure for GTK+ 3.0
 	set -e; \
@@ -28,7 +28,7 @@ stamp-configure-gtk3:
 	cd ..;
 	touch stamp-configure-gtk3
 
-build/libdbusmenu-gtk3-2:: stamp-build-gtk3
+build/libdbusmenu-gtk3-3:: stamp-build-gtk3
 stamp-build-gtk3: stamp-configure-gtk3
 	: # build for GTK+ 3.0
 	$(MAKE) -C build-gtk3;
-- 
cgit v1.2.3


From f25ac35c8a5ddba42bd987accbeb209829236dc2 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 14 Apr 2011 09:30:12 -0400
Subject:   - Fixed package names in build targets (LP: #760102)   - Dropped
 makeshlibs in favor of symbols files * +debian/libdbusmenu-glib3.symbols *
 +debian/libdbusmenu-gtk3-3.symbols * +debian/libdbusmenu-gtk3.symbols

---
 debian/changelog                  |   8 ++-
 debian/libdbusmenu-glib3.symbols  | 141 ++++++++++++++++++++++++++++++++++++++
 debian/libdbusmenu-gtk3-3.symbols | 141 ++++++++++++++++++++++++++++++++++++++
 debian/libdbusmenu-gtk3.symbols   | 141 ++++++++++++++++++++++++++++++++++++++
 debian/rules                      |   4 --
 5 files changed, 429 insertions(+), 6 deletions(-)
 create mode 100644 debian/libdbusmenu-glib3.symbols
 create mode 100644 debian/libdbusmenu-gtk3-3.symbols
 create mode 100644 debian/libdbusmenu-gtk3.symbols

diff --git a/debian/changelog b/debian/changelog
index 401e6aa..75bb02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low
 
   * debian/rules
-    - Fixed package names for makeshlibs and build targets (LP: #760102)
+    - Fixed package names in build targets (LP: #760102)
+    - Dropped makeshlibs in favor of symbols files
+  * +debian/libdbusmenu-glib3.symbols
+  * +debian/libdbusmenu-gtk3-3.symbols
+  * +debian/libdbusmenu-gtk3.symbols
 
- -- Ken VanDine <ken.vandine@canonical.com>  Thu, 14 Apr 2011 08:56:29 -0400
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 14 Apr 2011 09:27:03 -0400
 
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
diff --git a/debian/libdbusmenu-glib3.symbols b/debian/libdbusmenu-glib3.symbols
new file mode 100644
index 0000000..5cac25d
--- /dev/null
+++ b/debian/libdbusmenu-glib3.symbols
@@ -0,0 +1,141 @@
+libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER#
+ dbus_menu_clean_xml@Base 0.4.2
+ dbusmenu_client_add_type_handler@Base 0.4.2
+ dbusmenu_client_add_type_handler_full@Base 0.4.2
+ dbusmenu_client_get_icon_paths@Base 0.4.2
+ dbusmenu_client_get_root@Base 0.4.2
+ dbusmenu_client_get_status@Base 0.4.2
+ dbusmenu_client_get_text_direction@Base 0.4.2
+ dbusmenu_client_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_new@Base 0.4.2
+ dbusmenu_client_new@Base 0.4.2
+ dbusmenu_client_send_about_to_show@Base 0.4.2
+ dbusmenu_client_send_event@Base 0.4.2
+ dbusmenu_defaults_default_get@Base 0.4.2
+ dbusmenu_defaults_default_get_type@Base 0.4.2
+ dbusmenu_defaults_default_set@Base 0.4.2
+ dbusmenu_defaults_get_type@Base 0.4.2
+ dbusmenu_defaults_ref_default@Base 0.4.2
+ dbusmenu_menuitem_build_variant@Base 0.4.2
+ dbusmenu_menuitem_child_add_position@Base 0.4.2
+ dbusmenu_menuitem_child_append@Base 0.4.2
+ dbusmenu_menuitem_child_delete@Base 0.4.2
+ dbusmenu_menuitem_child_find@Base 0.4.2
+ dbusmenu_menuitem_child_prepend@Base 0.4.2
+ dbusmenu_menuitem_child_reorder@Base 0.4.2
+ dbusmenu_menuitem_exposed@Base 0.4.2
+ dbusmenu_menuitem_find_id@Base 0.4.2
+ dbusmenu_menuitem_foreach@Base 0.4.2
+ dbusmenu_menuitem_get_children@Base 0.4.2
+ dbusmenu_menuitem_get_id@Base 0.4.2
+ dbusmenu_menuitem_get_parent@Base 0.4.2
+ dbusmenu_menuitem_get_position@Base 0.4.2
+ dbusmenu_menuitem_get_position_realized@Base 0.4.2
+ dbusmenu_menuitem_get_root@Base 0.4.2
+ dbusmenu_menuitem_get_type@Base 0.4.2
+ dbusmenu_menuitem_handle_event@Base 0.4.2
+ dbusmenu_menuitem_new@Base 0.4.2
+ dbusmenu_menuitem_new_with_id@Base 0.4.2
+ dbusmenu_menuitem_properties_copy@Base 0.4.2
+ dbusmenu_menuitem_properties_list@Base 0.4.2
+ dbusmenu_menuitem_properties_variant@Base 0.4.2
+ dbusmenu_menuitem_property_exist@Base 0.4.2
+ dbusmenu_menuitem_property_get@Base 0.4.2
+ dbusmenu_menuitem_property_get_bool@Base 0.4.2
+ dbusmenu_menuitem_property_get_int@Base 0.4.2
+ dbusmenu_menuitem_property_get_variant@Base 0.4.2
+ dbusmenu_menuitem_property_is_default@Base 0.4.2
+ dbusmenu_menuitem_property_remove@Base 0.4.2
+ dbusmenu_menuitem_property_set@Base 0.4.2
+ dbusmenu_menuitem_property_set_bool@Base 0.4.2
+ dbusmenu_menuitem_property_set_int@Base 0.4.2
+ dbusmenu_menuitem_property_set_variant@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_type@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
+ dbusmenu_menuitem_proxy_new@Base 0.4.2
+ dbusmenu_menuitem_realized@Base 0.4.2
+ dbusmenu_menuitem_send_about_to_show@Base 0.4.2
+ dbusmenu_menuitem_set_parent@Base 0.4.2
+ dbusmenu_menuitem_set_realized@Base 0.4.2
+ dbusmenu_menuitem_set_root@Base 0.4.2
+ dbusmenu_menuitem_show_to_user@Base 0.4.2
+ dbusmenu_menuitem_take_children@Base 0.4.2
+ dbusmenu_menuitem_unparent@Base 0.4.2
+ dbusmenu_server_get_icon_paths@Base 0.4.2
+ dbusmenu_server_get_status@Base 0.4.2
+ dbusmenu_server_get_text_direction@Base 0.4.2
+ dbusmenu_server_get_type@Base 0.4.2
+ dbusmenu_server_new@Base 0.4.2
+ dbusmenu_server_set_icon_paths@Base 0.4.2
+ dbusmenu_server_set_root@Base 0.4.2
+ dbusmenu_server_set_status@Base 0.4.2
+ dbusmenu_server_set_text_direction@Base 0.4.2
+ dbusmenu_status_get_nick@Base 0.4.2
+ dbusmenu_status_get_type@Base 0.4.2
+ dbusmenu_status_get_value_from_nick@Base 0.4.2
+ dbusmenu_text_direction_get_nick@Base 0.4.2
+ dbusmenu_text_direction_get_type@Base 0.4.2
+ dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
+ session_bus_cb@Base 0.4.2
+libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER#
+ dbusmenu_json_build_from_file@Base 0.4.2
+ dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk3-3.symbols b/debian/libdbusmenu-gtk3-3.symbols
new file mode 100644
index 0000000..3e44390
--- /dev/null
+++ b/debian/libdbusmenu-gtk3-3.symbols
@@ -0,0 +1,141 @@
+libdbusmenu-glib.so.3 libdbusmenu-gtk3-3 #MINVER#
+ dbus_menu_clean_xml@Base 0.4.2
+ dbusmenu_client_add_type_handler@Base 0.4.2
+ dbusmenu_client_add_type_handler_full@Base 0.4.2
+ dbusmenu_client_get_icon_paths@Base 0.4.2
+ dbusmenu_client_get_root@Base 0.4.2
+ dbusmenu_client_get_status@Base 0.4.2
+ dbusmenu_client_get_text_direction@Base 0.4.2
+ dbusmenu_client_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_new@Base 0.4.2
+ dbusmenu_client_new@Base 0.4.2
+ dbusmenu_client_send_about_to_show@Base 0.4.2
+ dbusmenu_client_send_event@Base 0.4.2
+ dbusmenu_defaults_default_get@Base 0.4.2
+ dbusmenu_defaults_default_get_type@Base 0.4.2
+ dbusmenu_defaults_default_set@Base 0.4.2
+ dbusmenu_defaults_get_type@Base 0.4.2
+ dbusmenu_defaults_ref_default@Base 0.4.2
+ dbusmenu_menuitem_build_variant@Base 0.4.2
+ dbusmenu_menuitem_child_add_position@Base 0.4.2
+ dbusmenu_menuitem_child_append@Base 0.4.2
+ dbusmenu_menuitem_child_delete@Base 0.4.2
+ dbusmenu_menuitem_child_find@Base 0.4.2
+ dbusmenu_menuitem_child_prepend@Base 0.4.2
+ dbusmenu_menuitem_child_reorder@Base 0.4.2
+ dbusmenu_menuitem_exposed@Base 0.4.2
+ dbusmenu_menuitem_find_id@Base 0.4.2
+ dbusmenu_menuitem_foreach@Base 0.4.2
+ dbusmenu_menuitem_get_children@Base 0.4.2
+ dbusmenu_menuitem_get_id@Base 0.4.2
+ dbusmenu_menuitem_get_parent@Base 0.4.2
+ dbusmenu_menuitem_get_position@Base 0.4.2
+ dbusmenu_menuitem_get_position_realized@Base 0.4.2
+ dbusmenu_menuitem_get_root@Base 0.4.2
+ dbusmenu_menuitem_get_type@Base 0.4.2
+ dbusmenu_menuitem_handle_event@Base 0.4.2
+ dbusmenu_menuitem_new@Base 0.4.2
+ dbusmenu_menuitem_new_with_id@Base 0.4.2
+ dbusmenu_menuitem_properties_copy@Base 0.4.2
+ dbusmenu_menuitem_properties_list@Base 0.4.2
+ dbusmenu_menuitem_properties_variant@Base 0.4.2
+ dbusmenu_menuitem_property_exist@Base 0.4.2
+ dbusmenu_menuitem_property_get@Base 0.4.2
+ dbusmenu_menuitem_property_get_bool@Base 0.4.2
+ dbusmenu_menuitem_property_get_int@Base 0.4.2
+ dbusmenu_menuitem_property_get_variant@Base 0.4.2
+ dbusmenu_menuitem_property_is_default@Base 0.4.2
+ dbusmenu_menuitem_property_remove@Base 0.4.2
+ dbusmenu_menuitem_property_set@Base 0.4.2
+ dbusmenu_menuitem_property_set_bool@Base 0.4.2
+ dbusmenu_menuitem_property_set_int@Base 0.4.2
+ dbusmenu_menuitem_property_set_variant@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_type@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
+ dbusmenu_menuitem_proxy_new@Base 0.4.2
+ dbusmenu_menuitem_realized@Base 0.4.2
+ dbusmenu_menuitem_send_about_to_show@Base 0.4.2
+ dbusmenu_menuitem_set_parent@Base 0.4.2
+ dbusmenu_menuitem_set_realized@Base 0.4.2
+ dbusmenu_menuitem_set_root@Base 0.4.2
+ dbusmenu_menuitem_show_to_user@Base 0.4.2
+ dbusmenu_menuitem_take_children@Base 0.4.2
+ dbusmenu_menuitem_unparent@Base 0.4.2
+ dbusmenu_server_get_icon_paths@Base 0.4.2
+ dbusmenu_server_get_status@Base 0.4.2
+ dbusmenu_server_get_text_direction@Base 0.4.2
+ dbusmenu_server_get_type@Base 0.4.2
+ dbusmenu_server_new@Base 0.4.2
+ dbusmenu_server_set_icon_paths@Base 0.4.2
+ dbusmenu_server_set_root@Base 0.4.2
+ dbusmenu_server_set_status@Base 0.4.2
+ dbusmenu_server_set_text_direction@Base 0.4.2
+ dbusmenu_status_get_nick@Base 0.4.2
+ dbusmenu_status_get_type@Base 0.4.2
+ dbusmenu_status_get_value_from_nick@Base 0.4.2
+ dbusmenu_text_direction_get_nick@Base 0.4.2
+ dbusmenu_text_direction_get_type@Base 0.4.2
+ dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
+ session_bus_cb@Base 0.4.2
+libdbusmenu-gtk.so.3 libdbusmenu-gtk3-3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-gtk3.so.3 libdbusmenu-gtk3-3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3-3 #MINVER#
+ dbusmenu_json_build_from_file@Base 0.4.2
+ dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk3.symbols b/debian/libdbusmenu-gtk3.symbols
new file mode 100644
index 0000000..fd2d6aa
--- /dev/null
+++ b/debian/libdbusmenu-gtk3.symbols
@@ -0,0 +1,141 @@
+libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER#
+ dbus_menu_clean_xml@Base 0.4.2
+ dbusmenu_client_add_type_handler@Base 0.4.2
+ dbusmenu_client_add_type_handler_full@Base 0.4.2
+ dbusmenu_client_get_icon_paths@Base 0.4.2
+ dbusmenu_client_get_root@Base 0.4.2
+ dbusmenu_client_get_status@Base 0.4.2
+ dbusmenu_client_get_text_direction@Base 0.4.2
+ dbusmenu_client_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_new@Base 0.4.2
+ dbusmenu_client_new@Base 0.4.2
+ dbusmenu_client_send_about_to_show@Base 0.4.2
+ dbusmenu_client_send_event@Base 0.4.2
+ dbusmenu_defaults_default_get@Base 0.4.2
+ dbusmenu_defaults_default_get_type@Base 0.4.2
+ dbusmenu_defaults_default_set@Base 0.4.2
+ dbusmenu_defaults_get_type@Base 0.4.2
+ dbusmenu_defaults_ref_default@Base 0.4.2
+ dbusmenu_menuitem_build_variant@Base 0.4.2
+ dbusmenu_menuitem_child_add_position@Base 0.4.2
+ dbusmenu_menuitem_child_append@Base 0.4.2
+ dbusmenu_menuitem_child_delete@Base 0.4.2
+ dbusmenu_menuitem_child_find@Base 0.4.2
+ dbusmenu_menuitem_child_prepend@Base 0.4.2
+ dbusmenu_menuitem_child_reorder@Base 0.4.2
+ dbusmenu_menuitem_exposed@Base 0.4.2
+ dbusmenu_menuitem_find_id@Base 0.4.2
+ dbusmenu_menuitem_foreach@Base 0.4.2
+ dbusmenu_menuitem_get_children@Base 0.4.2
+ dbusmenu_menuitem_get_id@Base 0.4.2
+ dbusmenu_menuitem_get_parent@Base 0.4.2
+ dbusmenu_menuitem_get_position@Base 0.4.2
+ dbusmenu_menuitem_get_position_realized@Base 0.4.2
+ dbusmenu_menuitem_get_root@Base 0.4.2
+ dbusmenu_menuitem_get_type@Base 0.4.2
+ dbusmenu_menuitem_handle_event@Base 0.4.2
+ dbusmenu_menuitem_new@Base 0.4.2
+ dbusmenu_menuitem_new_with_id@Base 0.4.2
+ dbusmenu_menuitem_properties_copy@Base 0.4.2
+ dbusmenu_menuitem_properties_list@Base 0.4.2
+ dbusmenu_menuitem_properties_variant@Base 0.4.2
+ dbusmenu_menuitem_property_exist@Base 0.4.2
+ dbusmenu_menuitem_property_get@Base 0.4.2
+ dbusmenu_menuitem_property_get_bool@Base 0.4.2
+ dbusmenu_menuitem_property_get_int@Base 0.4.2
+ dbusmenu_menuitem_property_get_variant@Base 0.4.2
+ dbusmenu_menuitem_property_is_default@Base 0.4.2
+ dbusmenu_menuitem_property_remove@Base 0.4.2
+ dbusmenu_menuitem_property_set@Base 0.4.2
+ dbusmenu_menuitem_property_set_bool@Base 0.4.2
+ dbusmenu_menuitem_property_set_int@Base 0.4.2
+ dbusmenu_menuitem_property_set_variant@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_type@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
+ dbusmenu_menuitem_proxy_new@Base 0.4.2
+ dbusmenu_menuitem_realized@Base 0.4.2
+ dbusmenu_menuitem_send_about_to_show@Base 0.4.2
+ dbusmenu_menuitem_set_parent@Base 0.4.2
+ dbusmenu_menuitem_set_realized@Base 0.4.2
+ dbusmenu_menuitem_set_root@Base 0.4.2
+ dbusmenu_menuitem_show_to_user@Base 0.4.2
+ dbusmenu_menuitem_take_children@Base 0.4.2
+ dbusmenu_menuitem_unparent@Base 0.4.2
+ dbusmenu_server_get_icon_paths@Base 0.4.2
+ dbusmenu_server_get_status@Base 0.4.2
+ dbusmenu_server_get_text_direction@Base 0.4.2
+ dbusmenu_server_get_type@Base 0.4.2
+ dbusmenu_server_new@Base 0.4.2
+ dbusmenu_server_set_icon_paths@Base 0.4.2
+ dbusmenu_server_set_root@Base 0.4.2
+ dbusmenu_server_set_status@Base 0.4.2
+ dbusmenu_server_set_text_direction@Base 0.4.2
+ dbusmenu_status_get_nick@Base 0.4.2
+ dbusmenu_status_get_type@Base 0.4.2
+ dbusmenu_status_get_value_from_nick@Base 0.4.2
+ dbusmenu_text_direction_get_nick@Base 0.4.2
+ dbusmenu_text_direction_get_type@Base 0.4.2
+ dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
+ session_bus_cb@Base 0.4.2
+libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER#
+ dbusmenu_json_build_from_file@Base 0.4.2
+ dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/rules b/debian/rules
index 73068fb..dd4f69c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,6 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-3 += -V 'libdbusmenu-gtk3-3 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib3 += -V 'libdbusmenu-glib3 (>= 0.3.90)'
-
 configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3
 stamp-configure-gtk3:
 	: # configure for GTK+ 3.0
-- 
cgit v1.2.3


From 2c9d70b972291a0502b3e827f13b120e20565989 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 14 Apr 2011 16:49:16 -0500
Subject: releasing version 0.4.3-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35aedc9..c44f3b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.3-0ubuntu1~ppa1) natty; urgency=low
 
   [ Ken VanDine ]
   * debian/rules
@@ -16,7 +16,7 @@ libdbusmenu (0.4.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
     ∘ Guard against an activation that does not actually have an
       associated menu-hide (LP: #750588)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 14 Apr 2011 16:41:27 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 14 Apr 2011 16:49:13 -0500
 
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From e2d3b6238be2901a3ec41d66ed5769189241daf7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 25 Apr 2011 15:19:29 -0500
Subject: releasing version 0.4.4-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bdc27e..7afdceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.4-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     - Fix a typo in the signal name to make it match the XML 
@@ -10,7 +10,7 @@ libdbusmenu (0.4.4-0ubuntu1~ppa1) UNRELEASED; urgency=low
     - Make sure we don't activate toplevel children that aren't
       menu items or don't have submenus (LP: #761112)
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 25 Apr 2011 15:10:54 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 25 Apr 2011 15:19:25 -0500
 
 libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low
 
-- 
cgit v1.2.3


From 0d6b61d67b331fd86cf489d4beceee39c0e9e60e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 26 Apr 2011 08:52:48 -0500
Subject: debian/control, debian/*: Renaming packages for library version bump
 from 3 to 4.

---
 debian/changelog                       |   4 +-
 debian/control                         |  35 ++++----
 debian/libdbusmenu-glib3.install       |   1 -
 debian/libdbusmenu-glib3.symbols       | 141 ---------------------------------
 debian/libdbusmenu-glib4.install       |   1 +
 debian/libdbusmenu-glib4.symbols       | 141 +++++++++++++++++++++++++++++++++
 debian/libdbusmenu-gtk3-3.install      |   1 -
 debian/libdbusmenu-gtk3-4.install      |   1 +
 debian/libdbusmenu-gtk3.install        |   1 -
 debian/libdbusmenu-gtk3.symbols        | 141 ---------------------------------
 debian/libdbusmenu-gtk4.install        |   1 +
 debian/libdbusmenu-gtk4.symbols        | 141 +++++++++++++++++++++++++++++++++
 debian/libdbusmenu-jsonloader3.install |   1 -
 debian/libdbusmenu-jsonloader4.install |   1 +
 14 files changed, 307 insertions(+), 304 deletions(-)
 delete mode 100644 debian/libdbusmenu-glib3.install
 delete mode 100644 debian/libdbusmenu-glib3.symbols
 create mode 100644 debian/libdbusmenu-glib4.install
 create mode 100644 debian/libdbusmenu-glib4.symbols
 delete mode 100644 debian/libdbusmenu-gtk3-3.install
 create mode 100644 debian/libdbusmenu-gtk3-4.install
 delete mode 100644 debian/libdbusmenu-gtk3.install
 delete mode 100644 debian/libdbusmenu-gtk3.symbols
 create mode 100644 debian/libdbusmenu-gtk4.install
 create mode 100644 debian/libdbusmenu-gtk4.symbols
 delete mode 100644 debian/libdbusmenu-jsonloader3.install
 create mode 100644 debian/libdbusmenu-jsonloader4.install

diff --git a/debian/changelog b/debian/changelog
index 0145b18..9f55fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libdbusmenu (0.4.90~pre1-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * Upstream Merge
     * Bumping library revision for ABI/API changes expected in this
       release cycle
+  * debian/control, debian/*: Renaming packages for library version
+    bump from 3 to 4.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 26 Apr 2011 08:46:54 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 26 Apr 2011 08:52:18 -0500
 
 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index a2cd3d3..da0842d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 
-Package: libdbusmenu-glib3
+Package: libdbusmenu-glib4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -49,7 +49,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-glib3 (= ${binary:Version}),
+         libdbusmenu-glib4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: library for passing menus over DBus - development files
@@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files
  .
  This package contains files that are needed to build applications.
 
-Package: libdbusmenu-gtk3
+Package: libdbusmenu-gtk4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -76,7 +76,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
@@ -93,7 +93,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
-         libdbusmenu-glib3 (= ${binary:Version})
+         libdbusmenu-glib4 (= ${binary:Version})
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -106,29 +106,29 @@ Package: gir1.2-dbusmenu-glib-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-glib3 (= ${binary:Version}),
+         libdbusmenu-glib4 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-glib3
+Description: typelib file for libdbusmenu-glib4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-glib3.
+ generate dynamic bindings for libdbusmenu-glib4.
 
 Package: gir1.2-dbusmenu-gtk-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk4 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk3
+Description: typelib file for libdbusmenu-gtk4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk3.
+ generate dynamic bindings for libdbusmenu-gtk4.
 
 Package: libdbusmenu-glib-doc
 Section: doc
@@ -152,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader3
+Package: libdbusmenu-jsonloader4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -170,6 +170,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libdbusmenu-jsonloader4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (= ${binary:Version}),
          libjson-glib-dev
@@ -181,7 +182,7 @@ Description: library for passing menus over DBus - Test lib development files
  This package contains files that are needed to build test suites in 
  applications or libraries using dbusmenu.
 
-Package: libdbusmenu-gtk3-3
+Package: libdbusmenu-gtk3-4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -198,7 +199,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3-3 (= ${binary:Version}),
+         libdbusmenu-gtk3-4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk-3-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
@@ -213,13 +214,13 @@ Package: gir1.2-dbusmenu-gtk3-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3-3 (= ${binary:Version}),
+         libdbusmenu-gtk3-4 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk3-3
+Description: typelib file for libdbusmenu-gtk3-4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk3.
+ generate dynamic bindings for libdbusmenu-gtk4.
 
diff --git a/debian/libdbusmenu-glib3.install b/debian/libdbusmenu-glib3.install
deleted file mode 100644
index acdbacf..0000000
--- a/debian/libdbusmenu-glib3.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-glib3.symbols b/debian/libdbusmenu-glib3.symbols
deleted file mode 100644
index 5cac25d..0000000
--- a/debian/libdbusmenu-glib3.symbols
+++ /dev/null
@@ -1,141 +0,0 @@
-libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER#
- dbus_menu_clean_xml@Base 0.4.2
- dbusmenu_client_add_type_handler@Base 0.4.2
- dbusmenu_client_add_type_handler_full@Base 0.4.2
- dbusmenu_client_get_icon_paths@Base 0.4.2
- dbusmenu_client_get_root@Base 0.4.2
- dbusmenu_client_get_status@Base 0.4.2
- dbusmenu_client_get_text_direction@Base 0.4.2
- dbusmenu_client_get_type@Base 0.4.2
- dbusmenu_client_menuitem_get_type@Base 0.4.2
- dbusmenu_client_menuitem_new@Base 0.4.2
- dbusmenu_client_new@Base 0.4.2
- dbusmenu_client_send_about_to_show@Base 0.4.2
- dbusmenu_client_send_event@Base 0.4.2
- dbusmenu_defaults_default_get@Base 0.4.2
- dbusmenu_defaults_default_get_type@Base 0.4.2
- dbusmenu_defaults_default_set@Base 0.4.2
- dbusmenu_defaults_get_type@Base 0.4.2
- dbusmenu_defaults_ref_default@Base 0.4.2
- dbusmenu_menuitem_build_variant@Base 0.4.2
- dbusmenu_menuitem_child_add_position@Base 0.4.2
- dbusmenu_menuitem_child_append@Base 0.4.2
- dbusmenu_menuitem_child_delete@Base 0.4.2
- dbusmenu_menuitem_child_find@Base 0.4.2
- dbusmenu_menuitem_child_prepend@Base 0.4.2
- dbusmenu_menuitem_child_reorder@Base 0.4.2
- dbusmenu_menuitem_exposed@Base 0.4.2
- dbusmenu_menuitem_find_id@Base 0.4.2
- dbusmenu_menuitem_foreach@Base 0.4.2
- dbusmenu_menuitem_get_children@Base 0.4.2
- dbusmenu_menuitem_get_id@Base 0.4.2
- dbusmenu_menuitem_get_parent@Base 0.4.2
- dbusmenu_menuitem_get_position@Base 0.4.2
- dbusmenu_menuitem_get_position_realized@Base 0.4.2
- dbusmenu_menuitem_get_root@Base 0.4.2
- dbusmenu_menuitem_get_type@Base 0.4.2
- dbusmenu_menuitem_handle_event@Base 0.4.2
- dbusmenu_menuitem_new@Base 0.4.2
- dbusmenu_menuitem_new_with_id@Base 0.4.2
- dbusmenu_menuitem_properties_copy@Base 0.4.2
- dbusmenu_menuitem_properties_list@Base 0.4.2
- dbusmenu_menuitem_properties_variant@Base 0.4.2
- dbusmenu_menuitem_property_exist@Base 0.4.2
- dbusmenu_menuitem_property_get@Base 0.4.2
- dbusmenu_menuitem_property_get_bool@Base 0.4.2
- dbusmenu_menuitem_property_get_int@Base 0.4.2
- dbusmenu_menuitem_property_get_variant@Base 0.4.2
- dbusmenu_menuitem_property_is_default@Base 0.4.2
- dbusmenu_menuitem_property_remove@Base 0.4.2
- dbusmenu_menuitem_property_set@Base 0.4.2
- dbusmenu_menuitem_property_set_bool@Base 0.4.2
- dbusmenu_menuitem_property_set_int@Base 0.4.2
- dbusmenu_menuitem_property_set_variant@Base 0.4.2
- dbusmenu_menuitem_proxy_get_type@Base 0.4.2
- dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
- dbusmenu_menuitem_proxy_new@Base 0.4.2
- dbusmenu_menuitem_realized@Base 0.4.2
- dbusmenu_menuitem_send_about_to_show@Base 0.4.2
- dbusmenu_menuitem_set_parent@Base 0.4.2
- dbusmenu_menuitem_set_realized@Base 0.4.2
- dbusmenu_menuitem_set_root@Base 0.4.2
- dbusmenu_menuitem_show_to_user@Base 0.4.2
- dbusmenu_menuitem_take_children@Base 0.4.2
- dbusmenu_menuitem_unparent@Base 0.4.2
- dbusmenu_server_get_icon_paths@Base 0.4.2
- dbusmenu_server_get_status@Base 0.4.2
- dbusmenu_server_get_text_direction@Base 0.4.2
- dbusmenu_server_get_type@Base 0.4.2
- dbusmenu_server_new@Base 0.4.2
- dbusmenu_server_set_icon_paths@Base 0.4.2
- dbusmenu_server_set_root@Base 0.4.2
- dbusmenu_server_set_status@Base 0.4.2
- dbusmenu_server_set_text_direction@Base 0.4.2
- dbusmenu_status_get_nick@Base 0.4.2
- dbusmenu_status_get_type@Base 0.4.2
- dbusmenu_status_get_value_from_nick@Base 0.4.2
- dbusmenu_text_direction_get_nick@Base 0.4.2
- dbusmenu_text_direction_get_type@Base 0.4.2
- dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
- session_bus_cb@Base 0.4.2
-libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER#
- dbusmenu_json_build_from_file@Base 0.4.2
- dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install
new file mode 100644
index 0000000..acdbacf
--- /dev/null
+++ b/debian/libdbusmenu-glib4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols
new file mode 100644
index 0000000..5cac25d
--- /dev/null
+++ b/debian/libdbusmenu-glib4.symbols
@@ -0,0 +1,141 @@
+libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER#
+ dbus_menu_clean_xml@Base 0.4.2
+ dbusmenu_client_add_type_handler@Base 0.4.2
+ dbusmenu_client_add_type_handler_full@Base 0.4.2
+ dbusmenu_client_get_icon_paths@Base 0.4.2
+ dbusmenu_client_get_root@Base 0.4.2
+ dbusmenu_client_get_status@Base 0.4.2
+ dbusmenu_client_get_text_direction@Base 0.4.2
+ dbusmenu_client_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_new@Base 0.4.2
+ dbusmenu_client_new@Base 0.4.2
+ dbusmenu_client_send_about_to_show@Base 0.4.2
+ dbusmenu_client_send_event@Base 0.4.2
+ dbusmenu_defaults_default_get@Base 0.4.2
+ dbusmenu_defaults_default_get_type@Base 0.4.2
+ dbusmenu_defaults_default_set@Base 0.4.2
+ dbusmenu_defaults_get_type@Base 0.4.2
+ dbusmenu_defaults_ref_default@Base 0.4.2
+ dbusmenu_menuitem_build_variant@Base 0.4.2
+ dbusmenu_menuitem_child_add_position@Base 0.4.2
+ dbusmenu_menuitem_child_append@Base 0.4.2
+ dbusmenu_menuitem_child_delete@Base 0.4.2
+ dbusmenu_menuitem_child_find@Base 0.4.2
+ dbusmenu_menuitem_child_prepend@Base 0.4.2
+ dbusmenu_menuitem_child_reorder@Base 0.4.2
+ dbusmenu_menuitem_exposed@Base 0.4.2
+ dbusmenu_menuitem_find_id@Base 0.4.2
+ dbusmenu_menuitem_foreach@Base 0.4.2
+ dbusmenu_menuitem_get_children@Base 0.4.2
+ dbusmenu_menuitem_get_id@Base 0.4.2
+ dbusmenu_menuitem_get_parent@Base 0.4.2
+ dbusmenu_menuitem_get_position@Base 0.4.2
+ dbusmenu_menuitem_get_position_realized@Base 0.4.2
+ dbusmenu_menuitem_get_root@Base 0.4.2
+ dbusmenu_menuitem_get_type@Base 0.4.2
+ dbusmenu_menuitem_handle_event@Base 0.4.2
+ dbusmenu_menuitem_new@Base 0.4.2
+ dbusmenu_menuitem_new_with_id@Base 0.4.2
+ dbusmenu_menuitem_properties_copy@Base 0.4.2
+ dbusmenu_menuitem_properties_list@Base 0.4.2
+ dbusmenu_menuitem_properties_variant@Base 0.4.2
+ dbusmenu_menuitem_property_exist@Base 0.4.2
+ dbusmenu_menuitem_property_get@Base 0.4.2
+ dbusmenu_menuitem_property_get_bool@Base 0.4.2
+ dbusmenu_menuitem_property_get_int@Base 0.4.2
+ dbusmenu_menuitem_property_get_variant@Base 0.4.2
+ dbusmenu_menuitem_property_is_default@Base 0.4.2
+ dbusmenu_menuitem_property_remove@Base 0.4.2
+ dbusmenu_menuitem_property_set@Base 0.4.2
+ dbusmenu_menuitem_property_set_bool@Base 0.4.2
+ dbusmenu_menuitem_property_set_int@Base 0.4.2
+ dbusmenu_menuitem_property_set_variant@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_type@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
+ dbusmenu_menuitem_proxy_new@Base 0.4.2
+ dbusmenu_menuitem_realized@Base 0.4.2
+ dbusmenu_menuitem_send_about_to_show@Base 0.4.2
+ dbusmenu_menuitem_set_parent@Base 0.4.2
+ dbusmenu_menuitem_set_realized@Base 0.4.2
+ dbusmenu_menuitem_set_root@Base 0.4.2
+ dbusmenu_menuitem_show_to_user@Base 0.4.2
+ dbusmenu_menuitem_take_children@Base 0.4.2
+ dbusmenu_menuitem_unparent@Base 0.4.2
+ dbusmenu_server_get_icon_paths@Base 0.4.2
+ dbusmenu_server_get_status@Base 0.4.2
+ dbusmenu_server_get_text_direction@Base 0.4.2
+ dbusmenu_server_get_type@Base 0.4.2
+ dbusmenu_server_new@Base 0.4.2
+ dbusmenu_server_set_icon_paths@Base 0.4.2
+ dbusmenu_server_set_root@Base 0.4.2
+ dbusmenu_server_set_status@Base 0.4.2
+ dbusmenu_server_set_text_direction@Base 0.4.2
+ dbusmenu_status_get_nick@Base 0.4.2
+ dbusmenu_status_get_type@Base 0.4.2
+ dbusmenu_status_get_value_from_nick@Base 0.4.2
+ dbusmenu_text_direction_get_nick@Base 0.4.2
+ dbusmenu_text_direction_get_type@Base 0.4.2
+ dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
+ session_bus_cb@Base 0.4.2
+libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER#
+ dbusmenu_json_build_from_file@Base 0.4.2
+ dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk3-3.install b/debian/libdbusmenu-gtk3-3.install
deleted file mode 100644
index af2e9a3..0000000
--- a/debian/libdbusmenu-gtk3-3.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install
new file mode 100644
index 0000000..af2e9a3
--- /dev/null
+++ b/debian/libdbusmenu-gtk3-4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install
deleted file mode 100644
index d677935..0000000
--- a/debian/libdbusmenu-gtk3.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-gtk.so.*
diff --git a/debian/libdbusmenu-gtk3.symbols b/debian/libdbusmenu-gtk3.symbols
deleted file mode 100644
index fd2d6aa..0000000
--- a/debian/libdbusmenu-gtk3.symbols
+++ /dev/null
@@ -1,141 +0,0 @@
-libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER#
- dbus_menu_clean_xml@Base 0.4.2
- dbusmenu_client_add_type_handler@Base 0.4.2
- dbusmenu_client_add_type_handler_full@Base 0.4.2
- dbusmenu_client_get_icon_paths@Base 0.4.2
- dbusmenu_client_get_root@Base 0.4.2
- dbusmenu_client_get_status@Base 0.4.2
- dbusmenu_client_get_text_direction@Base 0.4.2
- dbusmenu_client_get_type@Base 0.4.2
- dbusmenu_client_menuitem_get_type@Base 0.4.2
- dbusmenu_client_menuitem_new@Base 0.4.2
- dbusmenu_client_new@Base 0.4.2
- dbusmenu_client_send_about_to_show@Base 0.4.2
- dbusmenu_client_send_event@Base 0.4.2
- dbusmenu_defaults_default_get@Base 0.4.2
- dbusmenu_defaults_default_get_type@Base 0.4.2
- dbusmenu_defaults_default_set@Base 0.4.2
- dbusmenu_defaults_get_type@Base 0.4.2
- dbusmenu_defaults_ref_default@Base 0.4.2
- dbusmenu_menuitem_build_variant@Base 0.4.2
- dbusmenu_menuitem_child_add_position@Base 0.4.2
- dbusmenu_menuitem_child_append@Base 0.4.2
- dbusmenu_menuitem_child_delete@Base 0.4.2
- dbusmenu_menuitem_child_find@Base 0.4.2
- dbusmenu_menuitem_child_prepend@Base 0.4.2
- dbusmenu_menuitem_child_reorder@Base 0.4.2
- dbusmenu_menuitem_exposed@Base 0.4.2
- dbusmenu_menuitem_find_id@Base 0.4.2
- dbusmenu_menuitem_foreach@Base 0.4.2
- dbusmenu_menuitem_get_children@Base 0.4.2
- dbusmenu_menuitem_get_id@Base 0.4.2
- dbusmenu_menuitem_get_parent@Base 0.4.2
- dbusmenu_menuitem_get_position@Base 0.4.2
- dbusmenu_menuitem_get_position_realized@Base 0.4.2
- dbusmenu_menuitem_get_root@Base 0.4.2
- dbusmenu_menuitem_get_type@Base 0.4.2
- dbusmenu_menuitem_handle_event@Base 0.4.2
- dbusmenu_menuitem_new@Base 0.4.2
- dbusmenu_menuitem_new_with_id@Base 0.4.2
- dbusmenu_menuitem_properties_copy@Base 0.4.2
- dbusmenu_menuitem_properties_list@Base 0.4.2
- dbusmenu_menuitem_properties_variant@Base 0.4.2
- dbusmenu_menuitem_property_exist@Base 0.4.2
- dbusmenu_menuitem_property_get@Base 0.4.2
- dbusmenu_menuitem_property_get_bool@Base 0.4.2
- dbusmenu_menuitem_property_get_int@Base 0.4.2
- dbusmenu_menuitem_property_get_variant@Base 0.4.2
- dbusmenu_menuitem_property_is_default@Base 0.4.2
- dbusmenu_menuitem_property_remove@Base 0.4.2
- dbusmenu_menuitem_property_set@Base 0.4.2
- dbusmenu_menuitem_property_set_bool@Base 0.4.2
- dbusmenu_menuitem_property_set_int@Base 0.4.2
- dbusmenu_menuitem_property_set_variant@Base 0.4.2
- dbusmenu_menuitem_proxy_get_type@Base 0.4.2
- dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
- dbusmenu_menuitem_proxy_new@Base 0.4.2
- dbusmenu_menuitem_realized@Base 0.4.2
- dbusmenu_menuitem_send_about_to_show@Base 0.4.2
- dbusmenu_menuitem_set_parent@Base 0.4.2
- dbusmenu_menuitem_set_realized@Base 0.4.2
- dbusmenu_menuitem_set_root@Base 0.4.2
- dbusmenu_menuitem_show_to_user@Base 0.4.2
- dbusmenu_menuitem_take_children@Base 0.4.2
- dbusmenu_menuitem_unparent@Base 0.4.2
- dbusmenu_server_get_icon_paths@Base 0.4.2
- dbusmenu_server_get_status@Base 0.4.2
- dbusmenu_server_get_text_direction@Base 0.4.2
- dbusmenu_server_get_type@Base 0.4.2
- dbusmenu_server_new@Base 0.4.2
- dbusmenu_server_set_icon_paths@Base 0.4.2
- dbusmenu_server_set_root@Base 0.4.2
- dbusmenu_server_set_status@Base 0.4.2
- dbusmenu_server_set_text_direction@Base 0.4.2
- dbusmenu_status_get_nick@Base 0.4.2
- dbusmenu_status_get_type@Base 0.4.2
- dbusmenu_status_get_value_from_nick@Base 0.4.2
- dbusmenu_text_direction_get_nick@Base 0.4.2
- dbusmenu_text_direction_get_type@Base 0.4.2
- dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
- session_bus_cb@Base 0.4.2
-libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER#
- dbusmenu_json_build_from_file@Base 0.4.2
- dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install
new file mode 100644
index 0000000..d677935
--- /dev/null
+++ b/debian/libdbusmenu-gtk4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-gtk.so.*
diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols
new file mode 100644
index 0000000..fd2d6aa
--- /dev/null
+++ b/debian/libdbusmenu-gtk4.symbols
@@ -0,0 +1,141 @@
+libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER#
+ dbus_menu_clean_xml@Base 0.4.2
+ dbusmenu_client_add_type_handler@Base 0.4.2
+ dbusmenu_client_add_type_handler_full@Base 0.4.2
+ dbusmenu_client_get_icon_paths@Base 0.4.2
+ dbusmenu_client_get_root@Base 0.4.2
+ dbusmenu_client_get_status@Base 0.4.2
+ dbusmenu_client_get_text_direction@Base 0.4.2
+ dbusmenu_client_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_get_type@Base 0.4.2
+ dbusmenu_client_menuitem_new@Base 0.4.2
+ dbusmenu_client_new@Base 0.4.2
+ dbusmenu_client_send_about_to_show@Base 0.4.2
+ dbusmenu_client_send_event@Base 0.4.2
+ dbusmenu_defaults_default_get@Base 0.4.2
+ dbusmenu_defaults_default_get_type@Base 0.4.2
+ dbusmenu_defaults_default_set@Base 0.4.2
+ dbusmenu_defaults_get_type@Base 0.4.2
+ dbusmenu_defaults_ref_default@Base 0.4.2
+ dbusmenu_menuitem_build_variant@Base 0.4.2
+ dbusmenu_menuitem_child_add_position@Base 0.4.2
+ dbusmenu_menuitem_child_append@Base 0.4.2
+ dbusmenu_menuitem_child_delete@Base 0.4.2
+ dbusmenu_menuitem_child_find@Base 0.4.2
+ dbusmenu_menuitem_child_prepend@Base 0.4.2
+ dbusmenu_menuitem_child_reorder@Base 0.4.2
+ dbusmenu_menuitem_exposed@Base 0.4.2
+ dbusmenu_menuitem_find_id@Base 0.4.2
+ dbusmenu_menuitem_foreach@Base 0.4.2
+ dbusmenu_menuitem_get_children@Base 0.4.2
+ dbusmenu_menuitem_get_id@Base 0.4.2
+ dbusmenu_menuitem_get_parent@Base 0.4.2
+ dbusmenu_menuitem_get_position@Base 0.4.2
+ dbusmenu_menuitem_get_position_realized@Base 0.4.2
+ dbusmenu_menuitem_get_root@Base 0.4.2
+ dbusmenu_menuitem_get_type@Base 0.4.2
+ dbusmenu_menuitem_handle_event@Base 0.4.2
+ dbusmenu_menuitem_new@Base 0.4.2
+ dbusmenu_menuitem_new_with_id@Base 0.4.2
+ dbusmenu_menuitem_properties_copy@Base 0.4.2
+ dbusmenu_menuitem_properties_list@Base 0.4.2
+ dbusmenu_menuitem_properties_variant@Base 0.4.2
+ dbusmenu_menuitem_property_exist@Base 0.4.2
+ dbusmenu_menuitem_property_get@Base 0.4.2
+ dbusmenu_menuitem_property_get_bool@Base 0.4.2
+ dbusmenu_menuitem_property_get_int@Base 0.4.2
+ dbusmenu_menuitem_property_get_variant@Base 0.4.2
+ dbusmenu_menuitem_property_is_default@Base 0.4.2
+ dbusmenu_menuitem_property_remove@Base 0.4.2
+ dbusmenu_menuitem_property_set@Base 0.4.2
+ dbusmenu_menuitem_property_set_bool@Base 0.4.2
+ dbusmenu_menuitem_property_set_int@Base 0.4.2
+ dbusmenu_menuitem_property_set_variant@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_type@Base 0.4.2
+ dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
+ dbusmenu_menuitem_proxy_new@Base 0.4.2
+ dbusmenu_menuitem_realized@Base 0.4.2
+ dbusmenu_menuitem_send_about_to_show@Base 0.4.2
+ dbusmenu_menuitem_set_parent@Base 0.4.2
+ dbusmenu_menuitem_set_realized@Base 0.4.2
+ dbusmenu_menuitem_set_root@Base 0.4.2
+ dbusmenu_menuitem_show_to_user@Base 0.4.2
+ dbusmenu_menuitem_take_children@Base 0.4.2
+ dbusmenu_menuitem_unparent@Base 0.4.2
+ dbusmenu_server_get_icon_paths@Base 0.4.2
+ dbusmenu_server_get_status@Base 0.4.2
+ dbusmenu_server_get_text_direction@Base 0.4.2
+ dbusmenu_server_get_type@Base 0.4.2
+ dbusmenu_server_new@Base 0.4.2
+ dbusmenu_server_set_icon_paths@Base 0.4.2
+ dbusmenu_server_set_root@Base 0.4.2
+ dbusmenu_server_set_status@Base 0.4.2
+ dbusmenu_server_set_text_direction@Base 0.4.2
+ dbusmenu_status_get_nick@Base 0.4.2
+ dbusmenu_status_get_type@Base 0.4.2
+ dbusmenu_status_get_value_from_nick@Base 0.4.2
+ dbusmenu_text_direction_get_nick@Base 0.4.2
+ dbusmenu_text_direction_get_type@Base 0.4.2
+ dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
+ session_bus_cb@Base 0.4.2
+libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
+ dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
+libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER#
+ dbusmenu_json_build_from_file@Base 0.4.2
+ dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-jsonloader3.install b/debian/libdbusmenu-jsonloader3.install
deleted file mode 100644
index bff47f5..0000000
--- a/debian/libdbusmenu-jsonloader3.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install
new file mode 100644
index 0000000..bff47f5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
-- 
cgit v1.2.3


From 5e1cdbb204626572c4624420266bae4d85c4e027 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 20 Jun 2011 16:37:36 -0500
Subject: Hack for bzr-builddeb

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9f55fcc..9c11686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.90~pre1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.4-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Bumping library revision for ABI/API changes expected in this
-- 
cgit v1.2.3


From fef7512c7afa24a79fce499353aaf6700096caaa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 20 Jun 2011 16:49:16 -0500
Subject: debian/rules: Making GTK2 the special build

---
 debian/changelog |  3 ++-
 debian/rules     | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af5746b..3d1aa7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ libdbusmenu (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Memory leaks for GVariant usage (LP: #784890)
     * Making GTK 3 default build
     * Removing the SerializableMenuitem object
+  * debian/rules: Making GTK2 the special build 
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jun 2011 16:38:53 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jun 2011 16:49:03 -0500
 
 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
diff --git a/debian/rules b/debian/rules
index dd4f69c..2243a71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,32 +11,32 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3
-stamp-configure-gtk3:
-	: # configure for GTK+ 3.0
+configure/libdbusmenu-gtk4:: stamp-configure-gtk2
+stamp-configure-gtk2:
+	: # configure for GTK+ 2.0
 	set -e; \
-	rm -rf build-gtk3; \
-	mkdir build-gtk3; \
-	cd build-gtk3; \
-	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \
+	rm -rf build-gtk2; \
+	mkdir build-gtk2; \
+	cd build-gtk2; \
+	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \
 		$(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \
 		--enable-gtk-doc=no; \
 	cd ..;
-	touch stamp-configure-gtk3
+	touch stamp-configure-gtk2
 
-build/libdbusmenu-gtk3-3:: stamp-build-gtk3
-stamp-build-gtk3: stamp-configure-gtk3
-	: # build for GTK+ 3.0
-	$(MAKE) -C build-gtk3;
-	touch stamp-build-gtk3
+build/libdbusmenu-gtk4:: stamp-build-gtk2
+stamp-build-gtk2: stamp-configure-gtk2
+	: # build for GTK+ 2.0
+	$(MAKE) -C build-gtk2;
+	touch stamp-build-gtk2
 
-common-install-prehook-arch:: stamp-build-gtk3
-	: # install for GTK+ 3.0
-	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
+common-install-prehook-arch:: stamp-build-gtk2
+	: # install for GTK+ 2.0
+	$(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-predeb/gir%::
 	dh_girepository -p$(cdbs_curpkg)
 
 clean::
-	rm -f stamp-*-gtk3
-	rm -rf build-gtk3
+	rm -f stamp-*-gtk2
+	rm -rf build-gtk2
-- 
cgit v1.2.3


From b08640dfaa65d54ac758e14f103e92bdc20990e0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 20 Jun 2011 17:00:17 -0500
Subject: releasing version 0.4.90-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d1aa7e..fb49c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low
 
   * debian/control, debian/*: Renaming packages for library version
     bump from 3 to 4.
@@ -10,7 +10,7 @@ libdbusmenu (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Removing the SerializableMenuitem object
   * debian/rules: Making GTK2 the special build 
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jun 2011 16:49:03 -0500
+ -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jun 2011 17:00:12 -0500
 
 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
-- 
cgit v1.2.3


From 4a1791ecf45589924462e444a1a44a7770003c21 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 24 Jun 2011 15:58:51 -0400
Subject: releasing version 0.4.90-0ubuntu1

---
 debian/changelog                          |  19 +++-
 debian/control                            |   6 +-
 debian/gir1.2-dbusmenu-glib-0.4.install   |   2 +-
 debian/gir1.2-dbusmenu-gtk-0.4.install    |   2 +-
 debian/gir1.2-dbusmenu-gtk3-0.4.install   |   2 +-
 debian/libdbusmenu-glib-dev.install       |  12 +--
 debian/libdbusmenu-glib-doc.install       |   2 +-
 debian/libdbusmenu-glib4.install          |   2 +-
 debian/libdbusmenu-glib4.symbols          |  63 +------------
 debian/libdbusmenu-gtk-dev.install        |  12 +--
 debian/libdbusmenu-gtk-doc.install        |   2 +-
 debian/libdbusmenu-gtk3-3.symbols         | 141 ------------------------------
 debian/libdbusmenu-gtk3-4.install         |   2 +-
 debian/libdbusmenu-gtk3-4.symbols         |  25 ++++++
 debian/libdbusmenu-gtk3-dev.install       |  12 +--
 debian/libdbusmenu-gtk4.install           |   2 +-
 debian/libdbusmenu-gtk4.symbols           | 118 +------------------------
 debian/libdbusmenu-jsonloader-dev.install |   8 +-
 debian/libdbusmenu-jsonloader4.install    |   2 +-
 debian/libdbusmenu-jsonloader4.symbols    |   3 +
 debian/libdbusmenu-tools.install          |   6 +-
 debian/rules                              |  45 +++-------
 22 files changed, 99 insertions(+), 389 deletions(-)
 delete mode 100644 debian/libdbusmenu-gtk3-3.symbols
 create mode 100644 debian/libdbusmenu-gtk3-4.symbols
 create mode 100644 debian/libdbusmenu-jsonloader4.symbols

diff --git a/debian/changelog b/debian/changelog
index fb49c3a..27cf7ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low
+libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low
 
+  [ Ted Gould ]
   * debian/control, debian/*: Renaming packages for library version
     bump from 3 to 4.
   * New upstream release.
@@ -10,7 +11,21 @@ libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low
     * Removing the SerializableMenuitem object
   * debian/rules: Making GTK2 the special build 
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jun 2011 17:00:12 -0500
+  [ Ken VanDine ]
+  * +debian/libdbusmenu-jsonloader4.symbols
+  * debian/*.symbols
+    - Fixed sonames and removed all the duplicate symbols
+  * debian/*.install, debian/rules
+    - Use cdbs to do the dual builds for gtk2/gtk3
+  * debian/control
+    - Updated standards version to 3.9.2
+    - Set version on the json-glib build depends to >= 0.13.4
+    - Make gir1.2-dbusmenu-glib-0.4 break gir1.2-unity-3.0 and 
+      gir1.2-indicate-0.5 built against older versions of dbusmenu to 
+      prevent breakage in python apps that use gir loading multiple versions
+      of dbusmenu-glib
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 24 Jun 2011 14:55:59 -0400
 
 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index da0842d..85a8715 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5.0),
                gtk-doc-tools,
                libtool,
                intltool,
-               libjson-glib-dev,
+               libjson-glib-dev (>= 0.13.4),
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
                gir1.2-glib-2.0,
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 5.0),
                libx11-dev (>= 1.3), 
                dh-autoreconf,
                valac-0.12
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
@@ -108,6 +108,8 @@ Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-glib4 (= ${binary:Version}),
          ${gir:Depends}
+Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
+        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4)
 Description: typelib file for libdbusmenu-glib4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install
index 20751be..a9808fc 100644
--- a/debian/gir1.2-dbusmenu-glib-0.4.install
+++ b/debian/gir1.2-dbusmenu-glib-0.4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib
+debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install
index 16bad97..3493751 100644
--- a/debian/gir1.2-dbusmenu-gtk-0.4.install
+++ b/debian/gir1.2-dbusmenu-gtk-0.4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib
+debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install
index abf6fab..64a74b6 100644
--- a/debian/gir1.2-dbusmenu-gtk3-0.4.install
+++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib
+debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index f8e0345..197e9de 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc
-debian/tmp/usr/lib/libdbusmenu-glib.a
-debian/tmp/usr/lib/libdbusmenu-glib.so
-debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir
-debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi
+debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/
+debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/
+debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/
+debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/
+debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/
+debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/
diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install
index 2fde7f6..ec8274e 100644
--- a/debian/libdbusmenu-glib-doc.install
+++ b/debian/libdbusmenu-glib-doc.install
@@ -1 +1 @@
-debian/tmp//usr/share/gtk-doc/html/libdbusmenu-glib/*
+debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/
diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install
index acdbacf..a98765c 100644
--- a/debian/libdbusmenu-glib4.install
+++ b/debian/libdbusmenu-glib4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libdbusmenu-glib.so.*
+debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/
diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols
index 5cac25d..0e0dcb4 100644
--- a/debian/libdbusmenu-glib4.symbols
+++ b/debian/libdbusmenu-glib4.symbols
@@ -1,4 +1,4 @@
-libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER#
+libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER#
  dbus_menu_clean_xml@Base 0.4.2
  dbusmenu_client_add_type_handler@Base 0.4.2
  dbusmenu_client_add_type_handler_full@Base 0.4.2
@@ -78,64 +78,3 @@ libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER#
  dbusmenu_text_direction_get_type@Base 0.4.2
  dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
  session_bus_cb@Base 0.4.2
-libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER#
- dbusmenu_json_build_from_file@Base 0.4.2
- dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 0ce2419..2e5dc02 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc
-debian/tmp/usr/lib/libdbusmenu-gtk.a
-debian/tmp/usr/lib/libdbusmenu-gtk.so
-debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir
-debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi
+debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/
+debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/
+debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/
+debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/
+debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/
+debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/
diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install
index e349aaa..b7dae35 100644
--- a/debian/libdbusmenu-gtk-doc.install
+++ b/debian/libdbusmenu-gtk-doc.install
@@ -1 +1 @@
-debian/tmp//usr/share/gtk-doc/html/libdbusmenu-gtk/*
+debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/
diff --git a/debian/libdbusmenu-gtk3-3.symbols b/debian/libdbusmenu-gtk3-3.symbols
deleted file mode 100644
index 3e44390..0000000
--- a/debian/libdbusmenu-gtk3-3.symbols
+++ /dev/null
@@ -1,141 +0,0 @@
-libdbusmenu-glib.so.3 libdbusmenu-gtk3-3 #MINVER#
- dbus_menu_clean_xml@Base 0.4.2
- dbusmenu_client_add_type_handler@Base 0.4.2
- dbusmenu_client_add_type_handler_full@Base 0.4.2
- dbusmenu_client_get_icon_paths@Base 0.4.2
- dbusmenu_client_get_root@Base 0.4.2
- dbusmenu_client_get_status@Base 0.4.2
- dbusmenu_client_get_text_direction@Base 0.4.2
- dbusmenu_client_get_type@Base 0.4.2
- dbusmenu_client_menuitem_get_type@Base 0.4.2
- dbusmenu_client_menuitem_new@Base 0.4.2
- dbusmenu_client_new@Base 0.4.2
- dbusmenu_client_send_about_to_show@Base 0.4.2
- dbusmenu_client_send_event@Base 0.4.2
- dbusmenu_defaults_default_get@Base 0.4.2
- dbusmenu_defaults_default_get_type@Base 0.4.2
- dbusmenu_defaults_default_set@Base 0.4.2
- dbusmenu_defaults_get_type@Base 0.4.2
- dbusmenu_defaults_ref_default@Base 0.4.2
- dbusmenu_menuitem_build_variant@Base 0.4.2
- dbusmenu_menuitem_child_add_position@Base 0.4.2
- dbusmenu_menuitem_child_append@Base 0.4.2
- dbusmenu_menuitem_child_delete@Base 0.4.2
- dbusmenu_menuitem_child_find@Base 0.4.2
- dbusmenu_menuitem_child_prepend@Base 0.4.2
- dbusmenu_menuitem_child_reorder@Base 0.4.2
- dbusmenu_menuitem_exposed@Base 0.4.2
- dbusmenu_menuitem_find_id@Base 0.4.2
- dbusmenu_menuitem_foreach@Base 0.4.2
- dbusmenu_menuitem_get_children@Base 0.4.2
- dbusmenu_menuitem_get_id@Base 0.4.2
- dbusmenu_menuitem_get_parent@Base 0.4.2
- dbusmenu_menuitem_get_position@Base 0.4.2
- dbusmenu_menuitem_get_position_realized@Base 0.4.2
- dbusmenu_menuitem_get_root@Base 0.4.2
- dbusmenu_menuitem_get_type@Base 0.4.2
- dbusmenu_menuitem_handle_event@Base 0.4.2
- dbusmenu_menuitem_new@Base 0.4.2
- dbusmenu_menuitem_new_with_id@Base 0.4.2
- dbusmenu_menuitem_properties_copy@Base 0.4.2
- dbusmenu_menuitem_properties_list@Base 0.4.2
- dbusmenu_menuitem_properties_variant@Base 0.4.2
- dbusmenu_menuitem_property_exist@Base 0.4.2
- dbusmenu_menuitem_property_get@Base 0.4.2
- dbusmenu_menuitem_property_get_bool@Base 0.4.2
- dbusmenu_menuitem_property_get_int@Base 0.4.2
- dbusmenu_menuitem_property_get_variant@Base 0.4.2
- dbusmenu_menuitem_property_is_default@Base 0.4.2
- dbusmenu_menuitem_property_remove@Base 0.4.2
- dbusmenu_menuitem_property_set@Base 0.4.2
- dbusmenu_menuitem_property_set_bool@Base 0.4.2
- dbusmenu_menuitem_property_set_int@Base 0.4.2
- dbusmenu_menuitem_property_set_variant@Base 0.4.2
- dbusmenu_menuitem_proxy_get_type@Base 0.4.2
- dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
- dbusmenu_menuitem_proxy_new@Base 0.4.2
- dbusmenu_menuitem_realized@Base 0.4.2
- dbusmenu_menuitem_send_about_to_show@Base 0.4.2
- dbusmenu_menuitem_set_parent@Base 0.4.2
- dbusmenu_menuitem_set_realized@Base 0.4.2
- dbusmenu_menuitem_set_root@Base 0.4.2
- dbusmenu_menuitem_show_to_user@Base 0.4.2
- dbusmenu_menuitem_take_children@Base 0.4.2
- dbusmenu_menuitem_unparent@Base 0.4.2
- dbusmenu_server_get_icon_paths@Base 0.4.2
- dbusmenu_server_get_status@Base 0.4.2
- dbusmenu_server_get_text_direction@Base 0.4.2
- dbusmenu_server_get_type@Base 0.4.2
- dbusmenu_server_new@Base 0.4.2
- dbusmenu_server_set_icon_paths@Base 0.4.2
- dbusmenu_server_set_root@Base 0.4.2
- dbusmenu_server_set_status@Base 0.4.2
- dbusmenu_server_set_text_direction@Base 0.4.2
- dbusmenu_status_get_nick@Base 0.4.2
- dbusmenu_status_get_type@Base 0.4.2
- dbusmenu_status_get_value_from_nick@Base 0.4.2
- dbusmenu_text_direction_get_nick@Base 0.4.2
- dbusmenu_text_direction_get_type@Base 0.4.2
- dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
- session_bus_cb@Base 0.4.2
-libdbusmenu-gtk.so.3 libdbusmenu-gtk3-3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-gtk3.so.3 libdbusmenu-gtk3-3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3-3 #MINVER#
- dbusmenu_json_build_from_file@Base 0.4.2
- dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install
index af2e9a3..2bf1f59 100644
--- a/debian/libdbusmenu-gtk3-4.install
+++ b/debian/libdbusmenu-gtk3-4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libdbusmenu-gtk3.so.*
+debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/
diff --git a/debian/libdbusmenu-gtk3-4.symbols b/debian/libdbusmenu-gtk3-4.symbols
new file mode 100644
index 0000000..1988a84
--- /dev/null
+++ b/debian/libdbusmenu-gtk3-4.symbols
@@ -0,0 +1,25 @@
+libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-4 #MINVER#
+ dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
+ dbusmenu_gtk_parse_menu_structure@Base 0.4.2
+ dbusmenu_gtkclient_get_accel_group@Base 0.4.2
+ dbusmenu_gtkclient_get_type@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get@Base 0.4.2
+ dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
+ dbusmenu_gtkclient_new@Base 0.4.2
+ dbusmenu_gtkclient_newitem_base@Base 0.4.2
+ dbusmenu_gtkclient_set_accel_group@Base 0.4.2
+ dbusmenu_gtkmenu_get_client@Base 0.4.2
+ dbusmenu_gtkmenu_get_type@Base 0.4.2
+ dbusmenu_gtkmenu_new@Base 0.4.2
+ dbusmenu_menuitem_property_get_image@Base 0.4.2
+ dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_image@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
+ dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
+ genericmenuitem_get_image@Base 0.4.2
+ genericmenuitem_get_type@Base 0.4.2
+ genericmenuitem_set_check_type@Base 0.4.2
+ genericmenuitem_set_image@Base 0.4.2
+ genericmenuitem_set_state@Base 0.4.2
+ theme_dir_db@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index dcd24a3..6d3fa0b 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc
-debian/tmp/usr/lib/libdbusmenu-gtk3.a
-debian/tmp/usr/lib/libdbusmenu-gtk3.so
-debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir
-debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi
+debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/
+debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/
+debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/
+debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/
+debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/
+debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/
diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install
index d677935..2605240 100644
--- a/debian/libdbusmenu-gtk4.install
+++ b/debian/libdbusmenu-gtk4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libdbusmenu-gtk.so.*
+debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/
diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols
index fd2d6aa..a2bc347 100644
--- a/debian/libdbusmenu-gtk4.symbols
+++ b/debian/libdbusmenu-gtk4.symbols
@@ -1,90 +1,6 @@
-libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER#
- dbus_menu_clean_xml@Base 0.4.2
- dbusmenu_client_add_type_handler@Base 0.4.2
- dbusmenu_client_add_type_handler_full@Base 0.4.2
- dbusmenu_client_get_icon_paths@Base 0.4.2
- dbusmenu_client_get_root@Base 0.4.2
- dbusmenu_client_get_status@Base 0.4.2
- dbusmenu_client_get_text_direction@Base 0.4.2
- dbusmenu_client_get_type@Base 0.4.2
- dbusmenu_client_menuitem_get_type@Base 0.4.2
- dbusmenu_client_menuitem_new@Base 0.4.2
- dbusmenu_client_new@Base 0.4.2
- dbusmenu_client_send_about_to_show@Base 0.4.2
- dbusmenu_client_send_event@Base 0.4.2
- dbusmenu_defaults_default_get@Base 0.4.2
- dbusmenu_defaults_default_get_type@Base 0.4.2
- dbusmenu_defaults_default_set@Base 0.4.2
- dbusmenu_defaults_get_type@Base 0.4.2
- dbusmenu_defaults_ref_default@Base 0.4.2
- dbusmenu_menuitem_build_variant@Base 0.4.2
- dbusmenu_menuitem_child_add_position@Base 0.4.2
- dbusmenu_menuitem_child_append@Base 0.4.2
- dbusmenu_menuitem_child_delete@Base 0.4.2
- dbusmenu_menuitem_child_find@Base 0.4.2
- dbusmenu_menuitem_child_prepend@Base 0.4.2
- dbusmenu_menuitem_child_reorder@Base 0.4.2
- dbusmenu_menuitem_exposed@Base 0.4.2
- dbusmenu_menuitem_find_id@Base 0.4.2
- dbusmenu_menuitem_foreach@Base 0.4.2
- dbusmenu_menuitem_get_children@Base 0.4.2
- dbusmenu_menuitem_get_id@Base 0.4.2
- dbusmenu_menuitem_get_parent@Base 0.4.2
- dbusmenu_menuitem_get_position@Base 0.4.2
- dbusmenu_menuitem_get_position_realized@Base 0.4.2
- dbusmenu_menuitem_get_root@Base 0.4.2
- dbusmenu_menuitem_get_type@Base 0.4.2
- dbusmenu_menuitem_handle_event@Base 0.4.2
- dbusmenu_menuitem_new@Base 0.4.2
- dbusmenu_menuitem_new_with_id@Base 0.4.2
- dbusmenu_menuitem_properties_copy@Base 0.4.2
- dbusmenu_menuitem_properties_list@Base 0.4.2
- dbusmenu_menuitem_properties_variant@Base 0.4.2
- dbusmenu_menuitem_property_exist@Base 0.4.2
- dbusmenu_menuitem_property_get@Base 0.4.2
- dbusmenu_menuitem_property_get_bool@Base 0.4.2
- dbusmenu_menuitem_property_get_int@Base 0.4.2
- dbusmenu_menuitem_property_get_variant@Base 0.4.2
- dbusmenu_menuitem_property_is_default@Base 0.4.2
- dbusmenu_menuitem_property_remove@Base 0.4.2
- dbusmenu_menuitem_property_set@Base 0.4.2
- dbusmenu_menuitem_property_set_bool@Base 0.4.2
- dbusmenu_menuitem_property_set_int@Base 0.4.2
- dbusmenu_menuitem_property_set_variant@Base 0.4.2
- dbusmenu_menuitem_proxy_get_type@Base 0.4.2
- dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2
- dbusmenu_menuitem_proxy_new@Base 0.4.2
- dbusmenu_menuitem_realized@Base 0.4.2
- dbusmenu_menuitem_send_about_to_show@Base 0.4.2
- dbusmenu_menuitem_set_parent@Base 0.4.2
- dbusmenu_menuitem_set_realized@Base 0.4.2
- dbusmenu_menuitem_set_root@Base 0.4.2
- dbusmenu_menuitem_show_to_user@Base 0.4.2
- dbusmenu_menuitem_take_children@Base 0.4.2
- dbusmenu_menuitem_unparent@Base 0.4.2
- dbusmenu_server_get_icon_paths@Base 0.4.2
- dbusmenu_server_get_status@Base 0.4.2
- dbusmenu_server_get_text_direction@Base 0.4.2
- dbusmenu_server_get_type@Base 0.4.2
- dbusmenu_server_new@Base 0.4.2
- dbusmenu_server_set_icon_paths@Base 0.4.2
- dbusmenu_server_set_root@Base 0.4.2
- dbusmenu_server_set_status@Base 0.4.2
- dbusmenu_server_set_text_direction@Base 0.4.2
- dbusmenu_status_get_nick@Base 0.4.2
- dbusmenu_status_get_type@Base 0.4.2
- dbusmenu_status_get_value_from_nick@Base 0.4.2
- dbusmenu_text_direction_get_nick@Base 0.4.2
- dbusmenu_text_direction_get_type@Base 0.4.2
- dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
- session_bus_cb@Base 0.4.2
-libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER#
+libdbusmenu-gtk.so.4 libdbusmenu-gtk4 #MINVER#
  dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
  dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
  dbusmenu_gtkclient_get_accel_group@Base 0.4.2
  dbusmenu_gtkclient_get_type@Base 0.4.2
  dbusmenu_gtkclient_menuitem_get@Base 0.4.2
@@ -107,35 +23,3 @@ libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER#
  genericmenuitem_set_image@Base 0.4.2
  genericmenuitem_set_state@Base 0.4.2
  theme_dir_db@Base 0.4.2
-libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER#
- dbusmenu_gtk_parse_get_cached_item@Base 0.4.2
- dbusmenu_gtk_parse_menu_structure@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2
- dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2
- dbusmenu_gtkclient_get_accel_group@Base 0.4.2
- dbusmenu_gtkclient_get_type@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get@Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2
- dbusmenu_gtkclient_new@Base 0.4.2
- dbusmenu_gtkclient_newitem_base@Base 0.4.2
- dbusmenu_gtkclient_set_accel_group@Base 0.4.2
- dbusmenu_gtkmenu_get_client@Base 0.4.2
- dbusmenu_gtkmenu_get_type@Base 0.4.2
- dbusmenu_gtkmenu_new@Base 0.4.2
- dbusmenu_menuitem_property_get_image@Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_image@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2
- genericmenuitem_get_image@Base 0.4.2
- genericmenuitem_get_type@Base 0.4.2
- genericmenuitem_set_check_type@Base 0.4.2
- genericmenuitem_set_image@Base 0.4.2
- genericmenuitem_set_state@Base 0.4.2
- theme_dir_db@Base 0.4.2
-libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER#
- dbusmenu_json_build_from_file@Base 0.4.2
- dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
index 9594064..95902cd 100644
--- a/debian/libdbusmenu-jsonloader-dev.install
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc
-debian/tmp/usr/lib/libdbusmenu-jsonloader.a
-debian/tmp/usr/lib/libdbusmenu-jsonloader.so
+debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/
+debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/
+debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/
+debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/
diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install
index bff47f5..74f887b 100644
--- a/debian/libdbusmenu-jsonloader4.install
+++ b/debian/libdbusmenu-jsonloader4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
+debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/
diff --git a/debian/libdbusmenu-jsonloader4.symbols b/debian/libdbusmenu-jsonloader4.symbols
new file mode 100644
index 0000000..38a6868
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader4.symbols
@@ -0,0 +1,3 @@
+libdbusmenu-jsonloader.so.4 libdbusmenu-jsonloader4 #MINVER#
+ dbusmenu_json_build_from_file@Base 0.4.2
+ dbusmenu_json_build_from_node@Base 0.4.2
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
index 4bdf013..1019dd8 100644
--- a/debian/libdbusmenu-tools.install
+++ b/debian/libdbusmenu-tools.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libdbusmenu/dbusmenu-*
-debian/tmp/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
-debian/tmp/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
+debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/
+debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
+debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
diff --git a/debian/rules b/debian/rules
index 2243a71..d53875d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,25 @@
 #!/usr/bin/make -f
 
+DEB_BUILDDIR = build
+DEB_MAKE_FLAVORS = gtk2 gtk3
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_SRCDIR = .
-DEB_BUILDDIR = $(DEB_SRCDIR)/build
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
+DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
+
+DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
+DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
+
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-configure/libdbusmenu-gtk4:: stamp-configure-gtk2
-stamp-configure-gtk2:
-	: # configure for GTK+ 2.0
-	set -e; \
-	rm -rf build-gtk2; \
-	mkdir build-gtk2; \
-	cd build-gtk2; \
-	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \
-		$(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \
-		--enable-gtk-doc=no; \
-	cd ..;
-	touch stamp-configure-gtk2
-
-build/libdbusmenu-gtk4:: stamp-build-gtk2
-stamp-build-gtk2: stamp-configure-gtk2
-	: # build for GTK+ 2.0
-	$(MAKE) -C build-gtk2;
-	touch stamp-build-gtk2
-
-common-install-prehook-arch:: stamp-build-gtk2
-	: # install for GTK+ 2.0
-	$(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install
-
-binary-predeb/gir%::
-	dh_girepository -p$(cdbs_curpkg)
-
-clean::
-	rm -f stamp-*-gtk2
-	rm -rf build-gtk2
+debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
+debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
+
+common-install-arch::
+	find debian/tmp -name \*.la -delete
-- 
cgit v1.2.3


From 5c18b9297487c1c6098efbec2aae6ccca8c6a2d6 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 24 Jun 2011 16:17:22 -0400
Subject: releasing version 0.4.90-0ubuntu2

---
 debian/changelog | 8 ++++++++
 debian/control   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 27cf7ab..79bdc1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.4.90-0ubuntu2) oneiric; urgency=low
+
+  * debian/control
+    - Also a a breaks to libdbusmenu-glib4 for gir1.2-unity-3.0 and 
+      gir1.2-indicate-0.5 to make sure the library gets held back too.
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 24 Jun 2011 16:05:56 -0400
+
 libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low
 
   [ Ted Gould ]
diff --git a/debian/control b/debian/control
index 85a8715..8ea0aca 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,9 @@ Depends: ${shlibs:Depends},
          ${misc:Depends}
 Breaks: indicator-messages (<< 0.3.0),
         indicator-session (<< 0.2.0),
-        libdbusmenu-glib0
+        libdbusmenu-glib0,
+        gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
+        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4)
 Description: library for passing menus over DBus
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
-- 
cgit v1.2.3


From 823c6520143c987eb609371afb7b815b375027c4 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 28 Jun 2011 17:55:13 +0100
Subject: releasing version 0.4.90-0ubuntu3

---
 debian/changelog              |  7 +++++++
 debian/patches/lp799878.patch | 17 +++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 debian/patches/lp799878.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 79bdc1a..bfa403e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.4.90-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/lp799878.patch
+    - Fixed proxied menu events not getting returned (LP: #799878)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 28 Jun 2011 17:53:31 +0100
+
 libdbusmenu (0.4.90-0ubuntu2) oneiric; urgency=low
 
   * debian/control
diff --git a/debian/patches/lp799878.patch b/debian/patches/lp799878.patch
new file mode 100644
index 0000000..dff130a
--- /dev/null
+++ b/debian/patches/lp799878.patch
@@ -0,0 +1,17 @@
+=== modified file 'libdbusmenu-glib/server.c'
+--- old/libdbusmenu-glib/server.c	2011-06-17 03:42:29 +0000
++++ new/libdbusmenu-glib/server.c	2011-06-28 16:40:16 +0000
+@@ -976,10 +976,10 @@
+ 		gotsomething = TRUE;
+ 	} else {
+ 		GError * error = NULL;
+-		megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ia(s))"), "[ ]", NULL, NULL, &error);
++		megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ias)"), "[ ]", NULL, NULL, &error);
+ 
+ 		if (error != NULL) {
+-			g_warning("Unable to parse '[ ]' as a 'a(ia(s))': %s", error->message);
++			g_warning("Unable to parse '[ ]' as a 'a(ias)': %s", error->message);
+ 			g_error_free(error);
+ 		}
+ 	}
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..43b331a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp799878.patch
-- 
cgit v1.2.3


From 07ff9d838965d81d3f32151e96146d45912217fe Mon Sep 17 00:00:00 2001
From: Didier Roche <didier.roche@canonical.com>
Date: Mon, 25 Jul 2011 18:04:06 +0200
Subject: * debian/rules:   - avoid making indicator-appmenu* depends on gtk2/3
 by dpkg-shlibdeps.     The library doesn't hurt if gtk isn't installed and
 that enable     pre-installlation of the indicator stack without requiring
 the full gtk     stack being there without any gtk app installed.

---
 debian/changelog | 10 ++++++++++
 debian/rules     |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bfa403e..e49e0ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdbusmenu (0.4.90-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - avoid making indicator-appmenu* depends on gtk2/3 by dpkg-shlibdeps.
+      The library doesn't hurt if gtk isn't installed and that enable
+      pre-installlation of the indicator stack without requiring the full gtk
+      stack being there without any gtk app installed.
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 25 Jul 2011 18:03:50 +0200
+
 libdbusmenu (0.4.90-0ubuntu3) oneiric; urgency=low
 
   * debian/patches/lp799878.patch
diff --git a/debian/rules b/debian/rules
index d53875d..07f6d3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 
+DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0
+DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0
+
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
-- 
cgit v1.2.3


From cb4fecf5e6eec692069d4e2417f58a77d604887f Mon Sep 17 00:00:00 2001
From: Didier Roche <didier.roche@canonical.com>
Date: Mon, 25 Jul 2011 18:18:14 +0200
Subject: releasing version 0.4.90-0ubuntu4

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e49e0ed..7e3e034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.90-0ubuntu4) UNRELEASED; urgency=low
+libdbusmenu (0.4.90-0ubuntu4) oneiric; urgency=low
 
   * debian/rules:
     - avoid making indicator-appmenu* depends on gtk2/3 by dpkg-shlibdeps.
@@ -6,7 +6,7 @@ libdbusmenu (0.4.90-0ubuntu4) UNRELEASED; urgency=low
       pre-installlation of the indicator stack without requiring the full gtk
       stack being there without any gtk app installed.
 
- -- Didier Roche <didrocks@ubuntu.com>  Mon, 25 Jul 2011 18:03:50 +0200
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 25 Jul 2011 18:18:11 +0200
 
 libdbusmenu (0.4.90-0ubuntu3) oneiric; urgency=low
 
-- 
cgit v1.2.3


From 7ce6dd65fc01f9d02dedb8de39ac9fa438dd95d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 24 Aug 2011 16:15:34 -0500
Subject: * Removed debian/patches:   * All upstream

---
 debian/changelog              |  4 +++-
 debian/patches/lp799878.patch | 17 -----------------
 debian/patches/series         |  1 -
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 debian/patches/lp799878.patch
 delete mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index dec66c0..f606f44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ libdbusmenu (0.4.92-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * New upstream release (0.4.92).
     * Fix GTK 2 build for style properties
     * Fixed proxied menu events not getting returned (LP: #799878)
+  * Removed debian/patches:
+    * All upstream
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 24 Aug 2011 16:12:49 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 24 Aug 2011 16:15:16 -0500
 
 libdbusmenu (0.4.90-0ubuntu4) oneiric; urgency=low
 
diff --git a/debian/patches/lp799878.patch b/debian/patches/lp799878.patch
deleted file mode 100644
index dff130a..0000000
--- a/debian/patches/lp799878.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'libdbusmenu-glib/server.c'
---- old/libdbusmenu-glib/server.c	2011-06-17 03:42:29 +0000
-+++ new/libdbusmenu-glib/server.c	2011-06-28 16:40:16 +0000
-@@ -976,10 +976,10 @@
- 		gotsomething = TRUE;
- 	} else {
- 		GError * error = NULL;
--		megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ia(s))"), "[ ]", NULL, NULL, &error);
-+		megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ias)"), "[ ]", NULL, NULL, &error);
- 
- 		if (error != NULL) {
--			g_warning("Unable to parse '[ ]' as a 'a(ia(s))': %s", error->message);
-+			g_warning("Unable to parse '[ ]' as a 'a(ias)': %s", error->message);
- 			g_error_free(error);
- 		}
- 	}
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 43b331a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-lp799878.patch
-- 
cgit v1.2.3


From c2fe3f52956cf27d76cc7c6f1ca0e29937c66c82 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 24 Aug 2011 16:21:43 -0500
Subject: releasing version 0.4.92-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f606f44..8e6fdde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.92-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.92-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release (0.4.91).
     * Add in a property for setting the menuitem disposition
@@ -8,7 +8,7 @@ libdbusmenu (0.4.92-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * Removed debian/patches:
     * All upstream
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 24 Aug 2011 16:15:16 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 24 Aug 2011 16:21:39 -0500
 
 libdbusmenu (0.4.90-0ubuntu4) oneiric; urgency=low
 
-- 
cgit v1.2.3


From f1250889b4c57bcab07d7861fa680accdb016f52 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Aug 2011 21:18:30 -0400
Subject: releasing version 0.4.92-0ubuntu1

---
 debian/changelog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a7c24e..05c4558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-libdbusmenu (0.4.92-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.4.92-0ubuntu1) oneiric; urgency=low
 
   [ Ted Gould ]
-  * New upstream release (0.4.91).
-    * Add in a property for setting the menuitem disposition
   * New upstream release (0.4.92).
+    * Add in a property for setting the menuitem disposition
     * Fix GTK 2 build for style properties
     * Fixed proxied menu events not getting returned (LP: #799878)
   * Removed debian/patches:
-- 
cgit v1.2.3


From 6c86c699b9f523756a6d31cbb6afdc1c92c80c4c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 25 Aug 2011 09:50:23 -0500
Subject: releasing version 0.4.93-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4e540c..b45362f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.4.93-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.93-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release.
     * Fix packing of generic menu items to use toggle-spacing
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 25 Aug 2011 09:44:27 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Aug 2011 09:50:21 -0500
 
 libdbusmenu (0.4.92-0ubuntu1) oneiric; urgency=low
 
-- 
cgit v1.2.3


From 78dac37f516e78b8677b48484961f56035a5a8bb Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 25 Aug 2011 13:47:08 -0400
Subject: releasing version 0.4.93-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b45362f..8f44c01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.4.93-0ubuntu1~ppa1) oneiric; urgency=low
+libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
     * Fix packing of generic menu items to use toggle-spacing
-- 
cgit v1.2.3


From 0fca4c859e42bf3cafc6fa449dac3122996ed0c6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 14 Sep 2011 14:24:03 -0500
Subject: releasing version 0.4.93-0ubuntu2~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c35d99..820d6c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.4.93-0ubuntu2~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.93-0ubuntu2~ppa1) oneiric; urgency=low
 
   * Upstream Merge
     * Build fixes to allow more optional builds
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 14 Sep 2011 14:17:15 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Sep 2011 14:24:00 -0500
 
 libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low
 
-- 
cgit v1.2.3


From 70c33b0c4c7ce124ac203020f2f3b0a392727577 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 20 Sep 2011 00:08:23 -0500
Subject: releasing version 0.4.94-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 566030a..8e51968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.4.94-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.4.94-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release.
     ∘ Protect functions from NULL submenus (LP: #803667)
     ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761,
       LP: #713690, LP: #643871, LP: #713685)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Sep 2011 00:02:23 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Sep 2011 00:08:19 -0500
 
 libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low
 
-- 
cgit v1.2.3


From b9a57897d1b62553d16ae44fef08801bfb053360 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 20 Sep 2011 09:41:41 -0700
Subject: releasing version 0.4.94-0ubuntu1

---
 debian/changelog | 9 +++++++--
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e51968..52b1419 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
-libdbusmenu (0.4.94-0ubuntu1~ppa1) oneiric; urgency=low
+libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low
 
+  [ Ted Gould ]
   * New upstream release.
     ∘ Protect functions from NULL submenus (LP: #803667)
     ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761,
       LP: #713690, LP: #643871, LP: #713685)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 20 Sep 2011 00:08:19 -0500
+  [ Ken VanDine ]
+  * debian/control
+    - build dep on valac-0.14
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 20 Sep 2011 09:16:41 -0700
 
 libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index 8ea0aca..2555cd1 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.2-gtk-3.0,
                libx11-dev (>= 1.3), 
                dh-autoreconf,
-               valac-0.12
+               valac-0.14
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
-- 
cgit v1.2.3


From dfccdc31ad648bd5f7e93eca258d2b0e879a6b71 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 29 Sep 2011 14:46:59 -0500
Subject: releasing version 0.5.0-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ec30fc..1c485ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.5.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release.
     * Protect functions against NULL results (LP: #757569, LP: #742909,
       LP: #743050, LP: #743661)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 29 Sep 2011 14:40:18 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 29 Sep 2011 14:46:57 -0500
 
 libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low
 
-- 
cgit v1.2.3


From 3208f928ac6e0fe7737b9d559fc81ed21b0f12a5 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 29 Sep 2011 16:10:48 -0400
Subject: releasing version 0.5.0-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1c485ec..c6b1391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
+libdbusmenu (0.5.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
     * Protect functions against NULL results (LP: #757569, LP: #742909,
-- 
cgit v1.2.3


From 637751864362d6eb1a4d87ade00517e2bee24a94 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 30 Sep 2011 10:18:44 -0400
Subject: releasing version 0.5.0-0ubuntu2

---
 debian/changelog          | 8 ++++++++
 libdbusmenu-glib/client.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c6b1391..70d858f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low
+
+  * libdbusmenu-glib/client.c
+    - id of 0 in dbusmenu_client_send_about_to_show is valid, and used in 
+      appindicators like nm-applet (LP: #862989)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 30 Sep 2011 10:06:19 -0400
+
 libdbusmenu (0.5.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index a7f4da5..9129db5 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -1610,7 +1610,7 @@ void
 dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)
 {
 	g_return_if_fail(DBUSMENU_CLIENT(client));
-	g_return_if_fail(id > 0);
+	g_return_if_fail(id >= 0);
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 	g_return_if_fail(priv != NULL);
-- 
cgit v1.2.3


From 4f6868d416c479a29afe1b1b3168f3d96fbdcc64 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 13 Oct 2011 11:31:19 -0500
Subject: releasing version 0.5.1-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b639ca..a274ee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.1-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release.
     * Allow for an ID of 0 in about_to_show for indicators (LP: #862989)
@@ -6,7 +6,7 @@ libdbusmenu (0.5.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Ensure we drop all references to the GTK widget when a menuitem
       gets destroyed (LP: #835646)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 13 Oct 2011 11:23:14 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 13 Oct 2011 11:31:15 -0500
 
 libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low
 
-- 
cgit v1.2.3


From 05e8092e6098a50e4281103fc28e2acece4114ce Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 13 Oct 2011 14:17:38 -0400
Subject: releasing version 0.5.0-0ubuntu3

---
 debian/changelog                  | 12 ++++++++++++
 libdbusmenu-gtk/client.c          | 18 +++++++++++++-----
 libdbusmenu-gtk/genericmenuitem.c |  1 +
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70d858f..b270830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low
+
+  * libdbusmenu-gtk/client.c:
+    - Make sure to actually free memory associated with GtkMenuItems we
+      create.  We are holding the sunk floating ref, so we have to
+      actually unref as well as destroy the widget.  Part of bug 835646.
+  * libdbusmenu-gtk/genericmenuitem.c:
+    - When setting an image on a menu item for the second time before
+      setting a label, don't try to use free'd memory. 
+
+ -- Michael Terry <mterry@ubuntu.com>  Thu, 06 Oct 2011 10:35:21 -0400
+
 libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low
 
   * libdbusmenu-glib/client.c
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 1051f20..38b6a75 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -823,14 +823,22 @@ item_activate (DbusmenuClient * client, DbusmenuMenuitem * mi, guint timestamp,
 	return;
 }
 
-#ifdef MASSIVEDEBUGGING
 static void
-destroy_gmi (GtkMenuItem * gmi, DbusmenuMenuitem * mi)
+destroy_gmi (GtkMenuItem * gmi)
 {
-	g_debug("Destorying GTK Menuitem for %d", dbusmenu_menuitem_get_id(mi));
+#ifdef MASSIVEDEBUGGING
+	g_debug("Destroying GTK Menuitem %d", gmi);
+#endif
+
+	/* Call gtk_widget_destroy to remove from any containers and cleanup */
+	gtk_widget_destroy(GTK_WIDGET(gmi));
+
+	/* Now remove last ref that we are holding (due to g_object_ref_sink in
+	   dbusmenu_gtkclient_newitem_base).  This should finalize the object */
+	g_object_unref(G_OBJECT(gmi));
+
 	return;
 }
-#endif
 
 /**
  * dbusmenu_gtkclient_newitem_base:
@@ -857,7 +865,7 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem *
 
 	/* Attach these two */
 	g_object_ref_sink(G_OBJECT(gmi));
-	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)gtk_widget_destroy);
+	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)destroy_gmi);
 
 	/* DbusmenuMenuitem signals */
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 5488f93..ef77a2e 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -449,6 +449,7 @@ genericmenuitem_set_image (Genericmenuitem * menu_item, GtkWidget * image)
 		if (GTK_IS_IMAGE(child)) {
 			/* We've got a label, let's update it. */
 			imagew = GTK_IMAGE(child);
+			child = NULL;
 		} else if (GTK_IS_BOX(child)) {
 			/* Look for the label in the box */
 			gtk_container_foreach(GTK_CONTAINER(child), set_image_helper, &imagew);
-- 
cgit v1.2.3


From 74aaf2261edeb98ac895636ee11ef8a7f4ed23e6 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 28 Oct 2011 09:25:56 -0400
Subject: releasing version 0.5.0-1ubuntu1

---
 debian/changelog                          | 52 +++++++++++++++++++++++++++++++
 debian/compat                             |  1 +
 debian/control                            | 25 +++++++++++----
 debian/gir1.2-dbusmenu-glib-0.4.install   |  2 +-
 debian/gir1.2-dbusmenu-gtk-0.4.install    |  2 +-
 debian/gir1.2-dbusmenu-gtk3-0.4.install   |  2 +-
 debian/libdbusmenu-glib-dev.install       | 12 +++----
 debian/libdbusmenu-glib-doc.install       |  2 +-
 debian/libdbusmenu-glib4.install          |  2 +-
 debian/libdbusmenu-gtk-dev.install        | 12 +++----
 debian/libdbusmenu-gtk-doc.install        |  2 +-
 debian/libdbusmenu-gtk3-4.install         |  2 +-
 debian/libdbusmenu-gtk3-dev.install       | 12 +++----
 debian/libdbusmenu-gtk4.install           |  2 +-
 debian/libdbusmenu-jsonloader-dev.install |  8 ++---
 debian/libdbusmenu-jsonloader4.install    |  2 +-
 debian/libdbusmenu-tools.install          |  6 ++--
 debian/rules                              | 20 ++++++++++--
 18 files changed, 124 insertions(+), 42 deletions(-)
 create mode 100644 debian/compat

diff --git a/debian/changelog b/debian/changelog
index b270830..8c48a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low
+
+  * Multiarch conversion (partial, gobject instrospection not touched)
+    (LP: #859512)
+
+ -- Riku Voipio <riku.voipio@linaro.org>  Mon, 26 Sep 2011 12:13:07 +0300
+
+libdbusmenu (0.5.0-1) experimental; urgency=low
+
+  * Merge from Ubuntu.
+    + Re-enable GTK3 packages.
+  * Re-order includes in debian/rules to prevent lintian's
+    E: libdbusmenu source: temporary-debhelper-file
+
+ -- Evgeni Golov <evgeni@debian.org>  Sat, 15 Oct 2011 09:29:54 +0200
+
 libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low
 
   * libdbusmenu-gtk/client.c:
@@ -131,6 +147,15 @@ libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 25 Apr 2011 15:19:25 -0500
 
+libdbusmenu (0.4.3-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+  * Do not build-depend on gir-repository-dev, libgtk2.0-dev 
+    has Gtk-2.0.gir since 2.24.4-1 (bump B-D accordingly).
+  * Standards-Version: 3.9.2
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 27 Apr 2011 14:00:04 +0200
+
 libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low
 
   * Backport bug fixes from trunk:
@@ -171,6 +196,12 @@ libdbusmenu (0.4.3-0ubuntu1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 14 Apr 2011 16:49:13 -0500
 
+libdbusmenu (0.4.2-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Mon, 11 Apr 2011 12:43:49 +0200
+
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
   * Merged fix, guard against an activation that does not actually have 
@@ -208,6 +239,27 @@ libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 31 Mar 2011 13:56:54 -0500
 
+libdbusmenu (0.4.0-2) unstable; urgency=low
+
+  * Build-depend on gir1.2-atk-1.0, it's not pulled in by gir1.2-gtk-2.0
+    on ia64, mipsel and sparc64, causing FTBFS there.
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 30 Mar 2011 10:16:59 +0200
+
+libdbusmenu (0.4.0-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+    This builds with gir-1.2 and thus closes: #614490.
+    Also builds fine with --as-needed, closes: #615741.
+  * Disable GTK3 packages for now.
+  * Fix DEB_DH_MAKESHLIBS_ARGS_* for the latest SONAME bump.
+  * Also fix cdbs targets for it.
+  * Use valac-0.10, valac-0.12 is only in experimental.
+  * Add gir-repository-dev back to Build-Depends,
+    it still has Gtk-2.0.gir on Debian.
+
+ -- Evgeni Golov <evgeni@debian.org>  Fri, 25 Mar 2011 15:55:16 +0100
+
 libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low
 
   * Cherry picked fix for potential memory issues to fix unity-panel-service
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
index 2555cd1..a7ff43d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: libdbusmenu
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>
-Build-Depends: debhelper (>= 5.0),
-               cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 8.1.3),
+               cdbs (>= 0.4.93),
                quilt,
-               libgtk2.0-dev (>= 2.23.2-0ubuntu2),
+               libgtk2.0-dev (>= 2.24.4-1~),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
@@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0),
                valac-0.14
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian
+Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian
 
 Package: libdbusmenu-glib4
 Section: libs
@@ -39,6 +39,8 @@ Breaks: indicator-messages (<< 0.3.0),
         libdbusmenu-glib0,
         gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
         gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -54,6 +56,7 @@ Depends: ${shlibs:Depends},
          libdbusmenu-glib4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
+Multi-Arch: same
 Description: library for passing menus over DBus - development files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -66,6 +69,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -82,6 +87,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -96,6 +102,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
          libdbusmenu-glib4 (= ${binary:Version})
+Multi-Arch: foreign
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -161,6 +168,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus - Test lib
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -178,6 +187,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (= ${binary:Version}),
          libjson-glib-dev
+Multi-Arch: same
 Description: library for passing menus over DBus - Test lib development files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -191,6 +201,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -207,6 +219,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk-3-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install
index a9808fc..da62142 100644
--- a/debian/gir1.2-dbusmenu-glib-0.4.install
+++ b/debian/gir1.2-dbusmenu-glib-0.4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install
index 3493751..1a62fd5 100644
--- a/debian/gir1.2-dbusmenu-gtk-0.4.install
+++ b/debian/gir1.2-dbusmenu-gtk-0.4.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install
index 64a74b6..4c56230 100644
--- a/debian/gir1.2-dbusmenu-gtk3-0.4.install
+++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 197e9de..fc7079c 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/
-debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/
-debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/
+usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc
+usr/lib/*/libdbusmenu-glib.a
+usr/lib/*/libdbusmenu-glib.so
+usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/
+usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/
diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install
index ec8274e..5d99d73 100644
--- a/debian/libdbusmenu-glib-doc.install
+++ b/debian/libdbusmenu-glib-doc.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/
+usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/
diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install
index a98765c..4c05f07 100644
--- a/debian/libdbusmenu-glib4.install
+++ b/debian/libdbusmenu-glib4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/
+usr/lib/*/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 2e5dc02..ab8e8a9 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/
-debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/
-debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/
-debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/
+usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc
+usr/lib/*/libdbusmenu-gtk.a
+usr/lib/*/libdbusmenu-gtk.so
+usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/
+usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/
diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install
index b7dae35..664f00c 100644
--- a/debian/libdbusmenu-gtk-doc.install
+++ b/debian/libdbusmenu-gtk-doc.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/
+usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/
diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install
index 2bf1f59..a425da7 100644
--- a/debian/libdbusmenu-gtk3-4.install
+++ b/debian/libdbusmenu-gtk3-4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/
+usr/lib/*/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index 6d3fa0b..56f8fba 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/
-debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/
-debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/
+usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc
+usr/lib/*/libdbusmenu-gtk3.a
+usr/lib/*/libdbusmenu-gtk3.so
+usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/
+usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/
diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install
index 2605240..546d698 100644
--- a/debian/libdbusmenu-gtk4.install
+++ b/debian/libdbusmenu-gtk4.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/
+usr/lib/*/libdbusmenu-gtk.so.*
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
index 95902cd..ebbb5ea 100644
--- a/debian/libdbusmenu-jsonloader-dev.install
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/
+usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc
+usr/lib/*/libdbusmenu-jsonloader.a
+usr/lib/*/libdbusmenu-jsonloader.so
diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install
index 74f887b..67976fd 100644
--- a/debian/libdbusmenu-jsonloader4.install
+++ b/debian/libdbusmenu-jsonloader4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/
+usr/lib/*/libdbusmenu-jsonloader.so.*
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
index 1019dd8..1a79739 100644
--- a/debian/libdbusmenu-tools.install
+++ b/debian/libdbusmenu-tools.install
@@ -1,3 +1,3 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/
-debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
-debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
+usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/
+usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
+usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
diff --git a/debian/rules b/debian/rules
index 07f6d3a..8eeb376 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,34 @@
 DEB_BUILDDIR = build
 DEB_MAKE_FLAVORS = gtk2 gtk3
 
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
 DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
 
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2
+DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2
+
+DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3
+
 DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0
 DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0
-- 
cgit v1.2.3


From 933e39cc70a28ca07b195064a1cd40bd4a755375 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Tue, 31 Jan 2012 10:58:15 -0500
Subject: * debian/control   - build depend on libatk1.0-dev *
 debian/*-dev.install   - fixed paths for installed headers *
 debian/libdbusmenu-glib4.symbols   - added new symbols

---
 debian/changelog                          | 13 +++++++++++--
 debian/control                            |  1 +
 debian/libdbusmenu-glib-dev.install       |  6 +++---
 debian/libdbusmenu-glib4.symbols          |  2 ++
 debian/libdbusmenu-gtk-dev.install        |  6 +++---
 debian/libdbusmenu-gtk3-dev.install       |  6 +++---
 debian/libdbusmenu-jsonloader-dev.install |  2 +-
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0732a6d..4df92b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.90-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Ted Gould ]
   * New upstream release.
     * Add property for accessible descriptions
     * Use insert/remove signals on GTK3 build
@@ -8,7 +9,15 @@ libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Don't get objects from boolean values (LP: #870742)
     * Fix depreactions on GTK3 (LP: #917115)
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 30 Jan 2012 23:21:31 -0600
+  [ Ken VanDine ]
+  * debian/control
+    - build depend on libatk1.0-dev
+  * debian/*-dev.install
+    - fixed paths for installed headers
+  * debian/libdbusmenu-glib4.symbols
+    - added new symbols
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 31 Jan 2012 10:07:36 -0500
 
 libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low
 
diff --git a/debian/control b/debian/control
index a7ff43d..ba4e3a1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 8.1.3),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
+               libatk1.0-dev,
                gnome-doc-utils,
                gtk-doc-tools,
                libtool,
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index fc7079c..bc5b5b1 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -1,6 +1,6 @@
-usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/
+usr/include/libdbusmenu-glib-0.4/libdbusmenu-glib
 usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc
 usr/lib/*/libdbusmenu-glib.a
 usr/lib/*/libdbusmenu-glib.so
-usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/
-usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/
+usr/share/gir-1.0/Dbusmenu-0.4.gir
+usr/share/vala/vapi/Dbusmenu-0.4.vapi
diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols
index 0e0dcb4..a9ffaff 100644
--- a/debian/libdbusmenu-glib4.symbols
+++ b/debian/libdbusmenu-glib4.symbols
@@ -43,12 +43,14 @@ libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER#
  dbusmenu_menuitem_property_exist@Base 0.4.2
  dbusmenu_menuitem_property_get@Base 0.4.2
  dbusmenu_menuitem_property_get_bool@Base 0.4.2
+ dbusmenu_menuitem_property_get_byte_array@Base 0.5.90
  dbusmenu_menuitem_property_get_int@Base 0.4.2
  dbusmenu_menuitem_property_get_variant@Base 0.4.2
  dbusmenu_menuitem_property_is_default@Base 0.4.2
  dbusmenu_menuitem_property_remove@Base 0.4.2
  dbusmenu_menuitem_property_set@Base 0.4.2
  dbusmenu_menuitem_property_set_bool@Base 0.4.2
+ dbusmenu_menuitem_property_set_byte_array@Base 0.5.90
  dbusmenu_menuitem_property_set_int@Base 0.4.2
  dbusmenu_menuitem_property_set_variant@Base 0.4.2
  dbusmenu_menuitem_proxy_get_type@Base 0.4.2
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index ab8e8a9..a17a99f 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -1,6 +1,6 @@
-usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/
+usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk
 usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc
 usr/lib/*/libdbusmenu-gtk.a
 usr/lib/*/libdbusmenu-gtk.so
-usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/
-usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/
+usr/share/gir-1.0/DbusmenuGtk-0.4.gir
+usr/share/vala/vapi/DbusmenuGtk-0.4.vapi
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index 56f8fba..782f5c8 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,6 +1,6 @@
-usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/
+usr/include/libdbusmenu-gtk3-0.4/libdbusmenu-gtk
 usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc
 usr/lib/*/libdbusmenu-gtk3.a
 usr/lib/*/libdbusmenu-gtk3.so
-usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/
-usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/
+usr/share/gir-1.0/DbusmenuGtk3-0.4.gir
+usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
index ebbb5ea..1554085 100644
--- a/debian/libdbusmenu-jsonloader-dev.install
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -1,4 +1,4 @@
-usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/
+usr/include/libdbusmenu-glib-0.4/libdbusmenu-jsonloader
 usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc
 usr/lib/*/libdbusmenu-jsonloader.a
 usr/lib/*/libdbusmenu-jsonloader.so
-- 
cgit v1.2.3


From 6a8aebeff822b0e5c9544a3871ba52a47e7f8fa0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 31 Jan 2012 20:54:16 -0600
Subject: Back to PPA version

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4df92b6..7e9ec66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.90-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
   [ Ted Gould ]
   * New upstream release.
@@ -17,7 +17,7 @@ libdbusmenu (0.5.90-0ubuntu1) UNRELEASED; urgency=low
   * debian/libdbusmenu-glib4.symbols
     - added new symbols
 
- -- Ken VanDine <ken.vandine@canonical.com>  Tue, 31 Jan 2012 10:07:36 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 31 Jan 2012 20:53:55 -0600
 
 libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From f4bedb9ad92e6641ae559d881a2d3ab7203fa4ef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 31 Jan 2012 21:02:35 -0600
Subject: releasing version 0.5.90-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e9ec66..41518e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.90-0ubuntu1~ppa1) precise; urgency=low
 
   [ Ted Gould ]
   * New upstream release.
@@ -17,7 +17,7 @@ libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/libdbusmenu-glib4.symbols
     - added new symbols
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 31 Jan 2012 20:53:55 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 31 Jan 2012 21:02:32 -0600
 
 libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From ba23a1f5d6bed315132fb45ff7a63384e2da4e42 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 2 Feb 2012 14:10:02 -0500
Subject: releasing version 0.5.90-0ubuntu1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4df92b6..4fb0dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.90-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.5.90-0ubuntu1) precise; urgency=low
 
   [ Ted Gould ]
   * New upstream release.
@@ -17,7 +17,7 @@ libdbusmenu (0.5.90-0ubuntu1) UNRELEASED; urgency=low
   * debian/libdbusmenu-glib4.symbols
     - added new symbols
 
- -- Ken VanDine <ken.vandine@canonical.com>  Tue, 31 Jan 2012 10:07:36 -0500
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 02 Feb 2012 14:09:24 -0500
 
 libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From 49e45c8b23af0926ec04c50a4ac53068abba21db Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 15 Feb 2012 11:43:42 -0600
Subject: releasing version 0.5.91-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7425898..ffc6e0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.91-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.91-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Remove unused const on GStrv's
@@ -12,7 +12,7 @@ libdbusmenu (0.5.91-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Don't pass NULL to ATK
     * Non-srcdir build fixes
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 15 Feb 2012 11:33:35 -0600
+ -- Ted Gould <ted@ubuntu.com>  Wed, 15 Feb 2012 11:43:39 -0600
 
 libdbusmenu (0.5.90-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From 6ef8c71720c970c248a6f876299f41a6587fa5b9 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 15 Feb 2012 21:38:40 +0100
Subject: releasing version 0.5.91-0ubuntu1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6955501..8b6635e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.91-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.5.91-0ubuntu1) precise; urgency=low
 
   * debian/control:
     - drop git binaries, the libdev depends on it
@@ -18,7 +18,7 @@ libdbusmenu (0.5.91-0ubuntu1) UNRELEASED; urgency=low
     * Don't pass NULL to ATK
     * Non-srcdir build fixes
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 15 Feb 2012 21:35:12 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 15 Feb 2012 21:38:35 +0100
 
 libdbusmenu (0.5.90-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From 3c72518d5dca5c9f330d730d870504e67943d42b Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 15 Feb 2012 21:59:50 +0100
Subject: debian/control: restore gtk2 gir depends until that source is updated

---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8b6635e..133853a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.5.91-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control: restore gtk2 gir depends until that source is updated
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 15 Feb 2012 21:59:26 +0100
+
 libdbusmenu (0.5.91-0ubuntu1) precise; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index d10d7dd..a14bc40 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 8.1.3),
                intltool,
                libjson-glib-dev (>= 0.13.4),
                gobject-introspection,
+               gir1.2-gtk-2.0,
                libgirepository1.0-dev (>= 0.9.3),
                libx11-dev (>= 1.3), 
                dh-autoreconf,
-- 
cgit v1.2.3


From 5d1c17d52b13108c88038483812ebc6a438ce49a Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 15 Feb 2012 22:00:09 +0100
Subject: releasing version 0.5.91-0ubuntu2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 133853a..762b44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.5.91-0ubuntu2) UNRELEASED; urgency=low
+libdbusmenu (0.5.91-0ubuntu2) precise; urgency=low
 
   * debian/control: restore gtk2 gir depends until that source is updated
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 15 Feb 2012 21:59:26 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 15 Feb 2012 22:00:04 +0100
 
 libdbusmenu (0.5.91-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From 66c91f88c9f7473025c0c5f9e83c582e79ff2dcc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 23 Feb 2012 00:10:10 -0600
Subject: releasing version 0.5.92-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75ed4dc..4ea80c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.5.92-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.92-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Fix label leak and make it not have disposition (LP: #937829)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 23 Feb 2012 00:01:52 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 23 Feb 2012 00:10:04 -0600
 
 libdbusmenu (0.5.91-0ubuntu1~ppa1) precise; urgency=low
 
-- 
cgit v1.2.3


From 77d28d4bba23bd23214cc0c5741a3a5dbcb19aee Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 8 Mar 2012 10:08:14 -0600
Subject: releasing version 0.5.93-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d99357..660b0e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.5.93-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.93-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Setting the ATK Role on menu items (LP: #878708)
     * Cleaning up code paths to avoid goto's (LP: #940651)
     * Fixing setting an icon multiple times (LP: #934574)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 08 Mar 2012 09:58:26 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 08 Mar 2012 10:08:10 -0600
 
 libdbusmenu (0.5.92-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From 0d47f67f4fae4c53730f22a849f7a90e6eb5fd5e Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Fri, 9 Mar 2012 13:03:10 +0100
Subject: releasing version 0.5.93-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aebbc7e..79f4f9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.93-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.5.93-0ubuntu1) precise; urgency=low
 
   * New upstream release.
     * Setting the ATK Role on menu items (LP: #878708)
-- 
cgit v1.2.3


From 3da0c4f13a47da5cb9378fb14a72961decb6a9e0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 9 Mar 2012 14:35:42 -0600
Subject: releasing version 0.5.94-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aad765a..57e1814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdbusmenu (0.5.94-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.94-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Fixing setting name of ATK objects
     * Cleaning up a warning on shutdown (LP: #950762)
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 09 Mar 2012 14:21:09 -0600
+ -- Ted Gould <ted@ubuntu.com>  Fri, 09 Mar 2012 14:35:38 -0600
 
 libdbusmenu (0.5.93-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From 5995e81c8b6f794c22a6d1b3cf2a061868307de4 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Mon, 12 Mar 2012 10:07:56 -0400
Subject: releasing version 0.5.94-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 57e1814..3ddfe3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.94-0ubuntu1~ppa1) precise; urgency=low
+libdbusmenu (0.5.94-0ubuntu1) precise; urgency=low
 
   * New upstream release.
     * Fixing setting name of ATK objects
-- 
cgit v1.2.3


From 268ede0deda25d0d868abee3cce4b0f9e15eb9aa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 21 Mar 2012 14:33:34 -0500
Subject: releasing version 0.5.95-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5dc94b..a10f755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.5.95-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.95-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Fix theme change bug (LP: #953509)
     * Don't request event responses if no one is listening
     * Fix a warning on custom menu items without labels
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 21 Mar 2012 14:25:58 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 21 Mar 2012 14:33:32 -0500
 
 libdbusmenu (0.5.94-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From f6700613c6b065885a8184a0795fbf8f00632774 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 21 Mar 2012 16:35:42 -0400
Subject: releasing version 0.5.95-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a10f755..0274781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.95-0ubuntu1~ppa1) precise; urgency=low
+libdbusmenu (0.5.95-0ubuntu1) precise; urgency=low
 
   * New upstream release.
     * Fix theme change bug (LP: #953509)
-- 
cgit v1.2.3


From 86a192f69a22c48c5aa3965310be3b04f1f3e379 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 29 Mar 2012 11:39:08 -0700
Subject: releasing version 0.5.96-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9371a9b..68279f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.96-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.96-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Faster menuitem lookups (LP: #801699)
@@ -6,7 +6,7 @@ libdbusmenu (0.5.96-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Added support for callgrind-based benchmarks
     * Minor code cleanup
 
- -- Charles Kerr <charles.kerr@canonical.com>  Thu, 29 Mar 2012 11:33:30 -0700
+ -- Charles Kerr <charles.kerr@canonical.com>  Thu, 29 Mar 2012 11:38:40 -0700
 
 libdbusmenu (0.5.95-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From 24c6a1293c2333ea523740bba8cc02a6d941bfad Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 29 Mar 2012 16:35:34 -0400
Subject: releasing version 0.5.96-0ubuntu1

---
 debian/changelog | 12 +++++++++---
 debian/control   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68279f0..45bb33f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
-libdbusmenu (0.5.96-0ubuntu1~ppa1) precise; urgency=low
+libdbusmenu (0.5.96-0ubuntu1) precise; urgency=low
 
+  [ Charles Kerr ]
   * New upstream release.
     * Faster menuitem lookups (LP: #801699)
-    * To reduce dbus traffic, only send event replies when the caller requests them
+    * To reduce dbus traffic, only send event replies when the caller 
+      requests them
     * Added support for callgrind-based benchmarks
     * Minor code cleanup
 
- -- Charles Kerr <charles.kerr@canonical.com>  Thu, 29 Mar 2012 11:38:40 -0700
+  [ Ken VanDine ]
+  * debian/control
+    - added build depends on valgrind
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 29 Mar 2012 16:35:00 -0400
 
 libdbusmenu (0.5.95-0ubuntu1) precise; urgency=low
 
diff --git a/debian/control b/debian/control
index a14bc40..49438f9 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 8.1.3),
                libgirepository1.0-dev (>= 0.9.3),
                libx11-dev (>= 1.3), 
                dh-autoreconf,
+               valgrind,
                valac-0.16
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
-- 
cgit v1.2.3


From 2affd0019ae4a2c1d02a87d0e20f032ebd0e8e25 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 4 Apr 2012 15:10:02 -0500
Subject: releasing version 0.5.97-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a642036..5c3b23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdbusmenu (0.5.97-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.97-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Reduce the number of messages hud-service sends. (LP: #957022)
     * Fix valgrind tests thanks to a little help from sewardj.
     * Add gcov targets to autotools build for code-coverage reporting.
 
- -- Charles Kerr <charles.kerr@canonical.com>  Wed, 04 Apr 2012 15:03:49 -0500
+ -- Charles Kerr <charles.kerr@canonical.com>  Wed, 04 Apr 2012 15:09:47 -0500
 
 libdbusmenu (0.5.96-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From 104cea37981c7b2e1dc795859d8f2a2085c2a1e4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 5 Apr 2012 14:17:11 -0500
Subject: remove accidentally-public function session_bus_cb() from our symbols
 list

---
 debian/libdbusmenu-glib4.symbols | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols
index a9ffaff..0004172 100644
--- a/debian/libdbusmenu-glib4.symbols
+++ b/debian/libdbusmenu-glib4.symbols
@@ -79,4 +79,3 @@ libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER#
  dbusmenu_text_direction_get_nick@Base 0.4.2
  dbusmenu_text_direction_get_type@Base 0.4.2
  dbusmenu_text_direction_get_value_from_nick@Base 0.4.2
- session_bus_cb@Base 0.4.2
-- 
cgit v1.2.3


From 054d74ead5f54891fd57bf87144554359d367e35 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 5 Apr 2012 14:22:43 -0500
Subject: releasing version 0.5.99-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 864adb3..c957d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdbusmenu (0.5.99-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.5.99-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Make private two impl functions that were accidentally public
 
- -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 14:08:18 -0500
+ -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 14:22:33 -0500
 
 libdbusmenu (0.5.98-0ubuntu1~ppa1) precise; urgency=low
 
-- 
cgit v1.2.3


From cc39a2e538deda02a60e9e6752de774c8d6b96c0 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 5 Apr 2012 15:52:09 -0400
Subject: releasing version 0.5.99-0ubuntu1

---
 debian/changelog | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c957d41..7dfc3d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,12 @@
-libdbusmenu (0.5.99-0ubuntu1~ppa1) precise; urgency=low
-
-  * New upstream release.
-    * Make private two impl functions that were accidentally public
-
- -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 14:22:33 -0500
-
-libdbusmenu (0.5.98-0ubuntu1~ppa1) precise; urgency=low
-
-  * New upstream release.
-    * Fix a regresssion introduced in 0.5.97's fix for (LP: #957022)
-
- -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 10:53:15 -0500
-
-libdbusmenu (0.5.97-0ubuntu1~ppa1) precise; urgency=low
+libdbusmenu (0.5.99-0ubuntu1) precise; urgency=low
 
   * New upstream release.
     * Reduce the number of messages hud-service sends. (LP: #957022)
     * Fix valgrind tests thanks to a little help from sewardj.
     * Add gcov targets to autotools build for code-coverage reporting.
+    * Make private two impl functions that were accidentally public
 
- -- Charles Kerr <charles.kerr@canonical.com>  Wed, 04 Apr 2012 15:09:47 -0500
+ -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 14:22:33 -0500
 
 libdbusmenu (0.5.96-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From 286140b9baa7d797654e6f62bbb340527e127412 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Mon, 9 Apr 2012 16:30:38 -0400
Subject: releasing version 0.5.99-0ubuntu2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ebdc42..8b987a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.99-0ubuntu2) UNRELEASED; urgency=low
+libdbusmenu (0.5.99-0ubuntu2) precise; urgency=low
 
   * libdbusmenu-glib/server.c
     - Cherry picked a fix for a regression in about-to-show grouping
@@ -8,7 +8,7 @@ libdbusmenu (0.5.99-0ubuntu2) UNRELEASED; urgency=low
     - Fixed: nautilus crashed with SIGSEGV in 
       dbusmenu_menuitem_property_remove() (LP: #959821)
 
- -- Ken VanDine <ken.vandine@canonical.com>  Mon, 09 Apr 2012 13:36:39 -0400
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 09 Apr 2012 16:29:34 -0400
 
 libdbusmenu (0.5.99-0ubuntu1) precise; urgency=low
 
-- 
cgit v1.2.3


From b30eb6635cdc00589e85b2867ce056d33dee8451 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 11 Apr 2012 12:05:46 -0500
Subject: releasing version 0.6.1-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0231336..943ea59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.6.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.6.1-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Fix mnemonics in wifi hotspot names. (LP: #903200)
@@ -7,7 +7,7 @@ libdbusmenu (0.6.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Fix visibility signal in the server.
     * Silence false positives in dbusmenu's signal smoke tests.
 
- -- Charles Kerr <charles.kerr@canonical.com>  Wed, 11 Apr 2012 11:53:03 -0500
+ -- Charles Kerr <charles.kerr@canonical.com>  Wed, 11 Apr 2012 11:58:22 -0500
 
 libdbusmenu (0.5.99-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From c9a8ffc08d20663ea8a8a6b59f053ba9934de884 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 11 Apr 2012 14:11:08 -0400
Subject: releasing version 0.6.1-0ubuntu1

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f5250d3..b5fcf64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.6.1-0ubuntu1~ppa1) precise; urgency=low
+libdbusmenu (0.6.1-0ubuntu1) precise; urgency=low
 
   * New upstream release.
     * Fix mnemonics in wifi hotspot names. (LP: #903200)
-- 
cgit v1.2.3


From 4e49daa82ca948228a7cef9fb552f703d0c80757 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 16 Apr 2012 21:38:16 +0200
Subject: releasing version 0.6.1-0ubuntu3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f18290c..e54dc38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (0.6.1-0ubuntu3) UNRELEASED; urgency=low
+libdbusmenu (0.6.1-0ubuntu3) precise-proposed; urgency=low
 
   * Backport fix for keybindings not showing in menus bug (lp: #982656)
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 16 Apr 2012 21:25:44 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 16 Apr 2012 21:28:05 +0200
 
 libdbusmenu (0.6.1-0ubuntu2) precise; urgency=low
 
-- 
cgit v1.2.3


From d77f364df4d13f1d9cac8cf3bb7a04c68351da9d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Jun 2012 10:48:01 -0500
Subject: Making the headers match independent of build directory

---
 libdbusmenu-glib/enum-types.h.in                | 2 +-
 libdbusmenu-gtk/genericmenuitem-enum-types.h.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libdbusmenu-glib/enum-types.h.in b/libdbusmenu-glib/enum-types.h.in
index 5758438..afd9132 100644
--- a/libdbusmenu-glib/enum-types.h.in
+++ b/libdbusmenu-glib/enum-types.h.in
@@ -43,7 +43,7 @@ G_END_DECLS
 /*** END file-tail ***/
 
 /*** BEGIN file-production ***/
-/* Enumerations from file: "@filename@" */
+/* Enumerations from file: "@basename@" */
 #include "@basename@"
 
 /*** END file-production ***/
diff --git a/libdbusmenu-gtk/genericmenuitem-enum-types.h.in b/libdbusmenu-gtk/genericmenuitem-enum-types.h.in
index 5758438..afd9132 100644
--- a/libdbusmenu-gtk/genericmenuitem-enum-types.h.in
+++ b/libdbusmenu-gtk/genericmenuitem-enum-types.h.in
@@ -43,7 +43,7 @@ G_END_DECLS
 /*** END file-tail ***/
 
 /*** BEGIN file-production ***/
-/* Enumerations from file: "@filename@" */
+/* Enumerations from file: "@basename@" */
 #include "@basename@"
 
 /*** END file-production ***/
-- 
cgit v1.2.3


From 6dd001a7708575f123797dae492891c1af35a308 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Jun 2012 10:55:34 -0500
Subject: Escape the text we are using for markup

---
 libdbusmenu-gtk/genericmenuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 81d67fe..91004c0 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -279,7 +279,7 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label)
 	gchar * local_label = NULL;
 	switch (GENERICMENUITEM(menu_item)->priv->disposition) {
 	case GENERICMENUITEM_DISPOSITION_NORMAL:
-		local_label = g_strdup(in_label);
+		local_label = g_markup_escape_text(in_label, -1);
 		break;
 	case GENERICMENUITEM_DISPOSITION_INFORMATIONAL:
 	case GENERICMENUITEM_DISPOSITION_WARNING:
-- 
cgit v1.2.3


From 6552cd19a5472c47e2cb89a2d597bcc90e36d3bf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 13 Jun 2012 14:12:03 -0500
Subject: 0.6.2

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 94bba0c..cd35002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.6.1, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.6.2, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.6.1, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.6.2, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -166,7 +166,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc])
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=12
+LIBDBUSMENU_REVISION=13
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
-- 
cgit v1.2.3


From 09e7b1ae2c772ddedc848db0f3d563ae0362cb95 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 13 Jun 2012 14:45:02 -0500
Subject: releasing version 0.6.2-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad9abd9..87488c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.6.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libdbusmenu (0.6.2-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
     * Fixed duplicated underscores in menus (LP: #979301)
@@ -6,7 +6,7 @@ libdbusmenu (0.6.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * DbusmenuServer leaks private string (LP: #981766)
     * Ensure menuitems with '&' show them properly (LP: #994564)
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 13 Jun 2012 14:30:02 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 13 Jun 2012 14:44:52 -0500
 
 libdbusmenu (0.6.1-0ubuntu3) precise-proposed; urgency=low
 
-- 
cgit v1.2.3


From 48e036ead8788d16ad8df1c43a2b853f737365be Mon Sep 17 00:00:00 2001
From: Didier Roche <didier.roche@canonical.com>
Date: Thu, 20 Sep 2012 19:22:54 +0200
Subject: releasing version 12.10.1-0ubuntu1

---
 debian/changelog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fde5e8e..f0972e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (12.10.1-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (12.10.1-0ubuntu1) quantal; urgency=low
 
   * New upstream release.
     - Honor changes to GtkSettings' gtk-menu-images value (LP: #927236)
@@ -8,9 +8,8 @@ libdbusmenu (12.10.1-0ubuntu1) UNRELEASED; urgency=low
     - Some platforms don't have valgrind, so treat those unit tests separately
     - make headers match independent of the build directory
     - constify some public API calls
-  * New upstream release.
 
- -- Didier Roche <didrocks@ubuntu.com>  Thu, 20 Sep 2012 19:15:24 +0200
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 20 Sep 2012 19:22:52 +0200
 
 libdbusmenu (0.6.2-0ubuntu1) quantal; urgency=low
 
-- 
cgit v1.2.3


From 98ad6475f964e6a0f8e40ee754ee25302a700811 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 24 Sep 2012 21:36:44 +0200
Subject: releasing version 12.10.1-0ubuntu2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c13b6ed..93cf996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (12.10.1-0ubuntu2) UNRELEASED; urgency=low
+libdbusmenu (12.10.1-0ubuntu2) quantal-proposed; urgency=low
 
   * Backport upstream fix for segfault issue (lp: #1053670)
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 24 Sep 2012 21:35:48 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 24 Sep 2012 21:36:35 +0200
 
 libdbusmenu (12.10.1-0ubuntu1) quantal; urgency=low
 
-- 
cgit v1.2.3


From 53073d712fa9d8949c596cbc0c00e98bc74b3c8c Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 3 Oct 2012 21:31:54 +0200
Subject: releasing version 12.10.2-0ubuntu1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d83f62f..f537f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdbusmenu (12.10.2-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (12.10.2-0ubuntu1) quantal; urgency=low
 
   * New upstream release.
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 03 Oct 2012 21:22:56 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 03 Oct 2012 21:23:18 +0200
 
 libdbusmenu (12.10.1-0ubuntu2) quantal-proposed; urgency=low
 
-- 
cgit v1.2.3


From 8412cb81b1d830471bca8fbff49a88ea5cae037d Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 13:15:40 -0500
Subject: Specify that bzr-builddeb should build this package using split mode

---
 .bzr-builddeb/default.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .bzr-builddeb/default.conf

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..92eed96
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[DEBBUILD]
+split = True
-- 
cgit v1.2.3


From cfb963c76512f7a5002c36ac8089d764ecc541d4 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 13:19:08 -0500
Subject: * debian/control:   - Reorganize Build-Depends for clarity.

---
 debian/changelog |  7 +++++++
 debian/control   | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f537f04..327d5f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Reorganize Build-Depends for clarity.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
+
 libdbusmenu (12.10.2-0ubuntu1) quantal; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 49438f9..60a9c93 100644
--- a/debian/control
+++ b/debian/control
@@ -7,22 +7,22 @@ Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                quilt,
+               dh-autoreconf,
+               libtool,
+               intltool,
+               gnome-doc-utils,
+               gtk-doc-tools,
+               valgrind,
                libgtk2.0-dev (>= 2.24.4-1~),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
                libatk1.0-dev,
-               gnome-doc-utils,
-               gtk-doc-tools,
-               libtool,
-               intltool,
                libjson-glib-dev (>= 0.13.4),
                gobject-introspection,
                gir1.2-gtk-2.0,
                libgirepository1.0-dev (>= 0.9.3),
                libx11-dev (>= 1.3), 
-               dh-autoreconf,
-               valgrind,
                valac-0.16
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
-- 
cgit v1.2.3


From c8763efab06eecf9e1af79aeab6734307c3117bc Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 13:20:58 -0500
Subject: Update style to match other indicator stack packages.

---
 debian/changelog |  1 +
 debian/control   | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 327d5f2..c521b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
 
   * debian/control:
     - Reorganize Build-Depends for clarity.
+    - Update style to match other indicator stack packages. 
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
 
diff --git a/debian/control b/debian/control
index 60a9c93..3b2499a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 8.1.3),
                gir1.2-gtk-2.0,
                libgirepository1.0-dev (>= 0.9.3),
                libx11-dev (>= 1.3), 
-               valac-0.16
+               valac-0.16,
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
@@ -32,13 +32,13 @@ Package: libdbusmenu-glib4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
 Breaks: indicator-messages (<< 0.3.0),
         indicator-session (<< 0.2.0),
         libdbusmenu-glib0,
         gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
-        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4)
-Pre-Depends: ${misc:Pre-Depends}
+        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4),
+Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Description: library for passing menus over DBus
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -54,7 +54,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libdbusmenu-glib4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
-         libgtk2.0-dev (>= 2.12.0)
+         libgtk2.0-dev (>= 2.12.0),
 Multi-Arch: same
 Description: library for passing menus over DBus - development files
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -67,8 +67,8 @@ Package: libdbusmenu-gtk4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+         ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -85,7 +85,7 @@ Depends: ${shlibs:Depends},
          libdbusmenu-gtk4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
-         libdbusmenu-glib-dev
+         libdbusmenu-glib-dev,
 Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -100,7 +100,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
-         libdbusmenu-glib4 (= ${binary:Version})
+         libdbusmenu-glib4 (= ${binary:Version}),
 Multi-Arch: foreign
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -115,9 +115,9 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-glib4 (= ${binary:Version}),
-         ${gir:Depends}
+         ${gir:Depends},
 Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
-        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4)
+        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4),
 Description: typelib file for libdbusmenu-glib4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -131,7 +131,7 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-gtk4 (= ${binary:Version}),
-         ${gir:Depends}
+         ${gir:Depends},
 Description: typelib file for libdbusmenu-gtk4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -143,7 +143,7 @@ Description: typelib file for libdbusmenu-gtk4
 Package: libdbusmenu-glib-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: library for passing menus over DBus - documentation
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -154,7 +154,7 @@ Description: library for passing menus over DBus - documentation
 Package: libdbusmenu-gtk-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: library for passing menus over DBus - GTK+ version documentation
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -166,8 +166,8 @@ Package: libdbusmenu-jsonloader4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+         ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Description: library for passing menus over DBus - Test lib
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -185,7 +185,7 @@ Depends: ${shlibs:Depends},
          libdbusmenu-jsonloader4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (= ${binary:Version}),
-         libjson-glib-dev
+         libjson-glib-dev,
 Multi-Arch: same
 Description: library for passing menus over DBus - Test lib development files
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -199,8 +199,8 @@ Package: libdbusmenu-gtk3-4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+         ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -217,7 +217,7 @@ Depends: ${shlibs:Depends},
          libdbusmenu-gtk3-4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk-3-dev (>= 2.91.4-0ubuntu1),
-         libdbusmenu-glib-dev
+         libdbusmenu-glib-dev,
 Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
@@ -231,7 +231,7 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-gtk3-4 (= ${binary:Version}),
-         ${gir:Depends}
+         ${gir:Depends},
 Description: typelib file for libdbusmenu-gtk3-4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
-- 
cgit v1.2.3


From b3733f9bcdb2c2bbc15b4b1c9fd52ea619030c16 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 13:21:51 -0500
Subject:   - Drop Build-Depends on cdbs.   - Bump debhelper Build-Depends to
 (>= 9).

---
 debian/changelog | 2 ++
 debian/control   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c521b9e..3f5f5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
   * debian/control:
     - Reorganize Build-Depends for clarity.
     - Update style to match other indicator stack packages. 
+    - Drop Build-Depends on cdbs. 
+    - Bump debhelper Build-Depends to (>= 9).
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
 
diff --git a/debian/control b/debian/control
index 3b2499a..e612de0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>
-Build-Depends: debhelper (>= 8.1.3),
-               cdbs (>= 0.4.93),
+Build-Depends: debhelper (>= 9),
                quilt,
                dh-autoreconf,
                libtool,
-- 
cgit v1.2.3


From 18f20e62d5faca9b21f48ebf7359433cb8c2da73 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 13:33:43 -0500
Subject: Fix typo in bzr-builddeb default.conf

---
 .bzr-builddeb/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
index 92eed96..6c96a98 100644
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,2 @@
-[DEBBUILD]
+[BUILDDEB]
 split = True
-- 
cgit v1.2.3


From 3c7a02690c63f3931cee3aadf4c46683483a3f86 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 14:12:25 -0500
Subject: * debian/rules:   - Convert to dh9; some variables where kept but
 renamed to brevity.   - Override dh_autoreconf to make sure it calls
 autogen.sh, and doesn't run     configure.

---
 debian/changelog |  4 ++++
 debian/rules     | 73 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f5f5af..0908a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Update style to match other indicator stack packages. 
     - Drop Build-Depends on cdbs. 
     - Bump debhelper Build-Depends to (>= 9).
+  * debian/rules:
+    - Convert to dh9; some variables where kept but renamed to brevity.
+    - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
+      configure.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
 
diff --git a/debian/rules b/debian/rules
index 8eeb376..7ea788e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,44 +1,55 @@
 #!/usr/bin/make -f
 
-DEB_BUILDDIR = build
-DEB_MAKE_FLAVORS = gtk2 gtk3
+FLAVORS = gtk2 gtk3
 
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+CONFIGURE_FLAGS_gtk2 = --with-gtk=2
+CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
-DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
+CONFIGURE_COMMON_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
-DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2
-DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2
-DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2
-DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2
+INSTALL_COMMON_FLAGS = --fail-missing
 
-DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3
-DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
-DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
+%:
+	dh $@ --with autoreconf
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
-DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0
-DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0
+override_dh_auto_configure: $(FLAVORS:%=doconfigure-%)
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+doconfigure-%:
+	DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS)
+
+override_dh_auto_build: $(FLAVORS:%=dobuild-%)
 
-debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
-debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
+dobuild-%:
+	dh_auto_build --builddirectory=builddir/$*
 
-common-install-arch::
+override_dh_auto_install: $(FLAVORS:%=doinstall-%)
+
+doinstall-%:
+	dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$*
+
+override_dh_install:
 	find debian/tmp -name \*.la -delete
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2
+	dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk-0.4 --sourcedir=debian/tmp/gtk2
+	dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-glib-0.4 --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk3-0.4 --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib4 --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib-dev --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib-doc --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk3-4 --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk3-dev --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-jsonloader4 --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-jsonloader-dev --sourcedir=debian/tmp/gtk3
+	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-tools --sourcedir=debian/tmp/gtk3
+
+override_dh_shlibdeps:
+	dh_shlibdeps -plibdbusmenu-gtk4 -- -xlibgtk2.0-0
+	dh_shlibdeps -plibdbusmenu-gtk3-4 -- -xlibgtk-3-0
+
-- 
cgit v1.2.3


From 8a60e398bc4a96ef9c3c0fd4719f775804ee623c Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 14:12:48 -0500
Subject: debian/compat: bump to compat level 9.

---
 debian/changelog | 1 +
 debian/compat    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0908a12..e6f6fd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Convert to dh9; some variables where kept but renamed to brevity.
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
       configure.
+  * debian/compat: bump to compat level 9.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
-- 
cgit v1.2.3


From 9ecf1e08075b2ba554ca594292d604d05d311b24 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 14:13:31 -0500
Subject: debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c
 example.

---
 debian/changelog                   | 1 +
 debian/libdbusmenu-gtk-doc.install | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e6f6fd9..f64fb06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
       configure.
   * debian/compat: bump to compat level 9.
+  * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
 
diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install
index 664f00c..d772ba5 100644
--- a/debian/libdbusmenu-gtk-doc.install
+++ b/debian/libdbusmenu-gtk-doc.install
@@ -1 +1,2 @@
 usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/
+usr/share/doc/libdbusmenu/examples/glib-server-nomenu.c
-- 
cgit v1.2.3


From 20640f316057304f9a6d7439e40467508eae080e Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Wed, 21 Nov 2012 14:19:22 -0500
Subject: Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.

---
 debian/changelog | 1 +
 debian/control   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f64fb06..2743496 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Update style to match other indicator stack packages. 
     - Drop Build-Depends on cdbs. 
     - Bump debhelper Build-Depends to (>= 9).
+    - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
   * debian/rules:
     - Convert to dh9; some variables where kept but renamed to brevity.
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
diff --git a/debian/control b/debian/control
index e612de0..ea18efc 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,11 @@ Build-Depends: debhelper (>= 9),
                valac-0.16,
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
+# If you aren't a member of ~dbusmenu-team but need to upload
+# packaging changes, just go ahead.  ~dbusmenu-team will notice
+# and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04
+Vcs-Browser: https://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04/files
 
 Package: libdbusmenu-glib4
 Section: libs
-- 
cgit v1.2.3


From 197688438c54ff42088745e16457432bb0f907ce Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Thu, 22 Nov 2012 18:25:10 -0500
Subject: Clean up unnecessary files we don't want to install, so that
 dh_install can complete.

---
 debian/changelog | 2 ++
 debian/rules     | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2743496..73403da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Convert to dh9; some variables where kept but renamed to brevity.
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
       configure.
+    - Clean up unnecessary files we don't want to install, so that dh_install
+      can complete.
   * debian/compat: bump to compat level 9.
   * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
 
diff --git a/debian/rules b/debian/rules
index 7ea788e..b6ab921 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,10 @@ doinstall-%:
 
 override_dh_install:
 	find debian/tmp -name \*.la -delete
+	# Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build)
+	rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-testapp
+	rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-dumper
+	rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-bench
 	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2
 	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2
 	dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2
-- 
cgit v1.2.3


From de3d759214237dfcc53491276b7c633221415306 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Thu, 22 Nov 2012 18:50:53 -0500
Subject: debian/libdbusmenu-tools.install: install dbusmenu-* binaries from
 the multiarch triplet rather than usr/lib/libdbusmenu.

---
 debian/changelog                 | 2 ++
 debian/libdbusmenu-tools.install | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 73403da..44f0acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
       can complete.
   * debian/compat: bump to compat level 9.
   * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
+  * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the
+    multiarch triplet rather than usr/lib/libdbusmenu.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 13:17:02 -0500
 
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
index 1a79739..68962f8 100644
--- a/debian/libdbusmenu-tools.install
+++ b/debian/libdbusmenu-tools.install
@@ -1,3 +1,3 @@
-usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/
+usr/lib/*/dbusmenu-*
 usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
 usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
-- 
cgit v1.2.3


From 6a87a4ed510e4df372136db63ca4ad74179d1fe8 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Fri, 23 Nov 2012 14:52:29 -0500
Subject: Remove outdated Breaks:.

---
 debian/changelog | 1 +
 debian/control   | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44f0acd..0b5fef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Drop Build-Depends on cdbs. 
     - Bump debhelper Build-Depends to (>= 9).
     - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
+    - Remove outdated Breaks:.
   * debian/rules:
     - Convert to dh9; some variables where kept but renamed to brevity.
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
diff --git a/debian/control b/debian/control
index ea18efc..d9253f8 100644
--- a/debian/control
+++ b/debian/control
@@ -36,11 +36,6 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Breaks: indicator-messages (<< 0.3.0),
-        indicator-session (<< 0.2.0),
-        libdbusmenu-glib0,
-        gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
-        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4),
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Description: library for passing menus over DBus
@@ -119,8 +114,6 @@ Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-glib4 (= ${binary:Version}),
          ${gir:Depends},
-Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
-        gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4),
 Description: typelib file for libdbusmenu-glib4
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
-- 
cgit v1.2.3


From 9217f452b5dd349092185436c76b3c77465c2627 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Fri, 23 Nov 2012 16:19:42 -0500
Subject: Override dh_auto_test to make sure they can be run for both the gtk2
 and gtk3 flavors.

---
 debian/changelog | 2 ++
 debian/rules     | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0b5fef5..085d6e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
       configure.
     - Clean up unnecessary files we don't want to install, so that dh_install
       can complete.
+    - Override dh_auto_test to make sure they can be run for both the gtk2 and
+      gtk3 flavors.
   * debian/compat: bump to compat level 9.
   * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
   * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the
diff --git a/debian/rules b/debian/rules
index b6ab921..d428b3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,12 @@ override_dh_auto_install: $(FLAVORS:%=doinstall-%)
 doinstall-%:
 	dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$*
 
+override_dh_auto_test: $(FLAVORS:%=dotest-%)
+
+dotest-%:
+	# Tests temporarily disabled; test-gtk-label fails. See http://pad.lv/1082516
+	#dh_auto_test --builddirectory=builddir/$*
+
 override_dh_install:
 	find debian/tmp -name \*.la -delete
 	# Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build)
-- 
cgit v1.2.3


From b83fb86b4826bac58154fbb76ccf9d1495a8fffb Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Mon, 26 Nov 2012 20:59:22 -0500
Subject: Re-enable tests.

---
 debian/rules | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index d428b3e..f64efa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,8 +35,7 @@ doinstall-%:
 override_dh_auto_test: $(FLAVORS:%=dotest-%)
 
 dotest-%:
-	# Tests temporarily disabled; test-gtk-label fails. See http://pad.lv/1082516
-	#dh_auto_test --builddirectory=builddir/$*
+	dh_auto_test --builddirectory=builddir/$*
 
 override_dh_install:
 	find debian/tmp -name \*.la -delete
-- 
cgit v1.2.3


From 60b7a28449567cbd3605c7aa04ae4ff7f784fef4 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Tue, 4 Dec 2012 13:45:36 -0500
Subject: Add dbus-test-runner to Build-Depends.

---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 085d6e5..dc472b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Bump debhelper Build-Depends to (>= 9).
     - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
     - Remove outdated Breaks:.
+    - Add dbus-test-runner to Build-Depends.
   * debian/rules:
     - Convert to dh9; some variables where kept but renamed to brevity.
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
diff --git a/debian/control b/debian/control
index d9253f8..c383ec3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9),
                gnome-doc-utils,
                gtk-doc-tools,
                valgrind,
+               dbus-test-runner,
                libgtk2.0-dev (>= 2.24.4-1~),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
-- 
cgit v1.2.3


From 4855bd8639c7666817f8b5162b5cd6408b61af62 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Tue, 4 Dec 2012 19:13:40 -0500
Subject:   - Add xvfb to Build-Depends.   - Run dh_auto_test through xvfb-run.

---
 debian/changelog | 2 ++
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dc472b8..cfa0ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
     - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
     - Remove outdated Breaks:.
     - Add dbus-test-runner to Build-Depends.
+    - Add xvfb to Build-Depends.
   * debian/rules:
     - Convert to dh9; some variables where kept but renamed to brevity.
     - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run
@@ -16,6 +17,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
       can complete.
     - Override dh_auto_test to make sure they can be run for both the gtk2 and
       gtk3 flavors.
+    - Run dh_auto_test through xvfb-run.
   * debian/compat: bump to compat level 9.
   * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
   * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the
diff --git a/debian/control b/debian/control
index c383ec3..74461c7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 9),
                gtk-doc-tools,
                valgrind,
                dbus-test-runner,
+               xvfb,
                libgtk2.0-dev (>= 2.24.4-1~),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
diff --git a/debian/rules b/debian/rules
index f64efa6..f838d26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ doinstall-%:
 override_dh_auto_test: $(FLAVORS:%=dotest-%)
 
 dotest-%:
-	dh_auto_test --builddirectory=builddir/$*
+	xvfb-run dh_auto_test --builddirectory=builddir/$*
 
 override_dh_install:
 	find debian/tmp -name \*.la -delete
-- 
cgit v1.2.3