From 8f00a51b13cefd8792833bdea84664385f76e825 Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Fri, 29 Apr 2016 22:58:01 +1000 Subject: [PATCH] Replace Yorba links with GNOME links, remove donate menu, update dpkg blurb. Thanks for all the fish, Yorba. Bug 765656. --- README | 3 +-- debian/control | 27 ++++++++++++------- debian/copyright | 2 +- src/client/application/geary-application.vala | 5 ++-- src/client/application/geary-controller.vala | 14 ---------- ui/app_menu.interface | 6 ----- 6 files changed, 21 insertions(+), 36 deletions(-) diff --git a/README b/README index c633fbd1..0f019be2 100644 --- a/README +++ b/README @@ -25,9 +25,8 @@ Geary will then begin downloading messages in your inbox and other folders. - * Contacting Yorba + * Contacting Geary Developers - Yorba: http://www.yorba.org Geary wiki: https://wiki.gnome.org/Apps/Geary We also encourage you to join the Geary mailing list. See diff --git a/debian/control b/debian/control index 122173b6..ce0b36a6 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 8), gnome-doc-utils, libgcr-3-dev (>= 3.10.1) Standards-Version: 3.8.3 -Homepage: http://www.yorba.org +Homepage: https://wiki.gnome.org/Apps/Geary Package: geary Architecture: any @@ -43,11 +43,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libgcr-base-3-1 (>= 3.10.1), libgcr-ui-3-1 (>= 3.10.1) Description: Email client - Geary is an email client built for the GNOME desktop environment. It - allows you to read and send email with a simple, modern interface. + Geary is an mail application for GNOME designed to let you manage + your email quickly and effortlessly. . - Visit http://www.yorba.org to read about the current state of - Geary's development. + Its interface is based on conversations, so you can read an entire + discussion without having to click from message to message. + . + Geary is still in development and has a limited but growing set of + features. It works with Gmail, Yahoo! Mail, Outlook.com + (experimental), and other popular IMAP servers. Package: geary-dbg Architecture: any @@ -56,10 +60,13 @@ Priority: extra Depends: geary (= ${binary:Version}), ${misc:Depends} Enhances: geary Description: Email client (debugging symbols) - Geary is an email client built for the GNOME desktop environment. It - allows you to read and send email with a simple, modern interface. + Geary is an mail application for GNOME designed to let you manage + your email quickly and effortlessly. . - Visit http://www.yorba.org to read about the current state of - Geary's development. + Its interface is based on conversations, so you can read an entire + discussion without having to click from message to message. . - This package contains debugging symbols for geary. + Geary is still in development and has a limited but growing set of + features. It works with Gmail, Yahoo! Mail, Outlook.com + (experimental), and other popular IMAP servers. + diff --git a/debian/copyright b/debian/copyright index cd623e84..3301bad3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: geary -Source: +Source: Files: * Copyright: 2012-2015 Yorba Foundation diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala index 072921ec..14686396 100644 --- a/src/client/application/geary-application.vala +++ b/src/client/application/geary-application.vala @@ -17,10 +17,9 @@ public class GearyApplication : Gtk.Application { public const string APP_ID = "org.yorba.geary"; public const string DESCRIPTION = _("Mail Client"); public const string COPYRIGHT = _("Copyright 2011-2015 Yorba Foundation"); - public const string WEBSITE = "http://www.yorba.org"; - public const string WEBSITE_LABEL = _("Visit the Yorba web site"); + 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"; - public const string DONATE = "http://www.yorba.org/about/donate"; public const string VERSION = _VERSION; public const string INSTALL_PREFIX = _INSTALL_PREFIX; diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala index be948608..3b397bc9 100644 --- a/src/client/application/geary-controller.vala +++ b/src/client/application/geary-controller.vala @@ -21,7 +21,6 @@ public class GearyController : Geary.BaseObject { // NOTE: Some actions with accelerators need to also be added to ui/accelerators.ui public const string ACTION_HELP = "GearyHelp"; public const string ACTION_ABOUT = "GearyAbout"; - public const string ACTION_DONATE = "GearyDonate"; public const string ACTION_QUIT = "GearyQuit"; public const string ACTION_NEW_MESSAGE = "GearyNewMessage"; public const string ACTION_REPLY_TO_MESSAGE = "GearyReplyToMessage"; @@ -390,10 +389,6 @@ public class GearyController : Geary.BaseObject { about.label = _("_About"); entries += about; - Gtk.ActionEntry donate = { ACTION_DONATE, null, TRANSLATABLE, null, null, on_donate }; - donate.label = _("_Donate"); - entries += donate; - Gtk.ActionEntry quit = { ACTION_QUIT, Stock._QUIT, TRANSLATABLE, "Q", null, on_quit }; quit.label = _("_Quit"); entries += quit; @@ -568,7 +563,6 @@ public class GearyController : Geary.BaseObject { const string[] exported_actions = { ACTION_ACCOUNTS, ACTION_PREFERENCES, - ACTION_DONATE, ACTION_HELP, ACTION_ABOUT, ACTION_QUIT, @@ -1724,14 +1718,6 @@ public class GearyController : Geary.BaseObject { ); } - private void on_donate() { - try { - Gtk.show_uri(null, GearyApplication.DONATE, Gdk.CURRENT_TIME); - } catch (Error error) { - debug("Error opening donate page: %s", error.message); - } - } - private void on_shift_key(bool pressed) { if (main_window != null && main_window.main_toolbar != null && current_account != null && current_folder != null) { diff --git a/ui/app_menu.interface b/ui/app_menu.interface index 331cef4c..77329a35 100644 --- a/ui/app_menu.interface +++ b/ui/app_menu.interface @@ -12,12 +12,6 @@ <Primary>E -
- - _Donate - app.GearyDonate - -
_Help