Import upstream version 0.4.90

9 files changed, 71 insertions, 40 deletions

diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index ece98bd..8f146cd 100644
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -174,6 +174,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 9a899e1..f4a59a8 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -3,7 +3,9 @@ SUBDIRS = . examples
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = appindicator-sharp-0.1.pc
 
+if BUILD_MONO_TEST
 TEST = AppIndicator.Test.dll
+endif
 
 API = libappindicator-api.xml
 MIDDLE_API = libappindicator-api.middle
@@ -40,16 +42,24 @@ CLEANFILES = \
 	$(API) \
 	$(MIDDLE_API) \
 	$(RAW_API) \
-	$(TEST) \
 	$(DLLPOLICY) \
 	$(DLLPOLICY1) \
 	$(WRAPPER_FREE_BINDING) \
 	$(POLICY).config \
 	$(POLICY1).config
 
+if BUILD_MONO_TEST
+CLEANFILES += $(TEST) 
+endif
+
 DISTCLEANFILES = $(ASSEMBLY).config
+
+if BUILD_MONO_TEST
 TEST_SOURCES = TestIndicator.cs
+endif
+
 customs = ApplicationIndicator.custom
+
 EXTRA_DIST =					\
 	AssemblyInfo.cs \
 	$(RAW_API)				\
@@ -60,13 +70,19 @@ EXTRA_DIST =					\
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
 	$(POLICY1).config.in \
-	$(customs)				\
-	$(TEST_SOURCES)
+	$(customs)
+
+if BUILD_MONO_TEST
+EXTRA_DIST += $(TEST_SOURCES)
+endif
 
 GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib
 
 references = $(GTK_SHARP_LIBS)
