* New upstream release.

  * Unref the child that was created
  * Build GIR and VAPI files (LP: #510610)
  * Fixes to documentation and enum construction
  * Fix distcheck
  * Merging patch to add assembly information to Mono
    binding (LP: #547195)
* debian/control: Add GObject Introspection and Vala build
  dependencies.
* Added debian/gir1.0-libappindicator-0.1.install and modified
  debian/control and debian/libappindicator-dev.install to handle
  the VAPI and GI files.
* debian/libappindicator0.0-cil.install: Fixing directory of cli files 

10 files changed, 268 insertions, 50 deletions

diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index 6c86129..8075da5 100644
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -147,6 +147,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+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@
 LIBOBJS = @LIBOBJS@
@@ -193,6 +201,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index e573c9b..4d2d8b4 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -12,13 +12,14 @@ METADATA = libappindicator-api.metadata
 ASSEMBLY_NAME = appindicator-sharp
 ASSEMBLY = appindicator-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
-assemblydir = $(libdir)/appindicator-sharp-0.1
+assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST)
 DISTCLEANFILES = $(ASSEMBLY).config
 TEST_SOURCES = TestIndicator.cs
 customs = ApplicationIndicator.custom
 EXTRA_DIST =					\
+	AssemblyInfo.cs \
 	$(RAW_API)				\
 	$(METADATA)				\
 	appindicator-sharp-0.1.pc.in		\
@@ -45,21 +46,13 @@ $(MIDDLE_API): $(METADATA) $(RAW_API)
 	fi
 
 $(API): $(MIDDLE_API) Makefile.am
-	sed -e "s|PROP_ID_S|ID|" \
-		-e "s|PROP_ID_S|id|" \
-		-e "s|PROP_STATUS_S|Status|" \
+	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|IconName|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
-		-e "s|PROP_ATTENTION_ICON_NAME_S|AttentionIconName|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
-		-e "s|PROP_ICON_THEME_PATH_S|IconThemePath|" \
 		-e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \
-		-e "s|PROP_MENU_S|Menu|" \
 		-e "s|PROP_MENU_S|menu|" \
-		-e "s|PROP_CONNECTED_S|Connected|" \
 		-e "s|PROP_CONNECTED_S|connected|" \
 		$< > $@
 
@@ -74,9 +67,9 @@ generated-stamp: $(API) $(build_customs)
 	--outdir=generated --assembly-name=$(ASSEMBLY_NAME)	\
 	&& touch generated-stamp
 
-$(ASSEMBLY): generated-stamp
+$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
+	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs
 
 install-data-local:
 	echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index f029d16..bb51068 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -175,6 +175,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+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@
 LIBOBJS = @LIBOBJS@
@@ -221,6 +229,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -289,13 +298,14 @@ METADATA = libappindicator-api.metadata
 ASSEMBLY_NAME = appindicator-sharp
 ASSEMBLY = appindicator-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
-assemblydir = $(libdir)/appindicator-sharp-0.1
+assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST)
 DISTCLEANFILES = $(ASSEMBLY).config
 TEST_SOURCES = TestIndicator.cs
 customs = ApplicationIndicator.custom
 EXTRA_DIST = \
+	AssemblyInfo.cs \
 	$(RAW_API)				\
 	$(METADATA)				\
 	appindicator-sharp-0.1.pc.in		\
@@ -722,21 +732,13 @@ $(MIDDLE_API): $(METADATA) $(RAW_API)
 	fi
 
 $(API): $(MIDDLE_API) Makefile.am
-	sed -e "s|PROP_ID_S|ID|" \
-		-e "s|PROP_ID_S|id|" \
-		-e "s|PROP_STATUS_S|Status|" \
+	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|IconName|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
-		-e "s|PROP_ATTENTION_ICON_NAME_S|AttentionIconName|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
-		-e "s|PROP_ICON_THEME_PATH_S|IconThemePath|" \
 		-e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \
-		-e "s|PROP_MENU_S|Menu|" \
 		-e "s|PROP_MENU_S|menu|" \
-		-e "s|PROP_CONNECTED_S|Connected|" \
 		-e "s|PROP_CONNECTED_S|connected|" \
 		$< > $@
 
@@ -747,9 +749,9 @@ generated-stamp: $(API) $(build_customs)
 	--outdir=generated --assembly-name=$(ASSEMBLY_NAME)	\
 	&& touch generated-stamp
 
-$(ASSEMBLY): generated-stamp
+$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs
 
 install-data-local:
 	echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml
index 3585c44..0d82430 100644
--- a/bindings/mono/app-indicator.sources.xml
+++ b/bindings/mono/app-indicator.sources.xml
@@ -2,7 +2,7 @@
 	<api filename="libappindicator-api.raw">
 		<library name="libappindicator.so.0">
 			<namespace name="AppIndicator">
