Import upstream version 0.2.9

author: Ted Gould <ted@gould.cx> 2010-09-22 11:14:11 -0500
committer: Ted Gould <ted@gould.cx> 2010-09-22 11:14:11 -0500
commit: f5e7b8efe61d35c65422284f49e5d01a614a9deb (patch)
tree: 6d963d25b6b8c2a87d67b9e789622819efd84673
parent: c876d26568d76d4d06b319352cf63928f21dfba5 (diff)
parent: fe08c86fc6b9d9d843149bf195b995d7e38a2c40 (diff)
download: ayatana-indicator-application-f5e7b8efe61d35c65422284f49e5d01a614a9deb.tar.gz
ayatana-indicator-application-f5e7b8efe61d35c65422284f49e5d01a614a9deb.tar.bz2
ayatana-indicator-application-f5e7b8efe61d35c65422284f49e5d01a614a9deb.zip
21 files changed, 314 insertions, 46 deletions
diff --git a/AUTHORS b/AUTHORS
index e69de29..447dd56 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -0,0 +1,21 @@
+# Generated by Makefile. Do not edit.
+
+ Aurelien Gateau 
+ Aurélien Gâteau 
+ C10uD 
+ Chris Coulson 
+ Cody Russell 
+ Conor Curran 
+ Emmanuele Bassi 
+ Jan Arne Petersen 
+ Jason Smith 
+ Jo Shields 
+ Ken Vandine 
+ Ken VanDine 
+ Krzysztof Klimonda 
+ Neil Jagdish Patel 
+ Neil J. Patel 
+ Sebastien Bacher 
+ Sense Egbert Hofstede 
+ Sense Hofstede 
+ Ted Gould 
diff --git a/ChangeLog b/ChangeLog
index 99ebe60..ab1ee4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,82 @@
 # Generated by Makefile. Do not edit.
 
+2010-09-21  Ted Gould  <ted@gould.cx>
+
+	Fixes for the bindings
+
+2010-09-21  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Resolving conflict when merging with trunk
+
+2010-09-21  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Undoing a previous commit that had nothing to do with what I want to achive in my merge request. That's what you get for misusing old branches\!
+
+2010-09-21  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Created a second policy file to make sure that applications depending on 'appindicator-sharp' will not have to be recompiled.
+	Changes to the packaging is required to make sure the policy file gets installed.
+	
+	Many thanks to Jo Shields for looking into this issue and proposing a solution.
+
+2010-09-20  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Remove the redudant set and get functions for the ordering_index property from the Mono bindings as we want programmers to work witht the property directly.
+
+2010-09-20  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	* Adding Python bindings for the new API additons
+	* Updating the Mono assembly version to reflect the changes to the API
+	* Remove two redundant elements from the Mono bindings' metadata file
+
+2010-09-20  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Merging Jo Shields' fixes to the build infrastructure to shut GAPI up.
+
+2010-09-18  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Updating to trunk
+
+2010-09-18  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Commit latest changes before merging with trunk
+
+2010-08-24  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Merging with trunk
+
+2010-08-05  Sense Egbert Hofstede  <sense@ubuntu.com>
+
+	Partial, segfaulting, fix for LP: #608219, requires GTK+ change attached to same bug report.
+
+2010-09-21  Ted Gould  <ted@gould.cx>
+
+	Fixing Mono bindings to build versions correctly.
+
+2010-09-19  Jo Shields  <jms@destiny>
+
+	Bump SONAME in Mono binding to libappindicator.so.1
+
+2010-09-19  Jo Shields  <jms@destiny>
+
+	The purpose of a dllmap is to turn a DllImport for "foo" into a dlopen of "bar". This is most commonly used to make apps more cross-platform, by specifying the Windows library name (foo.dll) into a Linux/OSX/etc filename (libfoo.so.0).
+	
+	indicator-application has been binding directly to libappindicator.so.0, which means multiple places to update if the SONAME changes, and makes it less portable - this commit fixes this.
+
+2010-09-19  Jo Shields  <jms@destiny>
+
+	gapi2-parser cannot cope with multiple signals connected to the same method - it will bail out, complaining it cannot find a method to match the second signal.
+	
+	This patch modifies the build system to copy app-indicator.c locally, with the "bad" X_NEW_LABEL signal removed, and use that copy to build the binding.
+
+2010-09-15  Ted Gould  <ted@gould.cx>
+
+	Adding a disthook for AUTHORS
+
+2010-09-15  Ted Gould  <ted@gould.cx>
+
+	0.2.8
+
 2010-09-15  Ted Gould  <ted@gould.cx>
 
 	Making it when we see changes we always update the icon.
