aboutsummaryrefslogtreecommitdiff
path: root/bindings
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-05-20 21:38:31 -0500
committerTed Gould <ted@gould.cx>2010-05-20 21:38:31 -0500
commit086d22cdcae4bc912276c234b10d366447c7e2dc (patch)
tree59019c3847d73a8801f78982d927df0f566ea214 /bindings
parentbdec50530d6f2aeb3422fc2b6b155181e1712245 (diff)
parent9b028d987ece794583a67a332da437fc18cb0ce2 (diff)
downloadayatana-indicator-application-086d22cdcae4bc912276c234b10d366447c7e2dc.tar.gz
ayatana-indicator-application-086d22cdcae4bc912276c234b10d366447c7e2dc.tar.bz2
ayatana-indicator-application-086d22cdcae4bc912276c234b10d366447c7e2dc.zip
* New upstream release.
* Unref the child when created in libappindicator (LP: #569273) * Merging patch to add assembly information to Mono binding (LP: #547195) * Remove child-leakage.patch as merged upstream
Diffstat (limited to 'bindings')
-rw-r--r--bindings/mono/AssemblyInfo.cs30
-rw-r--r--bindings/mono/Makefile.in2
2 files changed, 1 insertions, 31 deletions
diff --git a/bindings/mono/AssemblyInfo.cs b/bindings/mono/AssemblyInfo.cs
deleted file mode 100644
index 269981a..0000000
--- a/bindings/mono/AssemblyInfo.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2010 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 System.Reflection;
-
-[assembly: AssemblyTitle ("Application Indicators")]
-[assembly: AssemblyDescription ("Ubuntu Application Indicators")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Canonical, Ltd.")]
-[assembly: AssemblyProduct ("Ubuntu")]
-[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-[assembly: AssemblyVersion ("0.1")]
diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index f029d16..e39a208 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -749,7 +749,7 @@ generated-stamp: $(API) $(build_customs)
$(ASSEMBLY): generated-stamp
@rm -f $(ASSEMBLY).mdb
- $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(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) AssemblyInfo.cs
install-data-local:
echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \