[geary] Add additional copyright for current devs.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Add additional copyright for current devs.
- Date: Mon, 2 Oct 2017 09:56:00 +0000 (UTC)
commit dd3d1a55206a5b295b65bb9230006d0dfcc497b7
Author: Michael James Gratton <mike vee net>
Date: Wed Sep 27 00:20:00 2017 +1000
Add additional copyright for current devs.
src/client/application/geary-application.vala | 5 +++--
src/client/application/geary-args.vala | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index ba673d0..cc326cb 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -18,8 +18,9 @@ public class GearyApplication : Gtk.Application {
public const string NAME = "Geary";
public const string PRGNAME = "geary";
public const string APP_ID = "org.gnome.Geary";
- public const string COPYRIGHT = _("Copyright 2016 Software Freedom Conservancy Inc.");
public const string DESCRIPTION = _("Send and receive email");
+ public const string COPYRIGHT_1 = _("Copyright 2016 Software Freedom Conservancy Inc.");
+ public const string COPYRIGHT_2 = _("Copyright 2016-2017 Geary Development Team.");
public const string WEBSITE = "https://wiki.gnome.org/Apps/Geary";
public const string WEBSITE_LABEL = _("Visit the Geary web site");
public const string BUGREPORT = "https://wiki.gnome.org/Apps/Geary/ReportingABug";
@@ -456,7 +457,7 @@ public class GearyApplication : Gtk.Application {
"program-name", NAME,
"comments", DESCRIPTION,
"authors", AUTHORS,
- "copyright", COPYRIGHT,
+ "copyright", string.join("\n", COPYRIGHT_1, COPYRIGHT_2),
"license-type", Gtk.License.LGPL_2_1,
"logo-icon-name", "geary",
"version", VERSION,
diff --git a/src/client/application/geary-args.vala b/src/client/application/geary-args.vala
index cf034a9..9c2b153 100644
--- a/src/client/application/geary-args.vala
+++ b/src/client/application/geary-args.vala
@@ -48,10 +48,12 @@ public bool parse(string[] args) {
var context = new OptionContext("[%s...]".printf(Geary.ComposedEmail.MAILTO_SCHEME));
context.set_help_enabled(true);
context.add_main_entries(options, null);
- context.set_description("%s\n\n%s\n\n%s\n\t%s\n".printf(
+ context.set_description("%s\n\n%s\n%s\n\n%s\n\t%s\n".printf(
// This gives a command-line hint on how to open new composer windows with mailto:
_("Use %s to open a new composer window").printf(Geary.ComposedEmail.MAILTO_SCHEME),
- GearyApplication.COPYRIGHT, _("Please report comments, suggestions and bugs to:"),
+ GearyApplication.COPYRIGHT_1,
+ GearyApplication.COPYRIGHT_2,
+ _("Please report comments, suggestions and bugs to:"),
GearyApplication.BUGREPORT));
try {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]