diff --git a/Makefile.am b/Makefile.am
index ba772b0..98e4a88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,3 +30,15 @@ dist-hook:
         else \
 			echo Failed to generate ChangeLog: not a branch >&2; \
 	fi
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating AUTHORS && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+				|| (rm -f AUTHORS.tmp; \
+					echo Failed to generate AUTHORS >&2 ); \
+        else \
+			echo Failed to generate AUTHORS: not a branch >&2; \
+	fi
diff --git a/Makefile.in b/Makefile.in
index 59c4e66..ec8ef85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -806,6 +806,18 @@ dist-hook:
         else \
 			echo Failed to generate ChangeLog: not a branch >&2; \
 	fi
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating AUTHORS && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+				|| (rm -f AUTHORS.tmp; \
+					echo Failed to generate AUTHORS >&2 ); \
+        else \
+			echo Failed to generate AUTHORS: not a branch >&2; \
+	fi
 
 # 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/bindings/mono/ApplicationIndicator.custom b/bindings/mono/ApplicationIndicator.custom
index 11d16a8..fcc52d7 100644
--- a/bindings/mono/ApplicationIndicator.custom
+++ b/bindings/mono/ApplicationIndicator.custom
@@ -1,10 +1,10 @@
-[DllImport ("libappindicator.so.0")]
+[DllImport ("appindicator.dll")]
 static extern int app_indicator_get_status (IntPtr i);
 
-[DllImport ("libappindicator.so.0")]
+[DllImport ("appindicator.dll")]
 static extern int app_indicator_get_category (IntPtr i);
 
-[DllImport ("libappindicator.so.0")]
+[DllImport ("appindicator.dll")]
 static extern void app_indicator_set_status (IntPtr i, int s);
 
         [GLib.Property ("status")]
@@ -23,4 +23,4 @@ static extern void app_indicator_set_status (IntPtr i, int s);
                get {
                    return (Category) app_indicator_get_category (Handle);
                }
-        }
-\ No newline at end of file
+        }
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 98fe6f9..dfaa41f 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -10,17 +10,24 @@ 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
 
 TARGET = \
 	$(ASSEMBLY) \
 	$(ASSEMBLY).config \
 	$(DLLPOLICY) \
-	$(POLICY).config
+	$(POLICY).config \
+	$(DLLPOLICY1) \
+	$(POLICY1).config
 
 assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
@@ -35,7 +42,10 @@ CLEANFILES = \
 	$(RAW_API) \
 	$(TEST) \
 	$(DLLPOLICY) \
-	$(POLICY).config
+	$(DLLPOLICY1) \
+	$(WRAPPER_FREE_BINDING) \
+	$(POLICY).config \
+	$(POLICY1).config
 
 DISTCLEANFILES = $(ASSEMBLY).config
 TEST_SOURCES = TestIndicator.cs
@@ -49,6 +59,7 @@ EXTRA_DIST =					\
 	app-indicator.sources.xml		\
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
+	$(POLICY1).config.in \
 	$(customs)				\
 	$(TEST_SOURCES)
 
@@ -57,8 +68,11 @@ GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib
 references = $(GTK_SHARP_LIBS)
 test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
 
