Mail

Merge lp:~elementary-apps/pantheon-mail/remove-donate into lp:~elementary-apps/pantheon-mail/trunk

  1. remove-donate
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Nathan Dyer
Approved revision: 1866
Merged at revision: 1867
Proposed branch: lp:~elementary-apps/pantheon-mail/remove-donate
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 66 lines (+2/-22)
2 files modified
src/client/application/geary-controller.vala (+2/-16)
ui/app_menu.interface (+0/-6)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-mail/remove-donate
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+277928@code.launchpad.net

Commit message

remove Donate menu item from app menu

Description of the change

No more Yorba :(

To post a comment you must log in.
Revision history for this message
Nathan Dyer (nathandyer) wrote :

Approving this hurts a bit. Pouring one out for Yorba... Looks good, though.

Revision history for this message
Danielle Foré (danrabbit) :
review: Approve
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/application/geary-controller.vala'
2--- src/client/application/geary-controller.vala 2015-03-20 22:50:31 +0000
3+++ src/client/application/geary-controller.vala 2015-11-18 23:35:07 +0000
4@@ -21,7 +21,6 @@
5 // NOTE: Some actions with accelerators need to also be added to ui/accelerators.ui
6 public const string ACTION_HELP = "GearyHelp";
7 public const string ACTION_ABOUT = "GearyAbout";
8- public const string ACTION_DONATE = "GearyDonate";
9 public const string ACTION_QUIT = "GearyQuit";
10 public const string ACTION_NEW_MESSAGE = "GearyNewMessage";
11 public const string ACTION_REPLY_TO_MESSAGE = "GearyReplyToMessage";
12@@ -385,11 +384,7 @@
13 Gtk.ActionEntry about = { ACTION_ABOUT, Stock._ABOUT, TRANSLATABLE, null, null, on_about };
14 about.label = _("_About");
15 entries += about;
16-
17- Gtk.ActionEntry donate = { ACTION_DONATE, null, TRANSLATABLE, null, null, on_donate };
18- donate.label = _("_Donate");
19- entries += donate;
20-
21+
22 Gtk.ActionEntry quit = { ACTION_QUIT, Stock._QUIT, TRANSLATABLE, "<Ctrl>Q", null, on_quit };
23 quit.label = _("_Quit");
24 entries += quit;
25@@ -564,7 +559,6 @@
26 const string[] exported_actions = {
27 ACTION_ACCOUNTS,
28 ACTION_PREFERENCES,
29- ACTION_DONATE,
30 ACTION_HELP,
31 ACTION_ABOUT,
32 ACTION_QUIT,
33@@ -1724,15 +1718,7 @@
34 "translator-credits", _("translator-credits")
35 );
36 }
37-
38- private void on_donate() {
39- try {
40- Gtk.show_uri(null, GearyApplication.DONATE, Gdk.CURRENT_TIME);
41- } catch (Error error) {
42- debug("Error opening donate page: %s", error.message);
43- }
44- }
45-
46+
47 private void on_shift_key(bool pressed) {
48 if (main_window != null && main_window.main_toolbar != null
49 && current_account != null && current_folder != null) {
50
51=== modified file 'ui/app_menu.interface'
52--- ui/app_menu.interface 2014-12-28 16:49:47 +0000
53+++ ui/app_menu.interface 2015-11-18 23:35:07 +0000
54@@ -14,12 +14,6 @@
55 </section>
56 <section>
57 <item>
58- <attribute name='label' translatable='yes'>_Donate</attribute>
59- <attribute name='action'>app.GearyDonate</attribute>
60- </item>
61- </section>
62- <section>
63- <item>
64 <attribute name='label' translatable='yes'>_Help</attribute>
65 <attribute name='action'>app.GearyHelp</attribute>
66 <attribute name='accel'>F1</attribute>

Subscribers

People subscribed via source and target branches