merged

4 files changed, 25 insertions, 14 deletions

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index fe56158..dedbeb7 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -13,7 +13,7 @@ ASSEMBLY = appindicator-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
 assemblydir = $(libdir)/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(ASSEMBLY_NAME).snk $(API) $(RAW_API) $(TEST)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API) $(TEST)
 DISTCLEANFILES = $(ASSEMBLY).config
 TEST_SOURCES = TestIndicator.cs
 EXTRA_DIST = \
@@ -22,6 +22,7 @@ EXTRA_DIST = \
 	appindicator-sharp-0.1.pc.in \
 	appindicator-sharp.dll.config.in \
 	app-indicator.sources.xml \
+	$(ASSEMBLY_NAME).snk \
 	$(TEST_SOURCES)
 
 GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
@@ -50,8 +51,7 @@ generated-stamp: $(API)
 
 $(ASSEMBLY): generated-stamp
 	@rm -f $(ASSEMBLY).mdb
-	$(SN) -k $(ASSEMBLY_NAME).snk
-	$(CSC) $(CSFLAGS) -keyfile:$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
 
 install-data-local:
 	echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
diff --git a/bindings/mono/appindicator-sharp.snk b/bindings/mono/appindicator-sharp.snk
new file mode 100644
index 0000000..efb62d0
--- /dev/null
+++ b/bindings/mono/appindicator-sharp.snk
diff --git a/bindings/mono/examples/IndicatorExample.cs b/bindings/mono/examples/IndicatorExample.cs
index 0cb72a1..c34e020 100644
--- a/bindings/mono/examples/IndicatorExample.cs
+++ b/bindings/mono/examples/IndicatorExample.cs
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2009 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Cody Russell <cody.russell@canonical.com>
+ */
+
 using Gtk;
 using AppIndicator;
 
@@ -21,16 +40,14 @@ public class IndicatorExample
 
                 indicator.Status = Status.Attention;
 
-                /*
                 Menu menu = new Menu ();
                 menu.Append (new MenuItem ("Foo"));
                 menu.Append (new MenuItem ("Bar"));
 
                 indicator.Menu = menu;
-                */
 
                 win.ShowAll ();
 
                 Application.Run ();
         }
-}
\ No newline at end of file
+}
diff --git a/configure.ac b/configure.ac
index 114b42b..559c2b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.0.4, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.6, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.4)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.6)
 
 AM_MAINTAINER_MODE
 
@@ -81,15 +81,9 @@ if test "x$GACUTIL" = "xno" ; then
    AC_MSG_ERROR([No gacutil tool found])
 fi
 
-AC_PATH_PROG(SN, sn, no)
-if test "x$SN" = "xno" ; then
-   AC_MSG_ERROR([No sn tool found])
-fi
-
 AC_SUBST(RUNTIME)
 AC_SUBST(CSC)
 AC_SUBST(GACUTIL)
-AC_SUBST(SN)
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(GENERATED_SOURCES)