-$(RAW_API): app-indicator.sources.xml
-	$(GAPI_PARSER) app-indicator.sources.xml
+$(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING)
+	$(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml
+
+$(WRAPPER_FREE_BINDING): $(WRAPPER_FREE_BINDING_SRC)
+	sed '/signals\[X_NEW_LABEL\] /,+6d' $(WRAPPER_FREE_BINDING_SRC) > $(WRAPPER_FREE_BINDING)
 
 $(MIDDLE_API): $(METADATA) $(RAW_API)
 	cp $(srcdir)/$(RAW_API) $(MIDDLE_API)
@@ -77,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)
@@ -119,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/Makefile.in b/bindings/mono/Makefile.in
index a94893f..9f3d014 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -298,16 +298,23 @@ 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
 TARGET = \
 	$(ASSEMBLY) \
 	$(ASSEMBLY).config \
 	$(DLLPOLICY) \
-	$(POLICY).config
+	$(POLICY).config \
+	$(DLLPOLICY1) \
+	$(POLICY1).config
 
 assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
@@ -321,7 +328,10 @@ CLEANFILES = \
 	$(RAW_API) \
 	$(TEST) \
 	$(DLLPOLICY) \
-	$(POLICY).config
+	$(DLLPOLICY1) \
+	$(WRAPPER_FREE_BINDING) \
+	$(POLICY).config \
+	$(POLICY1).config
 
 DISTCLEANFILES = $(ASSEMBLY).config
 TEST_SOURCES = TestIndicator.cs
@@ -335,6 +345,7 @@ EXTRA_DIST = \
 	app-indicator.sources.xml		\
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
+	$(POLICY1).config.in \
 	$(customs)				\
 	$(TEST_SOURCES)
 
@@ -743,8 +754,11 @@ uninstall-am: uninstall-assemblyDATA uninstall-local \
 	uninstall-pkgconfigDATA
 
 
