Import upstream version 0.4.0

4 files changed, 42 insertions, 2 deletions

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index f80b48c..65b980e 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -25,12 +25,16 @@ $(vapiprefix).deps:
 
 $(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \
                     $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \
+                    $(vapiprefix)-custom.vala \
                     $(vapiprefix).deps
 	$(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \
-	$<
+	$< $(srcdir)/$(vapiprefix)-custom.vala
 	
 
 CLEANFILES = $(vapi_DATA)
 
 endif
 endif
+
+EXTRA_DIST = \
+	appindicator-0.1-custom.vala
diff --git a/bindings/vala/Makefile.in b/bindings/vala/Makefile.in
index 139486b..a3fbbaa 100644
--- a/bindings/vala/Makefile.in
+++ b/bindings/vala/Makefile.in
@@ -302,6 +302,9 @@ top_srcdir = @top_srcdir@
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@vapi_DATA = $(vapiprefix).vapi $(vapiprefix).deps
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@DEPS = $(GTKVAPI)
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@CLEANFILES = $(vapi_DATA)
+EXTRA_DIST = \
+	appindicator-0.1-custom.vala
+
 all: all-recursive
 
 .SUFFIXES:
@@ -678,9 +681,10 @@ uninstall-am: uninstall-vapiDATA
 
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@                    $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@                    $(vapiprefix)-custom.vala \
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@                    $(vapiprefix).deps
 @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@	$(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \
-@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@	$<
+@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@	$< $(srcdir)/$(vapiprefix)-custom.vala
 
 # 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/vala/appindicator-0.1-custom.vala b/bindings/vala/appindicator-0.1-custom.vala
new file mode 100644
index 0000000..96152a2
--- /dev/null
+++ b/bindings/vala/appindicator-0.1-custom.vala
@@ -0,0 +1,31 @@
+/*
+ Copyright (C) 2011 Canonical, Ltd.
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of either or both of the following licenses:
+
+  1) the GNU Lesser General Public License version 3, as published by the
+     Free Software Foundation; and/or
+  2) the GNU Lesser General Public License version 2.1, as published by
+     the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the applicable version of the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of both the GNU Lesser General Public
+  License version 3 and version 2.1 along with this program.  If not, see
+  <http://www.gnu.org/licenses/>
+
+  Authored by Michal Hruby <michal.hruby@canonical.com>
+*/
+
+namespace AppIndicator {
+  [CCode (type_check_function = "IS_APP_INDICATOR")]
+  public class Indicator : GLib.Object {
+  }
+}
+
+// vim:et:ai:cindent:ts=2 sts=2 sw=2:
diff --git a/bindings/vala/examples/indicator-example.vala b/bindings/vala/examples/indicator-example.vala
index 7bb1d7d..8feb4ba 100644
--- a/bindings/vala/examples/indicator-example.vala
+++ b/bindings/vala/examples/indicator-example.vala
@@ -34,6 +34,7 @@ public class IndicatorExample {
 
 		var indicator = new Indicator(win.title, "indicator-messages",
 				                      IndicatorCategory.APPLICATION_STATUS);
+		if (!(indicator is Indicator)) return -1;
 
 		indicator.set_status(IndicatorStatus.ACTIVE);
 		indicator.set_attention_icon("indicator-messages-new");