Merge lp:~leonardolemos/pantheon-mail/fix-mail-translation into lp:~elementary-apps/pantheon-mail/trunk

[Leonardo Lemos]

Mark the App's title in the About Dialog as translatable

This branch marks the App's title in the About Dialog as translatable.

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:pantheon-mail failed due to conflicts:

text conflict in po/extra/extra.pot
text conflict in po/pantheon-mail.pot

=== modified file 'po/extra/extra.pot'
--- po/extra/extra.pot	2016-07-09 17:27:52 +0000
+++ po/extra/extra.pot	2016-07-30 14:08:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-09 10:27-0700\n"
+"POT-Creation-Date: 2016-07-30 18:03+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 
=== modified file 'po/pantheon-mail.pot'
--- po/pantheon-mail.pot	2016-07-09 17:27:52 +0000
+++ po/pantheon-mail.pot	2016-07-30 14:08:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-09 10:27-0700\n"
+"POT-Creation-Date: 2016-07-30 18:03+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -319,6 +319,7 @@
 #: ../src/client/components/main-toolbar.vala:108
 #: ../src/client/components/main-toolbar.vala:107
 #: ../src/client/components/main-toolbar.vala:123
+#: ../src/client/application/geary-controller.vala:387
 msgid "Mark conversation"
 msgstr ""
 
@@ -377,6 +378,7 @@
 #: ../src/client/application/geary-controller.vala:371
 #: ../src/client/application/geary-controller.vala:370
 #: ../src/client/application/geary-controller.vala:369
+#: ../src/client/application/geary-controller.vala:375
 msgid "A_ccounts"
 msgstr ""
 
@@ -386,6 +388,7 @@
 #: ../src/client/application/geary-controller.vala:375
 #: ../src/client/components/stock.vala:26
 #: ../src/client/application/geary-controller.vala:374
+#: ../src/client/application/geary-controller.vala:380
 msgid "_Preferences"
 msgstr ""
 
@@ -408,6 +411,7 @@
 #: ../src/client/application/geary-controller.vala:383
 #: ../src/client/components/stock.vala:28
 #: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:384
 msgid "_Quit"
 msgstr ""
 
@@ -415,6 +419,7 @@
 #: ../src/client/application/geary-controller.vala:393
 #: ../src/client/application/geary-controller.vala:388
 #: ../src/client/application/geary-controller.vala:383
+#: ../src/client/application/geary-controller.vala:389
 msgid "_Mark as..."
 msgstr ""
 
@@ -422,6 +427,7 @@
 #: ../src/client/application/geary-controller.vala:399
 #: ../src/client/application/geary-controller.vala:394
 #: ../src/client/application/geary-controller.vala:389
+#: ../src/client/application/geary-controller.vala:395
 msgid "Mark as _Read"
 msgstr ""
 
@@ -429,6 +435,7 @@
 #: ../src/client/application/geary-controller.vala:405
 #: ../src/client/application/geary-controller.vala:400
 #: ../src/client/application/geary-controller.vala:395
+#: ../src/client/application/geary-controller.vala:401
 msgid "Mark as _Unread"
 msgstr ""
 
@@ -436,6 +443,7 @@
 #: ../src/client/application/geary-controller.vala:411
 #: ../src/client/application/geary-controller.vala:406
 #: ../src/client/application/geary-controller.vala:401
+#: ../src/client/application/geary-controller.vala:407
 msgid "_Star"
 msgstr ""
 
@@ -443,6 +451,7 @@
 #: ../src/client/application/geary-controller.vala:416
 #: ../src/client/application/geary-controller.vala:411
 #: ../src/client/application/geary-controller.vala:406
+#: ../src/client/application/geary-controller.vala:412
 msgid "U_nstar"
 msgstr ""
 
@@ -450,6 +459,7 @@
 #: ../src/client/application/geary-controller.vala:426
 #: ../src/client/application/geary-controller.vala:421
 #: ../src/client/application/geary-controller.vala:416
+#: ../src/client/application/geary-controller.vala:422
 msgid "Add label"
 msgstr ""
 
@@ -457,6 +467,7 @@
 #: ../src/client/application/geary-controller.vala:427
 #: ../src/client/application/geary-controller.vala:422
 #: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:423
 msgid "_Label"
 msgstr ""
 
@@ -464,6 +475,7 @@
 #: ../src/client/application/geary-controller.vala:431
 #: ../src/client/application/geary-controller.vala:426
 #: ../src/client/application/geary-controller.vala:421
+#: ../src/client/application/geary-controller.vala:427
 msgid "_Move"
 msgstr ""
 
@@ -541,6 +553,7 @@
 #: ../src/client/application/geary-controller.vala:485
 #: ../src/client/application/geary-controller.vala:479
 #: ../src/client/application/geary-controller.vala:474
+#: ../src/client/application/geary-controller.vala:480
 msgid "Empty _Spam…"
 msgstr ""
 
@@ -550,6 +563,7 @@
 #: ../src/client/application/geary-controller.vala:489
 #: ../src/client/application/geary-controller.vala:483
 #: ../src/client/application/geary-controller.vala:478
+#: ../src/client/application/geary-controller.vala:484
 msgid "Empty _Trash…"
 msgstr ""
 
@@ -796,6 +810,7 @@
 #: ../src/client/application/geary-controller.vala:1940
 #: ../src/client/application/geary-controller.vala:1936
 #: ../src/client/application/geary-controller.vala:1931
+#: ../src/client/application/geary-controller.vala:1937
 msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
@@ -832,6 +847,7 @@
 #: ../src/client/application/geary-controller.vala:1966
 #: ../src/client/application/geary-controller.vala:1962
 #: ../src/client/application/geary-controller.vala:1957
+#: ../src/client/application/geary-controller.vala:1963
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr ""
 
@@ -842,6 +858,7 @@
 #: ../src/client/application/geary-controller.vala:1968
 #: ../src/client/application/geary-controller.vala:1964
 #: ../src/client/application/geary-controller.vala:1959
+#: ../src/client/application/geary-controller.vala:1965
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
@@ -853,6 +870,7 @@
 #: ../src/client/application/geary-controller.vala:1971
 #: ../src/client/application/geary-controller.vala:1967
 #: ../src/client/application/geary-controller.vala:1962
+#: ../src/client/application/geary-controller.vala:1968
 msgid "_Replace"
 msgstr ""
 
@@ -1452,6 +1470,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:302
 #: ../src/client/conversation-viewer/conversation-viewer.vala:308
 #: ../src/client/conversation-viewer/conversation-viewer.vala:310
+#: ../src/client/conversation-viewer/conversation-viewer.vala:311
 msgid "No conversations selected."
 msgstr ""
 
@@ -1460,6 +1479,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:304
 #: ../src/client/conversation-viewer/conversation-viewer.vala:310
 #: ../src/client/conversation-viewer/conversation-viewer.vala:312
+#: ../src/client/conversation-viewer/conversation-viewer.vala:313
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] ""
@@ -1470,6 +1490,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:333
 #: ../src/client/conversation-viewer/conversation-viewer.vala:339
 #: ../src/client/conversation-viewer/conversation-viewer.vala:341
+#: ../src/client/conversation-viewer/conversation-viewer.vala:342
 msgid "No search results found."
 msgstr ""
 
@@ -1478,6 +1499,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:335
 #: ../src/client/conversation-viewer/conversation-viewer.vala:341
 #: ../src/client/conversation-viewer/conversation-viewer.vala:343
+#: ../src/client/conversation-viewer/conversation-viewer.vala:344
 msgid "No conversations in folder."
 msgstr ""
 
@@ -1487,6 +1509,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:450
 #: ../src/client/conversation-viewer/ConversationWidget.vala:453
 #: ../src/client/conversation-viewer/ConversationWidget.vala:456
+#: ../src/client/conversation-viewer/ConversationWidget.vala:459
 msgid "This message contains remote images."
 msgstr ""
 
@@ -1496,6 +1519,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:448
 #: ../src/client/conversation-viewer/ConversationWidget.vala:451
 #: ../src/client/conversation-viewer/ConversationWidget.vala:454
+#: ../src/client/conversation-viewer/ConversationWidget.vala:457
 msgid "Show Images"
 msgstr ""
 
@@ -1510,6 +1534,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:397
 #: ../src/client/conversation-viewer/ConversationWidget.vala:400
 #: ../src/client/conversation-viewer/ConversationWidget.vala:403
+#: ../src/client/conversation-viewer/ConversationWidget.vala:405
 msgid "Edit Draft"
 msgstr ""
 
@@ -1517,6 +1542,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:814
 #: ../src/client/conversation-viewer/ConversationWidget.vala:145
 #: ../src/client/conversation-viewer/ConversationWidget.vala:148