-$(RAW_API): app-indicator.sources.xml
-	$(GAPI_PARSER) app-indicator.sources.xml
+$(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING)
+	$(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml
+
+$(WRAPPER_FREE_BINDING): $(WRAPPER_FREE_BINDING_SRC)
+	sed '/signals\[X_NEW_LABEL\] /,+6d' $(WRAPPER_FREE_BINDING_SRC) > $(WRAPPER_FREE_BINDING)
 
 $(MIDDLE_API): $(METADATA) $(RAW_API)
 	cp $(srcdir)/$(RAW_API) $(MIDDLE_API)
@@ -763,6 +777,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|" \
 		$< > $@
 
 generated-stamp: $(API) $(build_customs)
@@ -801,6 +818,14 @@ $(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
+
 # 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/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml
index 2649eb4..6cf28e9 100644
--- a/bindings/mono/app-indicator.sources.xml
+++ b/bindings/mono/app-indicator.sources.xml
@@ -1,8 +1,8 @@
 <gapi-parser-input>
 	<api filename="libappindicator-api.raw">
-		<library name="libappindicator.so.0">
+		<library name="appindicator.dll">
 			<namespace name="AppIndicator">
-				<file>../../src/app-indicator.c</file>
+				<file>app-indicator.c</file>
 				<file>../../src/app-indicator-enum-types.c</file>
 				<file>../../src/app-indicator-enum-types.h</file>
 				<file>../../src/app-indicator.h</file>
diff --git a/bindings/mono/appindicator-sharp.dll.config.in b/bindings/mono/appindicator-sharp.dll.config.in
index d0e9e1e..2d21d00 100644
--- a/bindings/mono/appindicator-sharp.dll.config.in
+++ b/bindings/mono/appindicator-sharp.dll.config.in
@@ -1,5 +1,5 @@
 <configuration>
-  <dllmap dll="appindicator-sharp.dll" target="libappindicator@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="appindicator.dll" target="libappindicator@LIB_PREFIX@.1@LIB_SUFFIX@"/>
   <dllmap dll="libgtk-2.0-0.dll" target="libgtk-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
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/libappindicator-api.raw b/bindings/mono/libappindicator-api.raw
index c0067ac..115c7cf 100644
--- a/bindings/mono/libappindicator-api.raw
+++ b/bindings/mono/libappindicator-api.raw
@@ -6,7 +6,7 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="AppIndicator" library="libappindicator.so.0">
+  <namespace name="AppIndicator" library="appindicator.dll">
     <enum name="Category" cname="AppIndicatorCategory" gtype="app_indicator_category_get_type" type="enum">
       <member cname="APP_INDICATOR_CATEGORY_APPLICATION_STATUS" name="ApplicationStatus" />
       <member cname="APP_INDICATOR_CATEGORY_COMMUNICATIONS" name="Communications" />
@@ -29,6 +29,12 @@
       <property name="PROP_ICON_THEME_PATH_S" cname="PROP_ICON_THEME_PATH_S" type="gchar*" readable="true" writeable="true" construct="true" />
       <property name="PROP_MENU_S" cname="PROP_MENU_S" type="DbusGObjectPath" readable="true" />
       <property name="PROP_CONNECTED_S" cname="PROP_CONNECTED_S" type="gboolean" readable="true" />
+      <property name="PROP_LABEL_S" cname="PROP_LABEL_S" type="gchar*" readable="true" writeable="true" />
+      <property name="PROP_LABEL_GUIDE_S" cname="PROP_LABEL_GUIDE_S" type="gchar*" readable="true" writeable="true" />
+      <property name="PROP_ORDERING_INDEX_S" cname="PROP_ORDERING_INDEX_S" type="guint" readable="true" writeable="true" />
+      <property name="PROP_X_ORDERING_INDEX_S" cname="PROP_X_ORDERING_INDEX_S" type="guint" readable="true" writeable="true" />
+      <property name="PROP_X_LABEL_S" cname="PROP_X_LABEL_S" type="gchar*" readable="true" writeable="true" />
+      <property name="PROP_X_LABEL_GUIDE_S" cname="PROP_X_LABEL_GUIDE_S" type="gchar*" readable="true" writeable="true" />
       <signal when="LAST" field_name="new_icon">
         <return-type type="void" />
         <parameters>
@@ -51,6 +57,15 @@
           <parameter type="gpointer" name="user_data" />
         </parameters>
       </signal>
+      <signal when="LAST" field_name="new_label">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="AppIndicator*" name="indicator" />
+          <parameter type="const-gchar*" name="label" />
+          <parameter type="const-gchar*" name="guide" />
+          <parameter type="gpointer" name="user_data" />
+        </parameters>
+      </signal>
       <signal when="LAST" field_name="connection_changed">
         <return-type type="void" />
         <parameters>
@@ -59,6 +74,14 @@
           <parameter type="gpointer" name="user_data" />
         </parameters>
       </signal>
+      <signal when="LAST" field_name="new_icon_theme_path">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="AppIndicator*" name="indicator" />
+          <parameter type="const-gchar*" name="icon_theme_path" />
+          <parameter type="gpointer" name="user_data" />
+        </parameters>
+      </signal>
       <virtual_method name="Fallback" cname="fallback">
         <return-type type="GtkStatusIcon*" />
         <parameters>
@@ -72,14 +95,6 @@
           <parameter type="GtkStatusIcon*" name="status_icon" />
         </parameters>
       </virtual_method>
-      <signal when="LAST" field_name="new_icon_theme_path">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="AppIndicator*" name="indicator" />
-          <parameter type="const-gchar*" name="icon_theme_path" />
-          <parameter type="gpointer" name="user_data" />
-        </parameters>
-      </signal>
       <method name="GetAttentionIcon" cname="app_indicator_get_attention_icon">
         <return-type type="const-gchar*" />
       </method>
@@ -95,9 +110,18 @@
       <method name="GetId" cname="app_indicator_get_id">
         <return-type type="const-gchar*" />
       </method>
+      <method name="GetLabel" cname="app_indicator_get_label">
+        <return-type type="const-gchar*" />
+      </method>
+      <method name="GetLabelGuide" cname="app_indicator_get_label_guide">
+        <return-type type="const-gchar*" />
+      </method>
       <method name="GetMenu" cname="app_indicator_get_menu">
         <return-type type="GtkMenu*" />
       </method>
+      <method name="GetOrderingIndex" cname="app_indicator_get_ordering_index">
+        <return-type type="guint32" />
+      </method>
       <method name="GetStatus" cname="app_indicator_get_status">
         <return-type type="AppIndicatorStatus" />
       </method>
@@ -137,12 +161,25 @@
           <parameter type="const-gchar*" name="icon_theme_path" />
         </parameters>
       </method>
+      <method name="SetLabel" cname="app_indicator_set_label">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="label" />
+          <parameter type="const-gchar*" name="guide" />
+        </parameters>
+      </method>
       <method name="SetMenu" cname="app_indicator_set_menu">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </method>
+      <method name="SetOrderingIndex" cname="app_indicator_set_ordering_index">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="guint32" name="ordering_index" />
+        </parameters>
+      </method>
       <method name="SetStatus" cname="app_indicator_set_status">
         <return-type type="void" />
         <parameters>
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")
diff --git a/configure b/configure
index 8c84dae..748187f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-application 0.2.8.
+# Generated by GNU Autoconf 2.67 for indicator-application 0.2.9.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-application'
 PACKAGE_TARNAME='indicator-application'
-PACKAGE_VERSION='0.2.8'
-PACKAGE_STRING='indicator-application 0.2.8'
+PACKAGE_VERSION='0.2.9'
+PACKAGE_STRING='indicator-application 0.2.9'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-application 0.2.8 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.2.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1581,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-application 0.2.8:";;
+     short | recursive ) echo "Configuration of indicator-application 0.2.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1718,7 +1718,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-application configure 0.2.8
+indicator-application configure 0.2.9
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1998,7 +1998,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-application $as_me 0.2.8, which was
+It was created by indicator-application $as_me 0.2.9, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2819,7 +2819,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-application
- VERSION=0.2.8
+ VERSION=0.2.9
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13695,7 +13695,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-application $as_me 0.2.8, which was
+This file was extended by indicator-application $as_me 0.2.9, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13761,7 +13761,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-application config.status 0.2.8
+indicator-application config.status 0.2.9
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 25e19c8..0ecea51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.2.8, ted@canonical.com)
+AC_INIT(indicator-application, 0.2.9, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.2.8)
+AM_INIT_AUTOMAKE(indicator-application, 0.2.9)
 
 AM_MAINTAINER_MODE
 
diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html
index 6ed73af..8048d83 100644
--- a/docs/reference/html/ch01.html
+++ b/docs/reference/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="Base Classes for Applications">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id500112"></a>Base Classes for Applications</h2></div></div></div>
+<a name="id329036"></a>Base Classes for Applications</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information
 		into the panel.</span>
diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index 687d69d..b40ee11 100644
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libappindicator Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libappindicator 0.2.5
+      for libappindicator 0.2.8
     </p></div>
 </div>
 <hr>
diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml
index ca18a64..13b3e8a 100644
--- a/docs/reference/libappindicator-docs.sgml
+++ b/docs/reference/libappindicator-docs.sgml
@@ -8,7 +8,7 @@
   <bookinfo>
     <title>libappindicator Reference Manual</title>
     <releaseinfo>
-      for libappindicator 0.2.8
+      for libappindicator 0.2.9
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index a45be46..1866a36 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.2.8
+0.2.9
author	Ted Gould <ted@gould.cx>	2010-09-22 11:14:11 -0500
committer	Ted Gould <ted@gould.cx>	2010-09-22 11:14:11 -0500
commit	f5e7b8efe61d35c65422284f49e5d01a614a9deb (patch)
tree	6d963d25b6b8c2a87d67b9e789622819efd84673
parent	c876d26568d76d4d06b319352cf63928f21dfba5 (diff)
parent	fe08c86fc6b9d9d843149bf195b995d7e38a2c40 (diff)
download	ayatana-indicator-application-f5e7b8efe61d35c65422284f49e5d01a614a9deb.tar.gz ayatana-indicator-application-f5e7b8efe61d35c65422284f49e5d01a614a9deb.tar.bz2 ayatana-indicator-application-f5e7b8efe61d35c65422284f49e5d01a614a9deb.zip