Merge lp:~mhr3/libappindicator/vala-bindings-fix into lp:libappindicator

[Michal Hruby]

Fixes type checking for Vala, bumped valac requirement (older vapigen cant handle gir properly)

[Ted Gould (ted)]

Thanks!

review: Approve

=== modified file 'bindings/vala/Makefile.am'
--- bindings/vala/Makefile.am	2011-02-04 00:48:02 +0000
+++ bindings/vala/Makefile.am	2011-09-23 15:49:53 +0000
@@ -25,9 +25,10 @@
 
 $(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 \
-	$<
+	$< $(vapiprefix)-custom.vala
 	
 
 CLEANFILES = $(vapi_DATA)

=== added file 'bindings/vala/appindicator-0.1-custom.vala'
--- bindings/vala/appindicator-0.1-custom.vala	1970-01-01 00:00:00 +0000
+++ bindings/vala/appindicator-0.1-custom.vala	2011-09-23 15:49:53 +0000
@@ -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 <[e-mail]>
+*/
+
+namespace AppIndicator {
+  [CCode (type_check_function = "IS_APP_INDICATOR")]
+  public class Indicator : GLib.Object {
+  }
+}
+
+// vim:et:ai:cindent:ts=2 sts=2 sw=2:

=== modified file 'bindings/vala/examples/indicator-example.vala'
--- bindings/vala/examples/indicator-example.vala	2011-07-20 01:20:54 +0000
+++ bindings/vala/examples/indicator-example.vala	2011-09-23 15:49:53 +0000
@@ -34,6 +34,7 @@
 
 		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");

=== modified file 'configure.ac'
--- configure.ac	2011-08-11 16:58:08 +0000
+++ configure.ac	2011-09-23 15:49:53 +0000
@@ -97,7 +97,7 @@
 # Vala Compiler support
 ###########################
 
-AM_PROG_VALAC([0.11.0])
+AM_PROG_VALAC([0.14.0])
 AM_CONDITIONAL(HAVE_VALAC, [test "x$VALAC" != "x"])
 
 ###########################