-				<directory path="../../src/libappindicator">
+				<directory path="../../src">
 					<exclude>app-indicator-enum-types.h.in</exclude>
 					<exclude>app-indicator-enum-types.c.in</exclude>
 				</directory>
diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in
index cd0525e..11ae719 100644
--- a/bindings/mono/appindicator-sharp-0.1.pc.in
+++ b/bindings/mono/appindicator-sharp-0.1.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-assemblies_dir=${libdir}/cli/appindicator-sharp-0.0
+assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
 
 Name: appindicator-sharp
 Description: application indicators for .NET
diff --git a/bindings/mono/examples/Makefile.in b/bindings/mono/examples/Makefile.in
index 3de1765..3148d40 100644
--- a/bindings/mono/examples/Makefile.in
+++ b/bindings/mono/examples/Makefile.in
@@ -108,6 +108,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+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@
 LIBOBJS = @LIBOBJS@
@@ -154,6 +162,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index c94cc5b..8f9df53 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -9,27 +9,33 @@
 	<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']/property[@cname='id']" name="name">ID</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="hidden"></attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="hidden"></attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='icon-name']" name="name">IconName</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='attention-icon-name']" name="name">AttentionIconName</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='menu']" name="name">Menu</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='menu']" name="type">GtkMenu*</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='connected']" name="name">Connected</attr>
-        <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</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>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="hidden">true</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_ICON_THEME_PATH_S']" name="name">IconThemePath</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']" />
+    <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='id']" name="property_name">id</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='icon_name']" name="property_name">icon-name</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='category']" name="property_name">category</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='id']" name="property_name">id</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='icon_name']" name="property_name">icon-name</attr>
+    <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_path']" name="property_name">icon-theme-path</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']" />
+    <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_attention_icon']" />
 </metadata>
diff --git a/bindings/mono/libappindicator-api.raw b/bindings/mono/libappindicator-api.raw
index a9b98cb..a42560c 100644
--- a/bindings/mono/libappindicator-api.raw
+++ b/bindings/mono/libappindicator-api.raw
@@ -19,15 +19,185 @@
       <member cname="APP_INDICATOR_STATUS_ACTIVE" name="Active" />
       <member cname="APP_INDICATOR_STATUS_ATTENTION" name="Attention" />
     </enum>
