From b13fa490fb368b779a99543d18d5c68c01f8eb31 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <luke.yelavich@canonical.com>
Date: Fri, 4 Feb 2011 13:57:23 +1100
Subject: Add accessible_name support

---
 bindings/mono/Makefile.am                  |  1 +
 bindings/mono/libappindicator-api.metadata |  6 ++++++
 bindings/python/appindicator.defs          | 15 +++++++++++++++
 3 files changed, 22 insertions(+)

(limited to 'bindings')

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index dfaa41f..1f23742 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -94,6 +94,7 @@ $(API): $(MIDDLE_API) Makefile.am
 		-e "s|PROP_LABEL_S|label|" \
 		-e "s|PROP_LABEL_GUIDE_S|label-guide|" \
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
+		-e "s|PROP_ACCESSIBLE_NAME_S|accessible-name|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index ccf58f1..d818e60 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -7,6 +7,8 @@
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="cname">new-status</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_label']" name="name">NewLabel</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_label']" name="cname">new-label</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_name']" name="name">NewAccessibleName</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_name']" name="cname">new-accessible-name</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
@@ -24,6 +26,7 @@
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_LABEL_S']" name="name">Label</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_LABEL_GUIDE_S']" name="name">LabelGuide</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ACCESSIBLE_NAME_S']" name="name">AccessibleName</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ORDERING_INDEX_S']" name="name">OrderingIndex</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr>
 
@@ -38,6 +41,7 @@
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_LABEL_S']" />
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_LABEL_GUIDE_S']" />
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ORDERING_INDEX_S']" />
+    <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ACCESSIBLE_NAME_S']" />
 
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" />
@@ -48,6 +52,7 @@
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_label']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_label_guide']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_ordering_index']" />
+    <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_accessible_name']" />
 
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" />
@@ -55,4 +60,5 @@
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_label']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_ordering_index']" />
+    <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_accessible_name']" />
 </metadata>
diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
index 5027a6d..8c4efb3 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/appindicator.defs
@@ -72,6 +72,15 @@
   )
 )
 
+(define-method set_accessible_name
+  (of-object "AppIndicator")
+  (c-name "app_indicator_set_accessible_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "accessible_name" (null-ok))
+  )
+)
+
 (define-method set_ordering_index
   (of-object "AppIndicator")
   (c-name "app_indicator_set_ordering_index")
@@ -146,6 +155,12 @@
   (return-type "const-gchar*")
 )
 
+(define-method get_accessible_name
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_accessible_name")
+  (return-type "const-gchar*")
+)
+
 (define-method get_ordering_index
   (of-object "AppIndicator")
   (c-name "app_indicator_get_ordering_index")
-- 
cgit v1.2.3


From fffab2e1e8d991a41cc591ceaca77c8a40f31f33 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <luke.yelavich@canonical.com>
Date: Tue, 8 Feb 2011 17:55:35 +1100
Subject: accessible_name -> accessible_desc

---
 bindings/mono/Makefile.am                  |  2 +-
 bindings/mono/libappindicator-api.metadata | 12 ++++++------
 bindings/python/appindicator.defs          | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'bindings')

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 1f23742..80c03e3 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -94,7 +94,7 @@ $(API): $(MIDDLE_API) Makefile.am
 		-e "s|PROP_LABEL_S|label|" \
 		-e "s|PROP_LABEL_GUIDE_S|label-guide|" \
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
-		-e "s|PROP_ACCESSIBLE_NAME_S|accessible-name|" \
+		-e "s|PROP_ACCESSIBLE_DESC_S|accessible-name|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index 57e8245..e610c88 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -7,8 +7,8 @@
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="cname">new-status</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_label']" name="name">NewLabel</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_label']" name="cname">new-label</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_name']" name="name">NewAccessibleName</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_name']" name="cname">new-accessible-name</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_desc']" name="name">NewAccessibleDesc</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_desc']" name="cname">new-accessible-desc</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='scroll_event']" name="name">ScrollEvent</attr>
@@ -28,7 +28,7 @@
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_LABEL_S']" name="name">Label</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_LABEL_GUIDE_S']" name="name">LabelGuide</attr>
-    <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ACCESSIBLE_NAME_S']" name="name">AccessibleName</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ACCESSIBLE_DESC_S']" name="name">AccessibleDesc</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ORDERING_INDEX_S']" name="name">OrderingIndex</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr>
 
