Fork from Ubuntu's libappindicator project.

15 files changed, 56 insertions, 53 deletions

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