[geary] Use license-type in About rather than custom text: Closes bgno#720782
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Use license-type in About rather than custom text: Closes bgno#720782
- Date: Fri, 20 Dec 2013 20:52:00 +0000 (UTC)
commit 708afbae243781d21593d954710937c65030b476
Author: William Jon McCann <william jon mccann gmail com>
Date: Fri Dec 20 12:51:26 2013 -0800
Use license-type in About rather than custom text: Closes bgno#720782
src/client/application/geary-application.vala | 16 ----------------
src/client/application/geary-controller.vala | 2 +-
2 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 8005907..9f68fd8 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -46,22 +46,6 @@ public class GearyApplication : Gtk.Application {
null
};
- public const string LICENSE = """
-Geary is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free
-Software Foundation; either version 2.1 of the License, or (at your option)
-any later version.
-
-Geary is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
-more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with Geary; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-""";
-
private static const string ACTION_ENTRY_COMPOSE = "compose";
public static const ActionEntry[] action_entries = {
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 1cbed51..5b49fd4 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1272,7 +1272,7 @@ public class GearyController : Geary.BaseObject {
"comments", GearyApplication.DESCRIPTION,
"authors", GearyApplication.AUTHORS,
"copyright", GearyApplication.COPYRIGHT,
- "license", GearyApplication.LICENSE,
+ "license-type", Gtk.License.LGPL_2_1,
"version", GearyApplication.VERSION,
"website", GearyApplication.WEBSITE,
"website-label", GearyApplication.WEBSITE_LABEL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]