@@ -43,7 +43,7 @@
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_LABEL_S']" />
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_LABEL_GUIDE_S']" />
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ORDERING_INDEX_S']" />
-    <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ACCESSIBLE_NAME_S']" />
+    <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ACCESSIBLE_DESC_S']" />
 
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" />
@@ -54,7 +54,7 @@
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_label']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_label_guide']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_ordering_index']" />
-    <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_accessible_name']" />
+    <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_accessible_desc']" />
 
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" />
@@ -62,5 +62,5 @@
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_label']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_ordering_index']" />
-    <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_accessible_name']" />
+    <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_accessible_desc']" />
 </metadata>
diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
index 8c4efb3..cc8ae75 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/appindicator.defs
@@ -72,12 +72,12 @@
   )
 )
 
-(define-method set_accessible_name
+(define-method set_accessible_desc
   (of-object "AppIndicator")
-  (c-name "app_indicator_set_accessible_name")
+  (c-name "app_indicator_set_accessible_desc")
   (return-type "none")
   (parameters
-    '("const-gchar*" "accessible_name" (null-ok))
+    '("const-gchar*" "accessible_desc" (null-ok))
   )
 )
 
@@ -155,9 +155,9 @@
   (return-type "const-gchar*")
 )
 
-(define-method get_accessible_name
+(define-method get_accessible_desc
   (of-object "AppIndicator")
-  (c-name "app_indicator_get_accessible_name")
+  (c-name "app_indicator_get_accessible_desc")
   (return-type "const-gchar*")
 )
 
-- 
cgit v1.2.3


From eb2ba45eaf60c05f1ce570d3f0c9d63f1602af4b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 22:31:45 -0600
Subject: Switching to proper properties

---
 bindings/mono/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bindings')

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 80c03e3..13bfaa9 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -87,14 +87,15 @@ $(API): $(MIDDLE_API) Makefile.am
 		-e "s|PROP_STATUS_S|status|" \
 		-e "s|PROP_CATEGORY_S|category|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
+		-e "s|PROP_ICON_DESC_S|icon-desc|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
+		-e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \
 		-e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \
 		-e "s|PROP_MENU_S|menu|" \
 		-e "s|PROP_CONNECTED_S|connected|" \
 		-e "s|PROP_LABEL_S|label|" \
 		-e "s|PROP_LABEL_GUIDE_S|label-guide|" \
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
-		-e "s|PROP_ACCESSIBLE_DESC_S|accessible-name|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
-- 
cgit v1.2.3


From d21b676e9fe3a9b7f52465cd75d833ce05a6c7a7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 22:46:17 -0600
Subject: Cleaning up even more!

---
 bindings/mono/Makefile.am | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bindings')

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 13bfaa9..9a899e1 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -85,10 +85,13 @@ $(MIDDLE_API): $(METADATA) $(RAW_API)
 $(API): $(MIDDLE_API) Makefile.am
 	sed -e "s|PROP_ID_S|id|" \
 		-e "s|PROP_STATUS_S|status|" \
+		-e "s|PROP_CATEGORY_S|Category|" \
 		-e "s|PROP_CATEGORY_S|category|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
+		-e "s|PROP_ICON_DESC_S|IconDesc|" \
 		-e "s|PROP_ICON_DESC_S|icon-desc|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
+		-e "s|PROP_ATTENTION_ICON_DESC_S|AttentionIconDesc|" \
 		-e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \
 		-e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \
 		-e "s|PROP_MENU_S|menu|" \
@@ -96,6 +99,8 @@ $(API): $(MIDDLE_API) Makefile.am
 		-e "s|PROP_LABEL_S|label|" \
 		-e "s|PROP_LABEL_GUIDE_S|label-guide|" \
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
+		-e "s|PROP_DBUS_MENU_SERVER_S|DbusMenuServer|" \
+		-e "s|PROP_DBUS_MENU_SERVER_S|dbus-menu-server|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
-- 
cgit v1.2.3