+#: ../src/client/conversation-viewer/ConversationWidget.vala:150
 msgid "From:"
 msgstr ""
 
@@ -1525,6 +1551,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:149
 #: ../src/client/conversation-viewer/ConversationWidget.vala:158
 #: ../src/client/conversation-viewer/ConversationWidget.vala:161
+#: ../src/client/conversation-viewer/ConversationWidget.vala:163
 msgid "To:"
 msgstr ""
 
@@ -1533,6 +1560,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:154
 #: ../src/client/conversation-viewer/ConversationWidget.vala:163
 #: ../src/client/conversation-viewer/ConversationWidget.vala:166
+#: ../src/client/conversation-viewer/ConversationWidget.vala:168
 msgid "Cc:"
 msgstr ""
 
@@ -1541,6 +1569,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:159
 #: ../src/client/conversation-viewer/ConversationWidget.vala:168
 #: ../src/client/conversation-viewer/ConversationWidget.vala:171
+#: ../src/client/conversation-viewer/ConversationWidget.vala:173
 msgid "Bcc:"
 msgstr ""
 
@@ -1549,6 +1578,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:164
 #: ../src/client/conversation-viewer/ConversationWidget.vala:173
 #: ../src/client/conversation-viewer/ConversationWidget.vala:176
+#: ../src/client/conversation-viewer/ConversationWidget.vala:178
 msgid "Subject:"
 msgstr ""
 
@@ -1576,6 +1606,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1153
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1157
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1162
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1172
 msgid "_Copy"
 msgstr ""
 
@@ -1585,6 +1616,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1161
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1165
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1170
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1180
 msgid "Copy _Email Address"
 msgstr ""
 
@@ -1596,6 +1628,7 @@
 #: ../data/ui/composer.ui:103
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1174
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1179
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1189
 msgid "Copy _Link"
 msgstr ""
 
@@ -1612,6 +1645,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1181
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1185
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1190
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1200
 msgid "Select _All"
 msgstr ""
 
@@ -1621,6 +1655,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1187
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1191
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1196
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1206
 msgid "_Inspect"
 msgstr ""
 
@@ -1692,6 +1727,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1062
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1066
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1071
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1081
 msgid "Failed to open default text editor."
 msgstr ""
 
@@ -2717,30 +2753,35 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:218
 #: ../src/client/conversation-viewer/ConversationWidget.vala:227
 #: ../src/client/conversation-viewer/ConversationWidget.vala:230
+#: ../src/client/conversation-viewer/ConversationWidget.vala:232
 msgid "Save Attachment…"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:220
 #: ../src/client/conversation-viewer/ConversationWidget.vala:229
 #: ../src/client/conversation-viewer/ConversationWidget.vala:232
+#: ../src/client/conversation-viewer/ConversationWidget.vala:234
 msgid "Save All Attachments…"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:229
 #: ../src/client/conversation-viewer/ConversationWidget.vala:238
 #: ../src/client/conversation-viewer/ConversationWidget.vala:241
+#: ../src/client/conversation-viewer/ConversationWidget.vala:243
 msgid "Reply"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:230
 #: ../src/client/conversation-viewer/ConversationWidget.vala:239
 #: ../src/client/conversation-viewer/ConversationWidget.vala:242
+#: ../src/client/conversation-viewer/ConversationWidget.vala:244
 msgid "Reply to All"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:231
 #: ../src/client/conversation-viewer/ConversationWidget.vala:240
 #: ../src/client/conversation-viewer/ConversationWidget.vala:243
+#: ../src/client/conversation-viewer/ConversationWidget.vala:245
 msgid "Forward"
 msgstr ""
 
@@ -2751,6 +2792,8 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1140
 #: ../src/client/conversation-viewer/ConversationWidget.vala:270
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1145
+#: ../src/client/conversation-viewer/ConversationWidget.vala:272
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1155
 msgid "Mark as Unread"
 msgstr ""
 
@@ -2761,18 +2804,22 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1138
 #: ../src/client/conversation-viewer/ConversationWidget.vala:272
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1143
+#: ../src/client/conversation-viewer/ConversationWidget.vala:274
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1153
 msgid "Mark as Read"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:252
 #: ../src/client/conversation-viewer/ConversationWidget.vala:272
 #: ../src/client/conversation-viewer/ConversationWidget.vala:275
