Fork from Ubuntu's libappindicator project.

26 files changed, 99 insertions, 89 deletions

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index d1f6d73..d2a1ac5 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -10,3 +10,5 @@ endif
 if HAS_MONO
 SUBDIRS += mono
 endif
+
+DISTCLEANFILES = Makefile.in
\ No newline at end of file
diff --git a/bindings/mono/ApplicationIndicator.custom b/bindings/mono/ApplicationIndicator.custom
index fcc52d7..4992c08 100644
--- a/bindings/mono/ApplicationIndicator.custom
+++ b/bindings/mono/ApplicationIndicator.custom
@@ -1,16 +1,16 @@
-[DllImport ("appindicator.dll")]
+[DllImport ("ayatana-appindicator.dll")]
 static extern int app_indicator_get_status (IntPtr i);
 
-[DllImport ("appindicator.dll")]
+[DllImport ("ayatana-appindicator.dll")]
 static extern int app_indicator_get_category (IntPtr i);
 
-[DllImport ("appindicator.dll")]
+[DllImport ("ayatana-appindicator.dll")]
 static extern void app_indicator_set_status (IntPtr i, int s);
 
         [GLib.Property ("status")]
-        public Status Status {
+        public AppIndicatorStatus AppIndicatorStatus {
                get {
-                   return (Status) app_indicator_get_status (Handle);
+                   return (AppIndicatorStatus) app_indicator_get_status (Handle);
                }
 
                set {
@@ -19,8 +19,8 @@ static extern void app_indicator_set_status (IntPtr i, int s);
         }
 
         [GLib.Property ("category")]
-        public Category Category {
+        public AppIndicatorCategory AppIndicatorCategory {
                get {
-                   return (Category) app_indicator_get_category (Handle);
+                   return (AppIndicatorCategory) app_indicator_get_category (Handle);
                }
         }
diff --git a/bindings/mono/AssemblyInfo.cs b/bindings/mono/AssemblyInfo.cs
index 0417db6..4b3e671 100644
--- a/bindings/mono/AssemblyInfo.cs
+++ b/bindings/mono/AssemblyInfo.cs
@@ -20,11 +20,11 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle ("Application Indicators")]
-[assembly: AssemblyDescription ("Ubuntu Application Indicators")]
+[assembly: AssemblyDescription ("Ayatana Application Indicators")]
 [assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Canonical, Ltd.")]
-[assembly: AssemblyProduct ("Ubuntu")]
-[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")]
+[assembly: AssemblyCompany ("Ayatana Project")]
+[assembly: AssemblyProduct ("Ayatana AppIndicators")]
+[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.; © 2015 Mike Gabriel")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]
-[assembly: AssemblyVersion ("0.2")]
+[assembly: AssemblyVersion ("0.5.0.0")]
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 6f8e8a9..2424a62 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -1,18 +1,18 @@
 SUBDIRS = . examples
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = appindicator-sharp-0.1.pc
+pkgconfig_DATA = ayatana-appindicator-sharp-0.1.pc
 
 if BUILD_MONO_TEST
-TEST = AppIndicator.Test.dll
+TEST = AyatanaAppIndicator.Test.dll
 endif
 
-API = libappindicator-api.xml
-MIDDLE_API = libappindicator-api.middle
-RAW_API = libappindicator-api.raw
-METADATA = libappindicator-api.metadata
-ASSEMBLY_NAME = appindicator-sharp
-ASSEMBLY_VERSION = 0.2.0.0
+API = libayatana-appindicator-api.xml
+MIDDLE_API = libayatana-appindicator-api.middle
+RAW_API = libayatana-appindicator-api.raw
+METADATA = libayatana-appindicator-api.metadata
+ASSEMBLY_NAME = ayatana-appindicator-sharp
+ASSEMBLY_VERSION = 0.5.0.0
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME)
 POLICY_VERSION = 0.0
@@ -31,7 +31,7 @@ TARGET = \
 	$(DLLPOLICY1) \
 	$(POLICY1).config
 
-assemblydir = $(libdir)/cli/appindicator-sharp-0.1
+assemblydir = $(libdir)/cli/ayatana-appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
 
 CLEANFILES = \
@@ -55,7 +55,7 @@ endif
 DISTCLEANFILES = $(ASSEMBLY).config
 
 if BUILD_MONO_TEST
-TEST_SOURCES = TestIndicator.cs
+TEST_SOURCES = TestAyatanaIndicator.cs
 endif
 
 customs = ApplicationIndicator.custom
@@ -64,8 +64,8 @@ EXTRA_DIST =					\
 	AssemblyInfo.cs \
 	$(RAW_API)				\
 	$(METADATA)				\
-	appindicator-sharp-0.1.pc.in		\
-	appindicator-sharp.dll.config.in	\
+	ayatana-appindicator-sharp-0.1.pc.in		\
+	ayatana-appindicator-sharp.dll.config.in	\
 	app-indicator.sources.xml.in		\
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
@@ -173,3 +173,5 @@ $(POLICY1).config: $(POLICY1).config.in Makefile
 
 $(DLLPOLICY1): $(POLICY1).config $(ASSEMBLY_NAME).snk Makefile
 	$(AL) -link:$(POLICY1).config -out:$(DLLPOLICY1) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk
+
+DISTCLEANFILES += Makefile.in
diff --git a/bindings/mono/TestIndicator.cs b/bindings/mono/TestAyatanaIndicator.cs
index 3127342..61fc53c 100644
--- a/bindings/mono/TestIndicator.cs
+++ b/bindings/mono/TestAyatanaIndicator.cs
@@ -20,11 +20,11 @@
 using System;
 using GLib;
 using Gtk;
-using AppIndicator;
+using AyatanaAppIndicator;
 
 using NUnit.Framework;
 
-namespace Ayatana.AppIndicator.Test
+namespace Ayatana.AyatanaAppIndicator.Test
 {
         [TestFixture]
         public class IndicatorTest
@@ -44,7 +44,7 @@ namespace Ayatana.AppIndicator.Test
 
                         Console.WriteLine ("Init()");
 
-                        indicator = new ApplicationIndicator ("my-id", "my-name", Category.ApplicationStatus);
+                        indicator = new ApplicationIndicator ("my-id", "my-name", AppIndicatorCategory.ApplicationStatus);
 
                         Console.WriteLine ("Created indicator");
 
@@ -60,7 +60,7 @@ namespace Ayatana.AppIndicator.Test
 
                         Assert.AreEqual (indicator.IconName, "my-name");
                         Assert.AreEqual (indicator.ID, "my-id");
-                        Assert.AreEqual (indicator.Status, Category.ApplicationStatus);
+                        Assert.AreEqual (indicator.AppIndicatorStatus, AppIndicatorCategory.ApplicationStatus);
 
                         Console.WriteLine ("End..");
                 }
@@ -70,10 +70,10 @@ namespace Ayatana.AppIndicator.Test
                 {
                         Console.WriteLine ("TestSetProperties");
 
-                        indicator.Status = Status.Attention;
+                        indicator.AppIndicatorStatus = AppIndicatorStatus.Attention;
                         indicator.AttentionIconName = "my-attention-name";
 
-                        Assert.AreEqual (indicator.Status, Status.Attention);
+                        Assert.AreEqual (indicator.AppIndicatorStatus, AppIndicatorStatus.Attention);
                         Assert.AreEqual (indicator.AttentionIconName, "my-attention-name");
 
                         Console.WriteLine ("End..");
diff --git a/bindings/mono/app-indicator.sources.xml.in b/bindings/mono/app-indicator.sources.xml.in
index 7f8e869..9a283ea 100644
--- a/bindings/mono/app-indicator.sources.xml.in
+++ b/bindings/mono/app-indicator.sources.xml.in
@@ -1,7 +1,7 @@
 <gapi-parser-input>
-	<api filename="libappindicator-api.raw">
-		<library name="appindicator.dll">
-			<namespace name="AppIndicator">
+	<api filename="libayatana-appindicator-api.raw">
+		<library name="ayatana-appindicator.dll">
+			<namespace name="AyatanaAppIndicator">
 				<file>@top_builddir@/bindings/mono/app-indicator.c</file>
 				<file>@top_builddir@/src/app-indicator-enum-types.c</file>
 				<file>@top_builddir@/src/app-indicator-enum-types.h</file>
diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in
deleted file mode 100644
index f63c01e..0000000
--- a/bindings/mono/appindicator-sharp-0.1.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
-
-Name: appindicator-sharp
-Description: application indicators for .NET
-Version: @VERSION@
-Libraries: ${assemblies_dir}/appindicator-sharp.dll ${assemblies_dir}/appindicator-sharp.dll.config
-Requires: gtk-sharp-2.0
-Cflags:
-Libs: -r:${assemblies_dir}/appindicator-sharp.dll
diff --git a/bindings/mono/ayatana-appindicator-sharp-0.1.pc.in b/bindings/mono/ayatana-appindicator-sharp-0.1.pc.in
new file mode 100644
index 0000000..6c091ed
--- /dev/null
+++ b/bindings/mono/ayatana-appindicator-sharp-0.1.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+assemblies_dir=${prefix}/lib/cli/ayatana-appindicator-sharp-0.1
+
+Name: ayatana-appindicator-sharp
+Description: application indicators for .NET
+Version: @VERSION@
+Libraries: ${assemblies_dir}/ayatana-appindicator-sharp.dll ${assemblies_dir}/ayatana-appindicator-sharp.dll.config
+Requires: gtk-sharp-2.0
+Cflags:
+Libs: -r:${assemblies_dir}/ayatana-appindicator-sharp.dll
diff --git a/bindings/mono/appindicator-sharp.dll.config.in b/bindings/mono/ayatana-appindicator-sharp.dll.config.in
index 2d21d00..7061914 100644
--- a/bindings/mono/appindicator-sharp.dll.config.in
+++ b/bindings/mono/ayatana-appindicator-sharp.dll.config.in
@@ -1,5 +1,5 @@
 <configuration>
-  <dllmap dll="appindicator.dll" target="libappindicator@LIB_PREFIX@.1@LIB_SUFFIX@"/>
+  <dllmap dll="ayatana-appindicator.dll" target="libayatana-appindicator@LIB_PREFIX@.1@LIB_SUFFIX@"/>
   <dllmap dll="libgtk-2.0-0.dll" target="libgtk-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
diff --git a/bindings/mono/appindicator-sharp.snk b/bindings/mono/ayatana-appindicator-sharp.snk
index efb62d0..efb62d0 100644
--- a/bindings/mono/appindicator-sharp.snk
+++ b/bindings/mono/ayatana-appindicator-sharp.snk
diff --git a/bindings/mono/examples/IndicatorExample.cs b/bindings/mono/examples/AyatanaIndicatorExample.cs
index 7413c54..35f3c79 100644
--- a/bindings/mono/examples/IndicatorExample.cs
+++ b/bindings/mono/examples/AyatanaIndicatorExample.cs
@@ -18,7 +18,7 @@
  */
 
 using Gtk;
-using AppIndicator;
+using AyatanaAppIndicator;
 
 public class IndicatorExample
 {
@@ -36,9 +36,9 @@ public class IndicatorExample
 
                 ApplicationIndicator indicator = new ApplicationIndicator ("Example",
                                                                            "applications-microblogging-panel",
-                                                                           Category.ApplicationStatus);
+                                                                           AppIndicatorCategory.ApplicationStatus);
 
-                indicator.Status = Status.Attention;
+                indicator.AppIndicatorStatus = AppIndicatorStatus.Attention;
 
                 Menu menu = new Menu ();
                 var foo = new MenuItem ("Foo");
diff --git a/bindings/mono/examples/Makefile.am b/bindings/mono/examples/Makefile.am
index b929492..de93b20 100644
--- a/bindings/mono/examples/Makefile.am
+++ b/bindings/mono/examples/Makefile.am
@@ -1,10 +1,11 @@
-ASSEMBLY = IndicatorExample.exe
-CSFILES = IndicatorExample.cs
+ASSEMBLY = AyatanaIndicatorExample.exe
+CSFILES = AyatanaIndicatorExample.cs
 CLEANFILES = $(ASSEMBLY)
+DISTCLEANFILES = Makefile.in
 
 EXTRA_DIST = $(CSFILES)
 
-references = $(GTK_SHARP_LIBS) -r:$(top_builddir)/bindings/mono/appindicator-sharp.dll
+references = $(GTK_SHARP_LIBS) -r:$(top_builddir)/bindings/mono/ayatana-appindicator-sharp.dll
 
 $(ASSEMBLY): $(CSFILES) Makefile.am
 	$(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES)
diff --git a/bindings/mono/examples/indicator-example.in b/bindings/mono/examples/ayatana-indicator-example.in
index 3eca155..07d1473 100755
--- a/bindings/mono/examples/indicator-example.in
+++ b/bindings/mono/examples/ayatana-indicator-example.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-MONO_PATH=@top_builddir@/bindings/mono @top_builddir@/bindings/mono/examples/IndicatorExample.exe
+MONO_PATH=@top_builddir@/bindings/mono @top_builddir@/bindings/mono/examples/AyatanaIndicatorExample.exe
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libayatana-appindicator-api.metadata
index e610c88..e610c88 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libayatana-appindicator-api.metadata
diff --git a/bindings/mono/policy.0.0.appindicator-sharp.config.in b/bindings/mono/policy.0.0.ayatana-appindicator-sharp.config.in
index e1fe0db..e1fe0db 100644
--- a/bindings/mono/policy.0.0.appindicator-sharp.config.in
+++ b/bindings/mono/policy.0.0.ayatana-appindicator-sharp.config.in
diff --git a/bindings/mono/policy.0.1.appindicator-sharp.config.in b/bindings/mono/policy.0.1.ayatana-appindicator-sharp.config.in
index 0a8f9b1..0a8f9b1 100644
--- a/bindings/mono/policy.0.1.appindicator-sharp.config.in
+++ b/bindings/mono/policy.0.1.ayatana-appindicator-sharp.config.in
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index fe95c02..f57a2f7 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,10 +1,10 @@
 defsdir = $(datadir)/pygtk/2.0/defs
-defs_DATA = appindicator.defs
+defs_DATA = ayatana_appindicator.defs
 
 #CFLAGS = -Wall -Werror
 INCLUDES = \
 		-I$(top_srcdir)/src \
-        -DG_LOG_DOMAIN=\"appindicator-python\" \
+        -DG_LOG_DOMAIN=\"ayatana-appindicator-python\" \
         -DDATADIR=\"$(datadir)\" \
         -DLIBDIR=\"$(libdir)\" \
         $(APPINDICATOR_PYTHON_CFLAGS) \
@@ -13,20 +13,21 @@ INCLUDES = \
 pkgpythondir = $(pyexecdir)
 pkgpyexecdir = $(pyexecdir)
 
-pkgappindicatordir = $(pkgpythondir)/appindicator
+pkgappindicatordir = $(pkgpythondir)/ayatana_appindicator
 pkgappindicator_PYTHON = __init__.py
 
-appindicatordir = $(pkgpyexecdir)/appindicator
-appindicator_LTLIBRARIES = _appindicator.la
+appindicatordir = $(pkgpyexecdir)/ayatana_appindicator
+appindicator_LTLIBRARIES = _ayatana_appindicator.la
 
-_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
+_ayatana_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
+_ayatana_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -layatana-appindicator
+_ayatana_appindicator_la_SOURCES = ayatana_appindicatormodule.c
+nodist__ayatana_appindicator_la_SOURCES = ayatana_appindicator.c
 
-CLEANFILES = appindicator.c
-EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA)
-appindicator.c: $(defs_DATA) appindicator.override
+CLEANFILES = ayatana_appindicator.c
+DISTCLEANFILES = Makefile.in
+EXTRA_DIST = ayatana_appindicator.override.in appindicator-arg-types.py $(defs_DATA)
+ayatana_appindicator.c: $(defs_DATA) ayatana_appindicator.override
 
 %.c: %.defs
 	($(PYGTK_CODEGEN) \
diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py
index 20e2140..5dd1329 100644
--- a/bindings/python/__init__.py
+++ b/bindings/python/__init__.py
@@ -24,4 +24,4 @@
 # License version 3 and version 2.1 along with this program.  If not, see 
 # <http://www.gnu.org/licenses/>
 
-from _appindicator import *
+from _ayatana_appindicator import *
diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py
index 9d74aa0..46066ca 100644
--- a/bindings/python/appindicator-arg-types.py
+++ b/bindings/python/appindicator-arg-types.py
@@ -1,4 +1,4 @@
-# Python bindings for libappindicator.
+# Python bindings for libayatana-appindicator.
 # 
 # Copyright 2009 Canonical Ltd.
 # 
diff --git a/bindings/python/appindicator.defs b/bindings/python/ayatana_appindicator.defs
index 4fcc2d5..4fcc2d5 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/ayatana_appindicator.defs
diff --git a/bindings/python/appindicator.override.in b/bindings/python/ayatana_appindicator.override.in
index 84d3159..3fdeb24 100644
--- a/bindings/python/appindicator.override.in
+++ b/bindings/python/ayatana_appindicator.override.in
@@ -1,5 +1,5 @@
 /*
-Python bindings for libappindicator.
+Python bindings for libayatana-appindicator.
 
 Copyright 2009 Canonical Ltd.
 
@@ -59,7 +59,7 @@ _appindicator_add_constants(PyObject *module, const gchar *strip_prefix)
                 PyErr_Print();
 }
 %%
-modulename appindicator
+modulename ayatana_appindicator
 %%
 import gobject.GObject as PyGObject_Type
 import gtk.Menu as PyGtkMenu_Type
diff --git a/bindings/python/appindicatormodule.c b/bindings/python/ayatana_appindicatormodule.c
index b66639c..31d23a2 100644
--- a/bindings/python/appindicatormodule.c
+++ b/bindings/python/ayatana_appindicatormodule.c
@@ -1,11 +1,13 @@
 /*
-Python bindings for libappindicator.
+Python bindings for libayatana-appindicator.
 
 Copyright 2009 Canonical Ltd.
+Copyright 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 
 Authors:
     Eitan Isaacson <eitan@ascender.com>
     Neil Jagdish Patel <neil.patel@canonical.com>
+    Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 
 This program is free software: you can redistribute it and/or modify it 
 under the terms of either or both of the following licenses:
@@ -37,13 +39,13 @@ init_appindicator(void)
 		
 		init_pygobject ();
 		
-		m = Py_InitModule ("_appindicator", pyappindicator_functions);
+		m = Py_InitModule ("_ayatana_appindicator", pyappindicator_functions);
 		d = PyModule_GetDict (m);
 		
 		pyappindicator_register_classes (d);
 
 		_appindicator_add_constants (m, "APP_INDICATOR_");
 		if (PyErr_Occurred ()) {
-				Py_FatalError ("can't initialise module appindicator");
+				Py_FatalError ("can't initialise module ayatana_appindicator");
 		}
 }
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 703e7a5..2763bc3 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -16,25 +16,26 @@ VER=
 endif
 
 vapidir = $(datadir)/vala/vapi
-vapiprefix = appindicator$(VER)-0.1
+vapiprefix = ayatana-appindicator$(VER)-0.1
 vapi_DATA = $(vapiprefix).vapi $(vapiprefix).deps
 DEPS = $(GTKVAPI)
 
 $(vapiprefix).deps:
 	echo $(DEPS) > $@
 
-$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \
-                    $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \
-                    appindicator-0.1-custom.vala \
+$(vapiprefix).vapi: $(top_builddir)/src/AyatanaAppIndicator$(VER)-0.1.gir \
+                    $(top_builddir)/src/AyatanaAppIndicator$(VER)-0.1.metadata \
+                    ayatana-appindicator-0.1-custom.vala \
                     $(vapiprefix).deps
 	$(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \
-	$< $(srcdir)/appindicator-0.1-custom.vala
+	$< $(srcdir)/ayatana-appindicator-0.1-custom.vala
 	
 
 CLEANFILES = $(vapi_DATA)
+DISTCLEANFILES = Makefile.in
 
 endif
 endif
 
 EXTRA_DIST = \
-	appindicator-0.1-custom.vala
+	ayatana-appindicator-0.1-custom.vala
diff --git a/bindings/vala/appindicator-0.1-custom.vala b/bindings/vala/ayatana-appindicator-0.1-custom.vala
index 9fa51eb..9fa51eb 100644
--- a/bindings/vala/appindicator-0.1-custom.vala
+++ b/bindings/vala/ayatana-appindicator-0.1-custom.vala
diff --git a/bindings/vala/examples/Makefile.am b/bindings/vala/examples/Makefile.am
index 67ad932..315447c 100644
--- a/bindings/vala/examples/Makefile.am
+++ b/bindings/vala/examples/Makefile.am
@@ -4,36 +4,37 @@ else
 VER=
 endif
 
-VALAFILES = indicator-example.vala
+VALAFILES = ayatana-indicator-example.vala
 EXTRA_DIST = $(VALAFILES)
 
 VALAFLAGS = \
-	--pkg appindicator$(VER)-0.1 \
+	--pkg ayatana-appindicator$(VER)-0.1 \
 	--vapidir=$(top_builddir)/bindings/vala \
 	--save-temps
 
 if HAVE_VALAC
 
-BUILT_SOURCES = indicator-example.c
+BUILT_SOURCES = ayatana-indicator-example.c
 
-indicator-example.c: $(VALAFILES) Makefile.am
+ayatana-indicator-example.c: $(VALAFILES) Makefile.am
 	$(VALAC) $(VALAFLAGS) -C $< -o $@
-	$(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@
+	$(SED) -i "s|#include\s*<\s*libayatana-appindicator/app-indicator.h\s*>||g" $@
 
-nodist_indicator_example_SOURCES = indicator-example.c
-indicator_example_CFLAGS = \
+nodist_ayatana_indicator_example_SOURCES = ayatana-indicator-example.c
+ayatana_indicator_example_CFLAGS = \
 	$(LIBRARY_CFLAGS) \
 	-Wall \
 	-I$(top_srcdir)/src \
 	-include $(top_srcdir)/src/app-indicator.h
-indicator_example_LDADD = \
+ayatana_indicator_example_LDADD = \
 	$(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
-check_PROGRAMS = indicator-example
+check_PROGRAMS = ayatana-indicator-example
 
 CLEANFILES = \
 	*.c \
-	indicator-example
+	ayatana-indicator-example
+DISTCLEANFILES = Makefile.in
 
 endif
diff --git a/bindings/vala/examples/indicator-example.vala b/bindings/vala/examples/ayatana-indicator-example.vala
index 764009f..764009f 100644
--- a/bindings/vala/examples/indicator-example.vala
+++ b/bindings/vala/examples/ayatana-indicator-example.vala