From 7aee325ac4900d16fe49f219bbf6621ce91a8c95 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.smith@canonical.com>
Date: Wed, 16 Dec 2009 13:51:49 -0500
Subject: Make mono bindings less redundant and more mono friendly

---
 bindings/mono/libappindicator-api.metadata | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index ad0ebc0..f019f0a 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -7,11 +7,25 @@
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ID_S']" name="name">ID</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="name">Category</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="type">AppIndicatorCategory</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="name">Status</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="type">AppIndicatorStatus</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ICON_NAME_S']" name="name">IconName</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ATTENTION_ICON_NAME_S']" name="name">AttentionIconName</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="name">Menu</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="type">GtkMenu*</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
         <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr>
+        
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_icon']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_category']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_attention_icon']" />
+        
+	<remove-node path="/api/namespace/object/method[@cname='app_indicator_set_id']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_category']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" />        
 </metadata>
-- 
cgit v1.2.3


From f4c9af70e64c365e16326aa710af0f24e1a95d46 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Dec 2009 10:02:02 -0600
Subject: Only build a dbusmenu server if we don't have one.

---
 src/libappindicator/app-indicator.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 791f9ff..8efd3e2 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -754,8 +754,13 @@ setup_dbusmenu (AppIndicator *self)
                         container_iterate,
                         root);
 
-  priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+  if (priv->menuservice == NULL) {
+      priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+  }
+
   dbusmenu_server_set_root (priv->menuservice, root);
+
+  return;
 }
 
 /**
-- 
cgit v1.2.3


From 6af83d4b37b68dd5b0cb6a60fc4dc363eb7eb3e3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Dec 2009 10:04:40 -0600
Subject: Initing 'menuservice' to NULL

---
 src/libappindicator/app-indicator.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 8efd3e2..d0fcf04 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -278,6 +278,7 @@ app_indicator_init (AppIndicator *self)
 	priv->icon_name = NULL;
 	priv->attention_icon_name = NULL;
 	priv->menu = NULL;
+	priv->menuservice = NULL;
 
 	priv->watcher_proxy = NULL;
 	priv->connection = NULL;
-- 
cgit v1.2.3


From 09c4ec291659b21d6e64ce271ea818cb13ec259b Mon Sep 17 00:00:00 2001
From: Cody Russell <crussell@canonical.com>
Date: Thu, 17 Dec 2009 17:27:03 +0100
Subject: Only create the dbusmenu server if it doesn't exist

---
 src/libappindicator/app-indicator.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 791f9ff..cb74a83 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -754,7 +754,9 @@ setup_dbusmenu (AppIndicator *self)
                         container_iterate,
                         root);
 
-  priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+  if (!priv->menuservice)
+    priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+
   dbusmenu_server_set_root (priv->menuservice, root);
 }
 
-- 
cgit v1.2.3


From d1fbd5d1155d220b808d59a85ab69d46df4449b4 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 17 Dec 2009 13:35:11 -0500
Subject: link against the versioned library

---
 bindings/mono/app-indicator.sources.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml
index 8ee8758..3585c44 100644
--- a/bindings/mono/app-indicator.sources.xml
+++ b/bindings/mono/app-indicator.sources.xml
@@ -1,6 +1,6 @@
 <gapi-parser-input>
 	<api filename="libappindicator-api.raw">
-		<library name="libappindicator.so">
+		<library name="libappindicator.so.0">
 			<namespace name="AppIndicator">
 				<directory path="../../src/libappindicator">
 					<exclude>app-indicator-enum-types.h.in</exclude>
-- 
cgit v1.2.3