Fixes for the bindings

6 files changed, 85 insertions, 7 deletions

diff --git a/bindings/mono/AssemblyInfo.cs b/bindings/mono/AssemblyInfo.cs
index 269981a..0417db6 100644
--- a/bindings/mono/AssemblyInfo.cs
+++ b/bindings/mono/AssemblyInfo.cs
@@ -27,4 +27,4 @@ using System.Reflection;
 [assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]
-[assembly: AssemblyVersion ("0.1")]
+[assembly: AssemblyVersion ("0.2")]
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 8d0444c..dfaa41f 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -10,11 +10,14 @@ MIDDLE_API = libappindicator-api.middle
 RAW_API = libappindicator-api.raw
 METADATA = libappindicator-api.metadata
 ASSEMBLY_NAME = appindicator-sharp
-ASSEMBLY_VERSION = 0.1.0.0
+ASSEMBLY_VERSION = 0.2.0.0
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME)
 POLICY_VERSION = 0.0
 DLLPOLICY = $(POLICY).dll
+POLICY1 = policy.$(POLICY1_VERSION).$(ASSEMBLY_NAME)
+POLICY1_VERSION = 0.1
+DLLPOLICY1 = $(POLICY1).dll
 WRAPPER_FREE_BINDING_SRC = $(top_srcdir)/src/app-indicator.c
 WRAPPER_FREE_BINDING = app-indicator.c
 
@@ -22,7 +25,9 @@ TARGET = \
 	$(ASSEMBLY) \
 	$(ASSEMBLY).config \
 	$(DLLPOLICY) \
-	$(POLICY).config
+	$(POLICY).config \
+	$(DLLPOLICY1) \
+	$(POLICY1).config
 
 assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
@@ -37,8 +42,10 @@ CLEANFILES = \
 	$(RAW_API) \
 	$(TEST) \
 	$(DLLPOLICY) \
+	$(DLLPOLICY1) \
 	$(WRAPPER_FREE_BINDING) \
-	$(POLICY).config
+	$(POLICY).config \
+	$(POLICY1).config
 
 DISTCLEANFILES = $(ASSEMBLY).config
 TEST_SOURCES = TestIndicator.cs
@@ -52,6 +59,7 @@ EXTRA_DIST =					\
 	app-indicator.sources.xml		\
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
+	$(POLICY1).config.in \
 	$(customs)				\
 	$(TEST_SOURCES)
 
@@ -83,6 +91,9 @@ $(API): $(MIDDLE_API) Makefile.am
 		-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|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
@@ -125,3 +136,11 @@ $(POLICY).config: $(POLICY).config.in Makefile
 $(DLLPOLICY): $(POLICY).config $(ASSEMBLY_NAME).snk Makefile
 	$(AL) -link:$(POLICY).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk
 
+
+$(POLICY1).config: $(POLICY1).config.in Makefile
+	sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \
+		-e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \
+		$< > $@
+
+$(DLLPOLICY1): $(POLICY1).config $(ASSEMBLY_NAME).snk Makefile
+	$(AL) -link:$(POLICY1).config -out:$(DLLPOLICY1) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index 718c500..ccf58f1 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -5,11 +5,13 @@
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="cname">new-attention-icon</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="name">NewStatus</attr>
 	<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='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>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="cname">new-icon</attr>
-		<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon_theme_path']" name="name">NewIconThemePath</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon_theme_path']" name="name">NewIconThemePath</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon_theme_path']" name="cname">new-icon-theme-path</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="hidden">true</attr>
@@ -20,6 +22,9 @@
     <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']/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_ORDERING_INDEX_S']" name="name">OrderingIndex</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr>
 
     <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='id']" name="property_name">id</attr>
@@ -30,16 +35,24 @@
     <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='category']" name="property_name">category</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='icon_theme_path']" name="property_name">icon-theme-path</attr>
 
+    <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/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_icon_theme_path']" />
     <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_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_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_icon_theme_path']" />
     <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']" />
 </metadata>
diff --git a/bindings/mono/policy.0.0.appindicator-sharp.config.in b/bindings/mono/policy.0.0.appindicator-sharp.config.in
index 95c21ed..e1fe0db 100644
--- a/bindings/mono/policy.0.0.appindicator-sharp.config.in
+++ b/bindings/mono/policy.0.0.appindicator-sharp.config.in
@@ -3,7 +3,7 @@
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
 				<assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="bcae265d1c7ab4c2" />
-				<bindingRedirect oldVersion="0.0.0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/>
+				<bindingRedirect oldVersion="0.0.0.0-0.1.0.0" newVersion="@ASSEMBLY_VERSION@"/>
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>
diff --git a/bindings/mono/policy.0.1.appindicator-sharp.config.in b/bindings/mono/policy.0.1.appindicator-sharp.config.in
new file mode 100644
index 0000000..0a8f9b1
--- /dev/null
+++ b/bindings/mono/policy.0.1.appindicator-sharp.config.in
@@ -0,0 +1,10 @@
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="bcae265d1c7ab4c2" />
+				<bindingRedirect oldVersion="0.1.0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
index b6c7402..5027a6d 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/appindicator.defs
@@ -62,6 +62,24 @@
   )
 )
 
+(define-method set_label
+  (of-object "AppIndicator")
+  (c-name "app_indicator_set_label")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "label" (null-ok))
+    '("const-gchar*" "guide" (null-ok) (default "NULL"))
+  )
+)
+
+(define-method set_ordering_index
+  (of-object "AppIndicator")
+  (c-name "app_indicator_set_ordering_index")
+  (parameters
+    '("guint32" "ordering_index")
+  )
+)
+
 (define-method set_attention_icon
   (of-object "AppIndicator")
   (c-name "app_indicator_set_attention_icon")
@@ -116,6 +134,24 @@
   (return-type "AppIndicatorStatus")
 )
 
+(define-method get_label
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_label")
+  (return-type "const-gchar*")
+)
+
+(define-method get_label_guide
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_label_guide")
+  (return-type "const-gchar*")
+)
+
+(define-method get_ordering_index
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_ordering_index")
+  (return-type "guint32")
+)
+
 (define-method get_icon
   (of-object "AppIndicator")
   (c-name "app_indicator_get_icon")