Merging in Robert's changes.

6 files changed, 36 insertions, 2 deletions

diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index 86ef22a..3dd211d 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -1,6 +1,5 @@
 
-SUBDIRS = \
-	tests
+SUBDIRS = tests
 
 INCLUDES= \
 	-DG_LOG_DOMAIN=\"libindicate\"
@@ -46,3 +45,6 @@ dbus-indicate-server.h: indicate-server.xml
 		--mode=glib-server \
 		--output=dbus-indicate-server.h \
 		$(srcdir)/indicate-server.xml
+
+pkgconfig_DATA = indicate.pc
+pkgconfigdir = $(libdir)/pkgconfig
diff --git a/libindicate/gir.sh b/libindicate/gir.sh
new file mode 100644
index 0000000..e6cdd63
--- /dev/null
+++ b/libindicate/gir.sh
@@ -0,0 +1,2 @@
+g-ir-scanner -v --namespace Indicate --nsversion=0.1 --add-include-path=. --include=GObject-2.0 --include=GLib-2.0 --library=indicate --pkg indicate --output Indicate-0.1.gir indicator.h server.h
+g-ir-compiler --includedir=. Indicate-0.1.gir -o Indicate-0.1.typelib
diff --git a/libindicate/indicate.pc.in b/libindicate/indicate.pc.in
new file mode 100644
index 0000000..cdc79b6
--- /dev/null
+++ b/libindicate/indicate.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+Cflags: -I${includedir}/libindicate-0.1
+Requires: gtk+-2.0 dbus-glib-1
+Libs: -L${libdir} -lindicate
+
+Name: libindicate
+Description: libindicate.
+Version: @VERSION@
+
diff --git a/libindicate/indicator.h b/libindicate/indicator.h
index 3c8efc8..2a15e3b 100644
--- a/libindicate/indicator.h
+++ b/libindicate/indicator.h
@@ -5,6 +5,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 /* Boilerplate */
 #define INDICATE_TYPE_INDICATOR (indicate_indicator_get_type ())
 #define INDICATE_INDICATOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_INDICATOR, IndicateIndicator))
@@ -43,6 +45,8 @@ struct _IndicateIndicatorClass {
 	const gchar * (*get_type) (IndicateIndicator * indicator);
 };
 
+GType indicate_indicator_get_type(void) G_GNUC_CONST;
+
 IndicateIndicator * indicate_indicator_new (void);
 
 /* Should these just be GObject properties? */
@@ -61,6 +65,7 @@ guint indicate_indicator_get_id (IndicateIndicator * indicator);
  * subclass and exported through this pretty function */
 const gchar * indicate_indicator_get_indicator_type (IndicateIndicator * indicator);
 
+G_END_DECLS
 
 #endif /* INDICATE_INDICATOR_H_INCLUDED__ */
 
diff --git a/libindicate/server.h b/libindicate/server.h
index 8a61293..e119cfd 100644
--- a/libindicate/server.h
+++ b/libindicate/server.h
@@ -5,6 +5,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 /* Boilerplate */
 #define INDICATE_TYPE_SERVER (indicate_server_get_type ())
 #define INDICATE_SERVER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_SERVER, IndicateServer))
@@ -48,6 +50,8 @@ struct _IndicateServerClass {
 	gboolean (*show_indicator_to_user) (IndicateServer * server, guint id, GError ** error);
 };
 
+GType indicate_server_get_type (void) G_GNUC_CONST;
+
 /* Create a new server */
 IndicateServer * indicate_server_new (void);
 
@@ -82,6 +86,7 @@ gboolean indicate_server_get_indicator_property_group (IndicateServer * server,
 gboolean indicate_server_get_indicator_properties (IndicateServer * server, guint id, gchar *** properties, GError **error);
 gboolean indicate_server_show_indicator_to_user (IndicateServer * server, guint id, GError ** error);
 
+G_END_DECLS
 
 #endif /* INDICATE_INDICATOR_H_INCLUDED__ */
 
diff --git a/libindicate/tests/test.js b/libindicate/tests/test.js
new file mode 100755
index 0000000..45b0d05
--- /dev/null
+++ b/libindicate/tests/test.js
@@ -0,0 +1,6 @@
+#!/usr/local/bin/seed
+Seed.import_namespace("Indicate");
+
+var indicator = new Indicate.Indicator();
+
+indicator.show();