+#: ../src/client/conversation-viewer/ConversationWidget.vala:277
 msgid "Print…"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:253
 #: ../src/client/conversation-viewer/ConversationWidget.vala:273
 #: ../src/client/conversation-viewer/ConversationWidget.vala:276
+#: ../src/client/conversation-viewer/ConversationWidget.vala:278
 msgid "View Source"
 msgstr ""
 
@@ -2784,6 +2831,8 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:630
 #: ../src/client/conversation-viewer/ConversationWidget.vala:343
 #: ../src/client/conversation-viewer/ConversationWidget.vala:635
+#: ../src/client/conversation-viewer/ConversationWidget.vala:345
+#: ../src/client/conversation-viewer/ConversationWidget.vala:638
 msgid "View message"
 msgstr ""
 
@@ -2791,6 +2840,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:406
 #: ../src/client/conversation-viewer/ConversationWidget.vala:409
 #: ../src/client/conversation-viewer/ConversationWidget.vala:412
+#: ../src/client/conversation-viewer/ConversationWidget.vala:414
 msgid "This message contains one or more attachments"
 msgstr ""
 
@@ -2798,6 +2848,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:449
 #: ../src/client/conversation-viewer/ConversationWidget.vala:452
 #: ../src/client/conversation-viewer/ConversationWidget.vala:455
+#: ../src/client/conversation-viewer/ConversationWidget.vala:458
 msgid "Always Show from Sender"
 msgstr ""
 
@@ -2805,6 +2856,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:577
 #: ../src/client/conversation-viewer/ConversationWidget.vala:581
 #: ../src/client/conversation-viewer/ConversationWidget.vala:584
+#: ../src/client/conversation-viewer/ConversationWidget.vala:587
 msgid "Compose New Message"
 msgstr ""
 
@@ -2812,6 +2864,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:578
 #: ../src/client/conversation-viewer/ConversationWidget.vala:582
 #: ../src/client/conversation-viewer/ConversationWidget.vala:585
+#: ../src/client/conversation-viewer/ConversationWidget.vala:588
 msgid "Copy Email Address"
 msgstr ""
 
@@ -2819,6 +2872,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:639
 #: ../src/client/conversation-viewer/ConversationWidget.vala:643
 #: ../src/client/conversation-viewer/ConversationWidget.vala:648
+#: ../src/client/conversation-viewer/ConversationWidget.vala:651
 msgid "Hide message"
 msgstr ""
 
@@ -2848,18 +2902,22 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:426
 #: ../src/client/conversation-viewer/ConversationWidget.vala:416
 #: ../src/client/conversation-viewer/ConversationWidget.vala:429
+#: ../src/client/conversation-viewer/ConversationWidget.vala:418
+#: ../src/client/conversation-viewer/ConversationWidget.vala:431
 msgid "Star message"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:420
 #: ../src/client/conversation-viewer/ConversationWidget.vala:423
 #: ../src/client/conversation-viewer/ConversationWidget.vala:426
+#: ../src/client/conversation-viewer/ConversationWidget.vala:428
 msgid "Unstar message"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:430
 #: ../src/client/conversation-viewer/ConversationWidget.vala:433
 #: ../src/client/conversation-viewer/ConversationWidget.vala:436
+#: ../src/client/conversation-viewer/ConversationWidget.vala:438
 msgid "More"
 msgstr ""
 
@@ -2940,3 +2998,7 @@
 #: ../src/client/conversation-list/formatted-conversation-data.vala:190
 msgid ", "
 msgstr ""
+
+#: ../src/client/application/geary-application.vala:15
+msgid "Mail"
+msgstr ""
 
=== modified file 'src/client/application/geary-application.vala'
--- src/client/application/geary-application.vala	2016-07-07 19:36:17 +0000
+++ src/client/application/geary-application.vala	2016-07-30 14:08:20 +0000
@@ -12,7 +12,7 @@
 extern const string GETTEXT_PACKAGE;
 
 public class GearyApplication : Gtk.Application {
-    public const string NAME = "Mail";
+    public const string NAME = _("Mail");
     public const string PRGNAME = "pantheon-mail";
     public const string APP_ID = "org.pantheon.mail";
     public const string COPYRIGHT = _("2011-2015 Yorba Foundation\n© 2016 elementary LLC.");
@@ -46,16 +46,16 @@
         "Sam Hewitt <[e-mail]>",
         null
     };