-test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
+
+if BUILD_MONO_TEST
+test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) $(MONO_NUNIT_LIBS) -r:$(ASSEMBLY)
+endif
 
 $(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING)
 	$(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml
@@ -84,12 +100,14 @@ $(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_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|AttentionIconName|" \
 		-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|" \
@@ -101,6 +119,8 @@ $(API): $(MIDDLE_API) Makefile.am
 		-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|" \
+		-e "s|PROP_TITLE_S|Title|" \
+		-e "s|PROP_TITLE_S|title|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
@@ -130,10 +150,12 @@ uninstall-local:
 	echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)";  \
             $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1;
 
+if BUILD_MONO_TEST
 $(TEST): $(ASSEMBLY) $(TEST_SOURCES)
 	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
 
 all: $(TEST)
+endif
 
 $(POLICY).config: $(POLICY).config.in Makefile
 	sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \
diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index b29add9..63e875f 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -34,6 +34,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_MONO_TEST_TRUE@am__append_1 = $(TEST) 
+@BUILD_MONO_TEST_TRUE@am__append_2 = $(TEST_SOURCES)
 subdir = bindings/mono
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/appindicator-sharp-0.1.pc.in \
@@ -202,6 +204,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
@@ -299,7 +303,7 @@ top_srcdir = @top_srcdir@
 SUBDIRS = . examples
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = appindicator-sharp-0.1.pc
-TEST = AppIndicator.Test.dll
+@BUILD_MONO_TEST_TRUE@TEST = AppIndicator.Test.dll
 API = libappindicator-api.xml
 MIDDLE_API = libappindicator-api.middle
 RAW_API = libappindicator-api.raw
@@ -325,40 +329,21 @@ TARGET = \
 
 assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
-CLEANFILES = \
-	$(ASSEMBLY) \
-	$(ASSEMBLY).mdb \
-	generated-stamp \
-	generated/*.cs \
-	$(API) \
-	$(MIDDLE_API) \
-	$(RAW_API) \
-	$(TEST) \
-	$(DLLPOLICY) \
-	$(DLLPOLICY1) \
-	$(WRAPPER_FREE_BINDING) \
-	$(POLICY).config \
-	$(POLICY1).config
-
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp \
+	generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(DLLPOLICY) \
+	$(DLLPOLICY1) $(WRAPPER_FREE_BINDING) $(POLICY).config \
+	$(POLICY1).config $(am__append_1)
 DISTCLEANFILES = $(ASSEMBLY).config
-TEST_SOURCES = TestIndicator.cs
+@BUILD_MONO_TEST_TRUE@TEST_SOURCES = TestIndicator.cs
 customs = ApplicationIndicator.custom
-EXTRA_DIST = \
-	AssemblyInfo.cs \
-	$(RAW_API)				\
-	$(METADATA)				\
-	appindicator-sharp-0.1.pc.in		\
-	appindicator-sharp.dll.config.in	\
-	app-indicator.sources.xml		\
-	$(ASSEMBLY_NAME).snk			\
-	$(POLICY).config.in \
-	$(POLICY1).config.in \
-	$(customs)				\
-	$(TEST_SOURCES)
-
+EXTRA_DIST = AssemblyInfo.cs $(RAW_API) $(METADATA) \
+	appindicator-sharp-0.1.pc.in appindicator-sharp.dll.config.in \
+	app-indicator.sources.xml $(ASSEMBLY_NAME).snk \
+	$(POLICY).config.in $(POLICY1).config.in $(customs) \
+	$(am__append_2)
 GACUTIL_FLAGS = -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib
 references = $(GTK_SHARP_LIBS)
-test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
+@BUILD_MONO_TEST_TRUE@test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) $(MONO_NUNIT_LIBS) -r:$(ASSEMBLY)
 api_includes = $(GTK_SHARP_CFLAGS)
 build_customs = $(addprefix $(srcdir)/, $(customs))
 all: all-recursive
@@ -777,12 +762,14 @@ $(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_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|AttentionIconName|" \
 		-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|" \
@@ -794,6 +781,8 @@ $(API): $(MIDDLE_API) Makefile.am
 		-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|" \
+		-e "s|PROP_TITLE_S|Title|" \
+		-e "s|PROP_TITLE_S|title|" \
 		$< > $@
 
 generated-stamp: $(API) $(build_customs)
@@ -819,10 +808,10 @@ uninstall-local:
 	echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)";  \
             $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1;
 
-$(TEST): $(ASSEMBLY) $(TEST_SOURCES)
-	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
+@BUILD_MONO_TEST_TRUE@$(TEST): $(ASSEMBLY) $(TEST_SOURCES)
+@BUILD_MONO_TEST_TRUE@	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
 
-all: $(TEST)
+@BUILD_MONO_TEST_TRUE@all: $(TEST)
 
 $(POLICY).config: $(POLICY).config.in Makefile
 	sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \
diff --git a/bindings/mono/examples/Makefile.in b/bindings/mono/examples/Makefile.in
index 7347a57..8fc9867 100644
--- a/bindings/mono/examples/Makefile.in
+++ b/bindings/mono/examples/Makefile.in
@@ -135,6 +135,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff --git a/bindings/mono/libappindicator-api.raw b/bindings/mono/libappindicator-api.raw
index 561b7a2..b7da653 100644
--- a/bindings/mono/libappindicator-api.raw
+++ b/bindings/mono/libappindicator-api.raw
@@ -34,6 +34,7 @@
       <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_DBUS_MENU_SERVER_S" cname="PROP_DBUS_MENU_SERVER_S" type="DbusmenuServer" readable="true" writeable="true" />
+      <property name="PROP_TITLE_S" cname="PROP_TITLE_S" type="gchar*" readable="true" writeable="true" />
       <signal when="LAST" field_name="new_icon">
         <return-type type="void" />
         <parameters>
@@ -149,6 +150,9 @@
       <method name="GetStatus" cname="app_indicator_get_status">
         <return-type type="AppIndicatorStatus" />
       </method>
+      <method name="GetTitle" cname="app_indicator_get_title">
+        <return-type type="const-gchar*" />
+      </method>
       <method name="GetType" cname="app_indicator_get_type" shared="true">
         <return-type type="GType" />
       </method>
@@ -230,6 +234,12 @@
           <parameter type="AppIndicatorStatus" name="status" />
         </parameters>
       </method>
+      <method name="SetTitle" cname="app_indicator_set_title">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="title" />
+        </parameters>
+      </method>
     </object>
   </namespace>
 </api>
\ No newline at end of file
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 0b606db..7febc11 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -19,7 +19,7 @@ pkgappindicator_PYTHON = __init__.py
 appindicatordir = $(pkgpyexecdir)/appindicator
 appindicator_LTLIBRARIES = _appindicator.la
 
-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6
+_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
 _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
 _appindicator_la_SOURCES = appindicatormodule.c
 nodist__appindicator_la_SOURCES = appindicator.c
diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in
index d1f1bb1..22b0809 100644
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
@@ -199,6 +199,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
@@ -309,7 +311,7 @@ pkgappindicatordir = $(pkgpythondir)/appindicator
 pkgappindicator_PYTHON = __init__.py
 appindicatordir = $(pkgpyexecdir)/appindicator
 appindicator_LTLIBRARIES = _appindicator.la
-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6
+_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
 _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
 _appindicator_la_SOURCES = appindicatormodule.c
 nodist__appindicator_la_SOURCES = appindicator.c
diff --git a/bindings/vala/Makefile.in b/bindings/vala/Makefile.in
index 96c8187..42c067c 100644
--- a/bindings/vala/Makefile.in
+++ b/bindings/vala/Makefile.in
@@ -198,6 +198,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff --git a/bindings/vala/examples/Makefile.in b/bindings/vala/examples/Makefile.in
index 69e13ae..7402bac 100644
--- a/bindings/vala/examples/Makefile.in
+++ b/bindings/vala/examples/Makefile.in
@@ -170,6 +170,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@