+    <callback name="OrgAyatanaIndicatorApplicationServiceGetApplicationsReply" cname="org_ayatana_indicator_application_service_get_applications_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="GPtrArray*" name="OUT_applications" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgFreedesktop_DBus_PropertiesGetAllReply" cname="org_freedesktop_DBus_Properties_get_all_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="GHashTable*" name="OUT_Properties" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgFreedesktop_DBus_PropertiesGetReply" cname="org_freedesktop_DBus_Properties_get_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="GValue" name="OUT_Value" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgFreedesktop_DBus_PropertiesSetReply" cname="org_freedesktop_DBus_Properties_set_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgKde_StatusNotifierWatcherIsNotificationHostRegisteredReply" cname="org_kde_StatusNotifierWatcher_is_notification_host_registered_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="gboolean" name="OUT_hasHost" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgKde_StatusNotifierWatcherProtocolVersionReply" cname="org_kde_StatusNotifierWatcher_protocol_version_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="char*" name="OUT_version" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgKde_StatusNotifierWatcherRegisterNotificationHostReply" cname="org_kde_StatusNotifierWatcher_register_notification_host_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgKde_StatusNotifierWatcherRegisterStatusNotifierItemReply" cname="org_kde_StatusNotifierWatcher_register_status_notifier_item_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <callback name="OrgKde_StatusNotifierWatcherRegisteredStatusNotifierItemsReply" cname="org_kde_StatusNotifierWatcher_registered_status_notifier_items_reply">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="DBusGProxy*" name="proxy" />
+        <parameter type="char*" name="*" />
+        <parameter type="GError*" name="error" />
+        <parameter type="gpointer" name="userdata" />
+      </parameters>
+    </callback>
+    <object name="ApplicationServiceAppstore" cname="ApplicationServiceAppstore" parent="GObject">
+      <signal name="ApplicationAdded" cname="application-added" when="LAST" field_name="application_added">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceAppstore*" name="appstore" />
+          <parameter type="gchar*" name="arg2" />
+          <parameter type="gint" name="arg3" />
+          <parameter type="gchar*" name="arg4" />
+          <parameter type="gchar*" name="arg5" />
+          <parameter type="gpointer" name="arg6" />
+        </parameters>
+      </signal>
+      <signal name="ApplicationRemoved" cname="application-removed" when="LAST" field_name="application_removed">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceAppstore*" name="appstore" />
+          <parameter type="gint" name="arg2" />
+          <parameter type="gpointer" name="arg3" />
+        </parameters>
+      </signal>
+      <signal name="ApplicationIconChanged" cname="application-icon-changed" when="LAST" field_name="application_icon_changed">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceAppstore*" name="appstore" />
+          <parameter type="gint" name="arg2" />
+          <parameter type="const-gchar*" name="arg3" />
+          <parameter type="gpointer" name="arg4" />
+        </parameters>
+      </signal>
+      <method name="ApplicationAdd" cname="application_service_appstore_application_add">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="dbus_name" />
+          <parameter type="const-gchar*" name="dbus_object" />
+        </parameters>
+      </method>
+      <method name="ApplicationRemove" cname="application_service_appstore_application_remove">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="dbus_name" />
+          <parameter type="const-gchar*" name="dbus_object" />
+        </parameters>
+      </method>
+      <method name="GetType" cname="application_service_appstore_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <constructor cname="application_service_appstore_new">
+        <parameters>
+          <parameter type="AppLruFile*" name="lrufile" />
+        </parameters>
+      </constructor>
+    </object>
+    <object name="ApplicationServiceWatcher" cname="ApplicationServiceWatcher" parent="GObject">
+      <signal name="ServiceRegistered" cname="service-registered" when="LAST" field_name="service_registered">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceWatcher*" name="watcher" />
+          <parameter type="gchar*" name="object" />
+          <parameter type="gpointer" name="data" />
+        </parameters>
+      </signal>
+      <signal name="ServiceUnregistered" cname="service-unregistered" when="LAST" field_name="service_unregistered">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceWatcher*" name="watcher" />
+          <parameter type="gchar*" name="object" />
+          <parameter type="gpointer" name="data" />
+        </parameters>
+      </signal>
+      <signal name="NotificationHostRegistered" cname="notification-host-registered" when="LAST" field_name="notification_host_registered">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceWatcher*" name="watcher" />
+          <parameter type="gpointer" name="data" />
+        </parameters>
+      </signal>
+      <signal name="NotificationHostUnregistered" cname="notification-host-unregistered" when="LAST" field_name="notification_host_unregistered">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ApplicationServiceWatcher*" name="watcher" />
+          <parameter type="gpointer" name="data" />
+        </parameters>
+      </signal>
+      <method name="GetType" cname="application_service_watcher_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <constructor cname="application_service_watcher_new">
+        <parameters>
+          <parameter type="ApplicationServiceAppstore*" name="appstore" />
+        </parameters>
+      </constructor>
+    </object>
     <object name="AppIndicator" cname="AppIndicator" parent="GObject">
       <field name="Priv" cname="priv" type="AppIndicatorPrivate*" />
       <property name="PROP_ID_S" cname="PROP_ID_S" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <property name="PROP_CATEGORY_S" cname="PROP_CATEGORY_S" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <property name="PROP_STATUS_S" cname="PROP_STATUS_S" type="gchar*" readable="true" writeable="true" />
-      <property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="true" />
+      <property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="true" construct="true" />
       <property name="PROP_ATTENTION_ICON_NAME_S" cname="PROP_ATTENTION_ICON_NAME_S" type="gchar*" readable="true" writeable="true" />
       <property name="PROP_ICON_THEME_PATH_S" cname="PROP_ICON_THEME_PATH_S" type="gchar*" readable="true" writeable="true" construct-only="true" />
-      <property name="PROP_MENU_S" cname="PROP_MENU_S" type="gchar*" readable="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" />
       <signal when="LAST" field_name="new_icon">
         <return-type type="void" />
@@ -133,5 +303,25 @@
         </parameters>
       </method>
     </object>
+    <object name="AppLruFile" cname="AppLruFile" parent="GObject">
+      <method name="GetType" cname="app_lru_file_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <constructor cname="app_lru_file_new" />
+      <method name="Sort" cname="app_lru_file_sort">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="const-gchar*" name="id_a" />
+          <parameter type="const-gchar*" name="id_b" />
+        </parameters>
+      </method>
+      <method name="Touch" cname="app_lru_file_touch">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="id" />
+          <parameter type="const-gchar*" name="category" />
+        </parameters>
+      </method>
+    </object>
   </namespace>
 </api>
\ No newline at end of file
diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in
index e680e1b..752d94f 100644
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
@@ -172,6 +172,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+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@
 LIBOBJS = @LIBOBJS@
@@ -218,6 +226,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALA_API_GEN = @VALA_API_GEN@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/bindings/python/appindicator.override b/bindings/python/appindicator.override
index a01a9a6..b252994 100644
--- a/bindings/python/appindicator.override
+++ b/bindings/python/appindicator.override
@@ -28,8 +28,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 %%
 headers
 #include <Python.h>
-#include "../src/libappindicator/app-indicator.h"
-#include "../src/libappindicator/app-indicator-enum-types.h"
+#include "../src/app-indicator.h"
+#include "../src/app-indicator-enum-types.h"
 #include <glib.h>
 #include "pygobject.h"
 #include "pyglib.h"