-    
+
     private const string ACTION_ENTRY_COMPOSE = "compose";
-    
+
     public const ActionEntry[] action_entries = {
         {ACTION_ENTRY_COMPOSE, activate_compose, "s"},
     };
-    
+
     private const int64 USEC_PER_SEC = 1000000;
     private const int64 FORCE_SHUTDOWN_USEC = 5 * USEC_PER_SEC;
-    
+
     public static GearyApplication instance {
         get { return _instance; }
         private set {
@@ -64,7 +64,7 @@
             _instance = value;
         }
     }
-    
+
     /**
      * Signal that is activated when 'exit' is called, but before the application actually exits.
      *
@@ -74,41 +74,41 @@
     public virtual signal bool exiting(bool panicked) {
         return true;
     }
-    
+
     public GearyController controller { get; private set; default = new GearyController(); }
-    
+
     public Gtk.ActionGroup actions {
         get; private set; default = new Gtk.ActionGroup("GearyActionGroup");
     }
     public Gee.Collection<Geary.ActionAdapter> action_adapters {
         get; private set; default = new Gee.ArrayList<Geary.ActionAdapter>();
     }
-    
+
     public Gtk.UIManager ui_manager {
         get; private set; default = new Gtk.UIManager();
     }
-    
+
     public Configuration config { get; private set; }
 
     private static GearyApplication _instance = null;
-    
+
     private string bin;
     private File exec_dir;
     private bool exiting_fired = false;
     private int exitcode = 0;
     private bool is_destroyed = false;
-    
+
     public GearyApplication() {
         Object(application_id: APP_ID);
-        
+
         _instance = this;
     }
-    
+
     // Application.run() calls this as an entry point.
     public override bool local_command_line(ref unowned string[] args, out int exit_status) {
         bin = args[0];
         exec_dir = (File.new_for_path(Posix.realpath(Environment.find_program_in_path(bin)))).get_parent();
-        
+
         try {
             register();
         } catch (Error e) {
@@ -121,131 +121,131 @@
             exit_status = 1;
             return true;
         }
-        
+
         activate();
         foreach (unowned string arg in args) {
             if (arg != null && arg.has_prefix(Geary.ComposedEmail.MAILTO_SCHEME))
                 activate_action(ACTION_ENTRY_COMPOSE, new Variant.string(arg));
         }
-        
+
         exit_status = 0;
         return true;
     }
-    
+
     public override void startup() {
         Configuration.init(is_installed(), GSETTINGS_DIR);
-        
+
         Environment.set_application_name(NAME);
         Environment.set_prgname(PRGNAME);
         International.init(GETTEXT_PACKAGE, bin);
-        
+
         Geary.Logging.init();
         Date.init();
         WebKit.set_cache_model(WebKit.CacheModel.DOCUMENT_BROWSER);
-        
+
         base.startup();
-        
+
         var notification_action = new SimpleAction ("go-to-notification", null);
         notification_action.activate.connect (() => {
             this.activate ();
             controller.notification_clicked ();
         });
         add_action (notification_action);
-        
+
         add_action_entries(action_entries, this);
     }
-    
+
     public override void activate() {
         base.activate();
-        
+
         if (!present())
             create_async.begin();
     }
-    
+
     public void activate_compose(SimpleAction action, Variant? param) {
         if (param == null)
             return;
-        
+
         compose(param.get_string());
     }
-    
+
     public bool present() {
         if (controller == null)
             return false;
-        
+
         // if LoginDialog (i.e. the opening dialog for creating the initial account) is present
         // and visible, bring that to top (to prevent opening the hidden main window, which is
         // empty)
         if (controller.login_dialog != null && controller.login_dialog.visible) {
             controller.login_dialog.present_with_time(Gdk.CURRENT_TIME);
-            
+
             return true;
         }
-        
+
         if (controller.main_window == null)
             return false;
-        
+
         if (!controller.main_window.get_realized())
             controller.main_window.show_all();
         else
             controller.main_window.present_with_time(Gdk.CURRENT_TIME);
-        
+
         return true;
     }
-    
+
     private async void create_async() {
         // Manually keep the main loop around for the duration of this call.
         // Without this, the main loop will exit as soon as we hit the yield
         // below, before we create the main window.
         hold();
-        
+
         // do *after* parsing args, as they dicate where logging is sent to, if anywhere, and only
         // after activate (which means this is only logged for the one user-visible instance, not
         // the other instances called when sending commands to the app via the command-line)
         message("%s %s prefix=%s exec_dir=%s is_installed=%s", NAME, VERSION, INSTALL_PREFIX,
             exec_dir.get_path(), is_installed().to_string());
-        
+
         config = new Configuration(APP_ID);
         yield controller.open_async();
-        
+
         release();
     }
-    
+
     private async void destroy_async() {
         // see create_async() for reasoning hold/release is used
         hold();
-        
+
         yield controller.close_async();
-        
+
         release();
-        
+
         is_destroyed = true;
     }
-    
+
     public bool compose(string mailto) {
         if (controller == null)
             return false;
-        
+
         controller.compose_mailto(mailto);
         return true;
     }
-    
+
     // NOTE: This assert()'s if the Gtk.Action is not present in the default action group
     public Gtk.Action get_action(string name) {
         Gtk.Action? action = actions.get_action(name);
         assert(action != null);
-        
+
         return action;
     }
-    
+
     public File get_user_data_directory() {
         return File.new_for_path(Environment.get_user_data_dir()).get_child("pantheon-mail");
     }
-    
+
     public File get_user_config_directory() {
         return File.new_for_path(Environment.get_user_config_dir()).get_child("pantheon-mail");
     }
-    
+
     /**
      * Returns the base directory that the application's various resource files are stored.  If the
      * application is running from its installed directory, this will point to
@@ -258,54 +258,54 @@
         else
             return File.new_for_path(SOURCE_ROOT_DIR + "/data");
     }
-    
+
     // Returns the directory the application is currently executing from.
     public File get_exec_dir() {
         return exec_dir;
     }
-    
+
     public File? get_desktop_file() {
         File? install_dir = get_install_dir();
         File desktop_file = (install_dir != null)
             ? install_dir.get_child("share").get_child("applications").get_child("pantheon-mail.desktop")
             : File.new_for_path(SOURCE_ROOT_DIR).get_child("build").get_child("desktop").get_child("pantheon-mail.desktop");
-        
+
         return desktop_file.query_exists() ? desktop_file : null;
     }
-    
+
     public bool is_installed() {
         return exec_dir.has_prefix(get_install_prefix_dir());
     }
-    
+
     // Returns the configure installation prefix directory, which does not imply Geary is installed
     // or that it's running from this directory.
     public File get_install_prefix_dir() {
         return File.new_for_path(INSTALL_PREFIX);
     }
-    
+
     // Returns the installation directory, or null if we're running outside of the installation
     // directory.
     public File? get_install_dir() {
         File prefix_dir = get_install_prefix_dir();
-        
+
         return exec_dir.has_prefix(prefix_dir) ? prefix_dir : null;
     }
-    
+
     // This call will fire "exiting" only if it's not already been fired.
     public void exit(int exitcode = 0) {
         if (exiting_fired)
             return;
-        
+
         this.exitcode = exitcode;
-        
+
         exiting_fired = true;
         if (!exiting(false)) {
             exiting_fired = false;
             this.exitcode = 0;
-            
+
             return;
         }
-        
+
         // Give asynchronous destroy_async() a chance to complete, but to avoid bug(s) where
         // Mail hangs at exit, shut the whole thing down if destroy_async() takes too long to
         // complete
@@ -313,23 +313,23 @@
         destroy_async.begin();
         while (!is_destroyed || Gtk.events_pending()) {
             Gtk.main_iteration();
-            
+
             int64 delta_usec = get_monotonic_time() - start_usec;
             if (delta_usec >= FORCE_SHUTDOWN_USEC) {
                 debug("Forcing shutdown of Mail, %ss passed...", (delta_usec / USEC_PER_SEC).to_string());
-                
+
                 break;
             }
         }
-        
+
         if (Gtk.main_level() > 0)
             Gtk.main_quit();
         else
             Posix.exit(exitcode);
-        
+
         Date.terminate();
     }
-    
+
     /**
      * A callback for GearyApplication.exiting should return cancel_exit() to prevent the
      * application from exiting.
@@ -338,7 +338,7 @@
         Signal.stop_emission_by_name(this, "exiting");
         return false;
     }
-    
+
     // This call will fire "exiting" only if it's not already been fired and halt the application
     // in its tracks.
     public void panic() {
@@ -346,8 +346,7 @@
             exiting_fired = true;
             exiting(true);
         }
-        
+
         Posix.exit(1);
     }
 }
-