=== modified file 'bindings/mono/Makefile.am'
--- bindings/mono/Makefile.am 2012-02-03 19:40:14 +0000
+++ bindings/mono/Makefile.am 2012-03-07 01:34:18 +0000
@@ -66,7 +66,7 @@
$(METADATA) \
appindicator-sharp-0.1.pc.in \
appindicator-sharp.dll.config.in \
- app-indicator.sources.xml \
+ app-indicator.sources.xml.in \
$(ASSEMBLY_NAME).snk \
$(POLICY).config.in \
$(POLICY1).config.in \
@@ -85,13 +85,13 @@
endif
$(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING)
- $(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml
+ $(GAPI_PARSER) app-indicator.sources.xml
$(WRAPPER_FREE_BINDING): $(WRAPPER_FREE_BINDING_SRC)
sed '/signals\[X_NEW_LABEL\] /,+6d' $(WRAPPER_FREE_BINDING_SRC) > $(WRAPPER_FREE_BINDING)
$(MIDDLE_API): $(METADATA) $(RAW_API)
- cp $(srcdir)/$(RAW_API) $(MIDDLE_API)
+ cp $(RAW_API) $(MIDDLE_API)
chmod u+w $(MIDDLE_API)
@if test -n '$(METADATA)'; then \
echo "$(GAPI_FIXUP) --api=$(MIDDLE_API) --metadata=$(srcdir)/$(METADATA)"; \
=== removed file 'bindings/mono/app-indicator.sources.xml'
--- bindings/mono/app-indicator.sources.xml 2010-09-19 19:47:07 +0000
+++ bindings/mono/app-indicator.sources.xml 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-
-
-
-
- app-indicator.c
- ../../src/app-indicator-enum-types.c
- ../../src/app-indicator-enum-types.h
- ../../src/app-indicator.h
-
-
-
-
=== added file 'bindings/mono/app-indicator.sources.xml.in'
--- bindings/mono/app-indicator.sources.xml.in 1970-01-01 00:00:00 +0000
+++ bindings/mono/app-indicator.sources.xml.in 2012-03-07 01:34:18 +0000
@@ -0,0 +1,12 @@
+
+
+
+
+ @top_builddir@/bindings/mono/app-indicator.c
+ @top_builddir@/src/app-indicator-enum-types.c
+ @top_builddir@/src/app-indicator-enum-types.h
+ @top_srcdir@/src/app-indicator.h
+
+
+
+
=== modified file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am 2012-01-27 22:03:16 +0000
+++ bindings/python/Makefile.am 2012-03-07 01:34:18 +0000
@@ -25,16 +25,15 @@
nodist__appindicator_la_SOURCES = appindicator.c
CLEANFILES = appindicator.c
-EXTRA_DIST = appindicator.override appindicator-arg-types.py $(defs_DATA)
+EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA)
appindicator.c: $(defs_DATA) appindicator.override
%.c: %.defs
- (cd $(srcdir) \
- && $(PYGTK_CODEGEN) \
+ ($(PYGTK_CODEGEN) \
--register $(PYGTK_DEFSDIR)/gtk-types.defs \
--register $(PYGTK_DEFSDIR)/gdk-types.defs \
- --load-types appindicator-arg-types.py \
+ --load-types $(srcdir)/appindicator-arg-types.py \
--override $*.override \
- --prefix py$* $*.defs) > gen-$*.c \
+ --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \
&& cp gen-$*.c $*.c \
&& rm -f gen-$*.c
=== removed file 'bindings/python/appindicator.override'
--- bindings/python/appindicator.override 2010-04-29 16:31:36 +0000
+++ bindings/python/appindicator.override 1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
-Python bindings for libappindicator.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
- Eitan Isaacson (original)
- Neil Jagdish Patel
-
-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
-
-*/
-%%
-headers
-#include
-#include "../src/app-indicator.h"
-#include "../src/app-indicator-enum-types.h"
-#include
-#include "pygobject.h"
-#include "pyglib.h"
-#include
-
-typedef PyObject* (*to_pyobject_func) (gpointer data);
-
-#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE
-
-void
-_appindicator_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-#ifdef VERSION
- PyModule_AddStringConstant(module, "__version__", VERSION);
-#endif
- pyg_enum_add(module,
- "IndicatorCategory",
- strip_prefix,
- APP_INDICATOR_TYPE_INDICATOR_CATEGORY);
-
- pyg_enum_add(module,
- "IndicatorStatus",
- strip_prefix,
- APP_INDICATOR_TYPE_INDICATOR_STATUS);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-%%
-modulename appindicator
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Menu as PyGtkMenu_Type
=== added file 'bindings/python/appindicator.override.in'
--- bindings/python/appindicator.override.in 1970-01-01 00:00:00 +0000
+++ bindings/python/appindicator.override.in 2012-03-07 01:34:18 +0000
@@ -0,0 +1,65 @@
+/*
+Python bindings for libappindicator.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Eitan Isaacson (original)
+ Neil Jagdish Patel
+
+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
+
+*/
+%%
+headers
+#include
+#include "@top_srcdir@/src/app-indicator.h"
+#include "@top_builddir@/src/app-indicator-enum-types.h"
+#include
+#include "pygobject.h"
+#include "pyglib.h"
+#include
+
+typedef PyObject* (*to_pyobject_func) (gpointer data);
+
+#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE
+
+void
+_appindicator_add_constants(PyObject *module, const gchar *strip_prefix)
+{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
+ pyg_enum_add(module,
+ "IndicatorCategory",
+ strip_prefix,
+ APP_INDICATOR_TYPE_INDICATOR_CATEGORY);
+
+ pyg_enum_add(module,
+ "IndicatorStatus",
+ strip_prefix,
+ APP_INDICATOR_TYPE_INDICATOR_STATUS);
+
+ if (PyErr_Occurred())
+ PyErr_Print();
+}
+%%
+modulename appindicator
+%%
+import gobject.GObject as PyGObject_Type
+import gtk.Menu as PyGtkMenu_Type
=== modified file 'configure.ac'
--- configure.ac 2012-02-03 19:31:38 +0000
+++ configure.ac 2012-03-07 01:34:18 +0000
@@ -228,9 +228,11 @@
bindings/mono/Makefile
bindings/mono/appindicator-sharp.dll.config
bindings/mono/appindicator-sharp-0.1.pc
+bindings/mono/app-indicator.sources.xml
bindings/mono/examples/Makefile
bindings/mono/examples/indicator-example
bindings/python/Makefile
+bindings/python/appindicator.override
bindings/vala/Makefile
bindings/vala/examples/Makefile
tests/Makefile