Mail

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

  1. fix-mail-translation
  2. Merge into trunk
Proposed by Leonardo Lemos
Status: Merged
Merged at revision: 2134
Proposed branch: lp:~leonardolemos/pantheon-mail/fix-mail-translation
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 835 lines (+131/-70)
3 files modified
po/extra/extra.pot (+1/-1)
po/pantheon-mail.pot (+63/-1)
src/client/application/geary-application.vala (+67/-68)
To merge this branch: bzr merge lp:~leonardolemos/pantheon-mail/fix-mail-translation
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+301568@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/extra/extra.pot'
2--- po/extra/extra.pot 2016-07-09 17:27:52 +0000
3+++ po/extra/extra.pot 2016-07-30 14:08:20 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2016-07-09 10:27-0700\n"
9+"POT-Creation-Date: 2016-07-30 18:03+0400\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13
14=== modified file 'po/pantheon-mail.pot'
15--- po/pantheon-mail.pot 2016-07-09 17:27:52 +0000
16+++ po/pantheon-mail.pot 2016-07-30 14:08:20 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: PACKAGE VERSION\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2016-07-09 10:27-0700\n"
22+"POT-Creation-Date: 2016-07-30 18:03+0400\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -319,6 +319,7 @@
27 #: ../src/client/components/main-toolbar.vala:108
28 #: ../src/client/components/main-toolbar.vala:107
29 #: ../src/client/components/main-toolbar.vala:123
30+#: ../src/client/application/geary-controller.vala:387
31 msgid "Mark conversation"
32 msgstr ""
33
34@@ -377,6 +378,7 @@
35 #: ../src/client/application/geary-controller.vala:371
36 #: ../src/client/application/geary-controller.vala:370
37 #: ../src/client/application/geary-controller.vala:369
38+#: ../src/client/application/geary-controller.vala:375
39 msgid "A_ccounts"
40 msgstr ""
41
42@@ -386,6 +388,7 @@
43 #: ../src/client/application/geary-controller.vala:375
44 #: ../src/client/components/stock.vala:26
45 #: ../src/client/application/geary-controller.vala:374
46+#: ../src/client/application/geary-controller.vala:380
47 msgid "_Preferences"
48 msgstr ""
49
50@@ -408,6 +411,7 @@
51 #: ../src/client/application/geary-controller.vala:383
52 #: ../src/client/components/stock.vala:28
53 #: ../src/client/application/geary-controller.vala:378
54+#: ../src/client/application/geary-controller.vala:384
55 msgid "_Quit"
56 msgstr ""
57
58@@ -415,6 +419,7 @@
59 #: ../src/client/application/geary-controller.vala:393
60 #: ../src/client/application/geary-controller.vala:388
61 #: ../src/client/application/geary-controller.vala:383
62+#: ../src/client/application/geary-controller.vala:389
63 msgid "_Mark as..."
64 msgstr ""
65
66@@ -422,6 +427,7 @@
67 #: ../src/client/application/geary-controller.vala:399
68 #: ../src/client/application/geary-controller.vala:394
69 #: ../src/client/application/geary-controller.vala:389
70+#: ../src/client/application/geary-controller.vala:395
71 msgid "Mark as _Read"
72 msgstr ""
73
74@@ -429,6 +435,7 @@
75 #: ../src/client/application/geary-controller.vala:405
76 #: ../src/client/application/geary-controller.vala:400
77 #: ../src/client/application/geary-controller.vala:395
78+#: ../src/client/application/geary-controller.vala:401
79 msgid "Mark as _Unread"
80 msgstr ""
81
82@@ -436,6 +443,7 @@
83 #: ../src/client/application/geary-controller.vala:411
84 #: ../src/client/application/geary-controller.vala:406
85 #: ../src/client/application/geary-controller.vala:401
86+#: ../src/client/application/geary-controller.vala:407
87 msgid "_Star"
88 msgstr ""
89
90@@ -443,6 +451,7 @@
91 #: ../src/client/application/geary-controller.vala:416
92 #: ../src/client/application/geary-controller.vala:411
93 #: ../src/client/application/geary-controller.vala:406
94+#: ../src/client/application/geary-controller.vala:412
95 msgid "U_nstar"
96 msgstr ""
97
98@@ -450,6 +459,7 @@
99 #: ../src/client/application/geary-controller.vala:426
100 #: ../src/client/application/geary-controller.vala:421
101 #: ../src/client/application/geary-controller.vala:416
102+#: ../src/client/application/geary-controller.vala:422
103 msgid "Add label"
104 msgstr ""
105
106@@ -457,6 +467,7 @@
107 #: ../src/client/application/geary-controller.vala:427
108 #: ../src/client/application/geary-controller.vala:422
109 #: ../src/client/application/geary-controller.vala:417
110+#: ../src/client/application/geary-controller.vala:423
111 msgid "_Label"
112 msgstr ""
113
114@@ -464,6 +475,7 @@
115 #: ../src/client/application/geary-controller.vala:431
116 #: ../src/client/application/geary-controller.vala:426
117 #: ../src/client/application/geary-controller.vala:421
118+#: ../src/client/application/geary-controller.vala:427
119 msgid "_Move"
120 msgstr ""
121
122@@ -541,6 +553,7 @@
123 #: ../src/client/application/geary-controller.vala:485
124 #: ../src/client/application/geary-controller.vala:479
125 #: ../src/client/application/geary-controller.vala:474
126+#: ../src/client/application/geary-controller.vala:480
127 msgid "Empty _Spam…"
128 msgstr ""
129
130@@ -550,6 +563,7 @@
131 #: ../src/client/application/geary-controller.vala:489
132 #: ../src/client/application/geary-controller.vala:483
133 #: ../src/client/application/geary-controller.vala:478
134+#: ../src/client/application/geary-controller.vala:484
135 msgid "Empty _Trash…"
136 msgstr ""
137
138@@ -796,6 +810,7 @@
139 #: ../src/client/application/geary-controller.vala:1940
140 #: ../src/client/application/geary-controller.vala:1936
141 #: ../src/client/application/geary-controller.vala:1931
142+#: ../src/client/application/geary-controller.vala:1937
143 msgid "Undo move (Ctrl+Z)"
144 msgstr ""
145
146@@ -832,6 +847,7 @@
147 #: ../src/client/application/geary-controller.vala:1966
148 #: ../src/client/application/geary-controller.vala:1962
149 #: ../src/client/application/geary-controller.vala:1957
150+#: ../src/client/application/geary-controller.vala:1963
151 msgid "A file named \"%s\" already exists. Do you want to replace it?"
152 msgstr ""
153
154@@ -842,6 +858,7 @@
155 #: ../src/client/application/geary-controller.vala:1968
156 #: ../src/client/application/geary-controller.vala:1964
157 #: ../src/client/application/geary-controller.vala:1959
158+#: ../src/client/application/geary-controller.vala:1965
159 msgid ""
160 "The file already exists in \"%s\". Replacing it will overwrite its contents."
161 msgstr ""
162@@ -853,6 +870,7 @@
163 #: ../src/client/application/geary-controller.vala:1971
164 #: ../src/client/application/geary-controller.vala:1967
165 #: ../src/client/application/geary-controller.vala:1962
166+#: ../src/client/application/geary-controller.vala:1968
167 msgid "_Replace"
168 msgstr ""
169
170@@ -1452,6 +1470,7 @@
171 #: ../src/client/conversation-viewer/conversation-viewer.vala:302
172 #: ../src/client/conversation-viewer/conversation-viewer.vala:308
173 #: ../src/client/conversation-viewer/conversation-viewer.vala:310
174+#: ../src/client/conversation-viewer/conversation-viewer.vala:311
175 msgid "No conversations selected."
176 msgstr ""
177
178@@ -1460,6 +1479,7 @@
179 #: ../src/client/conversation-viewer/conversation-viewer.vala:304
180 #: ../src/client/conversation-viewer/conversation-viewer.vala:310
181 #: ../src/client/conversation-viewer/conversation-viewer.vala:312
182+#: ../src/client/conversation-viewer/conversation-viewer.vala:313
183 msgid "%u conversation selected."
184 msgid_plural "%u conversations selected."
185 msgstr[0] ""
186@@ -1470,6 +1490,7 @@
187 #: ../src/client/conversation-viewer/conversation-viewer.vala:333
188 #: ../src/client/conversation-viewer/conversation-viewer.vala:339
189 #: ../src/client/conversation-viewer/conversation-viewer.vala:341
190+#: ../src/client/conversation-viewer/conversation-viewer.vala:342
191 msgid "No search results found."
192 msgstr ""
193
194@@ -1478,6 +1499,7 @@
195 #: ../src/client/conversation-viewer/conversation-viewer.vala:335
196 #: ../src/client/conversation-viewer/conversation-viewer.vala:341
197 #: ../src/client/conversation-viewer/conversation-viewer.vala:343
198+#: ../src/client/conversation-viewer/conversation-viewer.vala:344
199 msgid "No conversations in folder."
200 msgstr ""
201
202@@ -1487,6 +1509,7 @@
203 #: ../src/client/conversation-viewer/ConversationWidget.vala:450
204 #: ../src/client/conversation-viewer/ConversationWidget.vala:453
205 #: ../src/client/conversation-viewer/ConversationWidget.vala:456
206+#: ../src/client/conversation-viewer/ConversationWidget.vala:459
207 msgid "This message contains remote images."
208 msgstr ""
209
210@@ -1496,6 +1519,7 @@
211 #: ../src/client/conversation-viewer/ConversationWidget.vala:448
212 #: ../src/client/conversation-viewer/ConversationWidget.vala:451
213 #: ../src/client/conversation-viewer/ConversationWidget.vala:454
214+#: ../src/client/conversation-viewer/ConversationWidget.vala:457
215 msgid "Show Images"
216 msgstr ""
217
218@@ -1510,6 +1534,7 @@
219 #: ../src/client/conversation-viewer/ConversationWidget.vala:397
220 #: ../src/client/conversation-viewer/ConversationWidget.vala:400
221 #: ../src/client/conversation-viewer/ConversationWidget.vala:403
222+#: ../src/client/conversation-viewer/ConversationWidget.vala:405
223 msgid "Edit Draft"
224 msgstr ""
225
226@@ -1517,6 +1542,7 @@
227 #: ../src/client/conversation-viewer/conversation-viewer.vala:814
228 #: ../src/client/conversation-viewer/ConversationWidget.vala:145
229 #: ../src/client/conversation-viewer/ConversationWidget.vala:148
230+#: ../src/client/conversation-viewer/ConversationWidget.vala:150
231 msgid "From:"
232 msgstr ""
233
234@@ -1525,6 +1551,7 @@
235 #: ../src/client/conversation-viewer/ConversationWidget.vala:149
236 #: ../src/client/conversation-viewer/ConversationWidget.vala:158
237 #: ../src/client/conversation-viewer/ConversationWidget.vala:161
238+#: ../src/client/conversation-viewer/ConversationWidget.vala:163
239 msgid "To:"
240 msgstr ""
241
242@@ -1533,6 +1560,7 @@
243 #: ../src/client/conversation-viewer/ConversationWidget.vala:154
244 #: ../src/client/conversation-viewer/ConversationWidget.vala:163
245 #: ../src/client/conversation-viewer/ConversationWidget.vala:166
246+#: ../src/client/conversation-viewer/ConversationWidget.vala:168
247 msgid "Cc:"
248 msgstr ""
249
250@@ -1541,6 +1569,7 @@
251 #: ../src/client/conversation-viewer/ConversationWidget.vala:159
252 #: ../src/client/conversation-viewer/ConversationWidget.vala:168
253 #: ../src/client/conversation-viewer/ConversationWidget.vala:171
254+#: ../src/client/conversation-viewer/ConversationWidget.vala:173
255 msgid "Bcc:"
256 msgstr ""
257
258@@ -1549,6 +1578,7 @@
259 #: ../src/client/conversation-viewer/ConversationWidget.vala:164
260 #: ../src/client/conversation-viewer/ConversationWidget.vala:173
261 #: ../src/client/conversation-viewer/ConversationWidget.vala:176
262+#: ../src/client/conversation-viewer/ConversationWidget.vala:178
263 msgid "Subject:"
264 msgstr ""
265
266@@ -1576,6 +1606,7 @@
267 #: ../src/client/conversation-viewer/ConversationWidget.vala:1153
268 #: ../src/client/conversation-viewer/ConversationWidget.vala:1157
269 #: ../src/client/conversation-viewer/ConversationWidget.vala:1162
270+#: ../src/client/conversation-viewer/ConversationWidget.vala:1172
271 msgid "_Copy"
272 msgstr ""
273
274@@ -1585,6 +1616,7 @@
275 #: ../src/client/conversation-viewer/ConversationWidget.vala:1161
276 #: ../src/client/conversation-viewer/ConversationWidget.vala:1165
277 #: ../src/client/conversation-viewer/ConversationWidget.vala:1170
278+#: ../src/client/conversation-viewer/ConversationWidget.vala:1180
279 msgid "Copy _Email Address"
280 msgstr ""
281
282@@ -1596,6 +1628,7 @@
283 #: ../data/ui/composer.ui:103
284 #: ../src/client/conversation-viewer/ConversationWidget.vala:1174
285 #: ../src/client/conversation-viewer/ConversationWidget.vala:1179
286+#: ../src/client/conversation-viewer/ConversationWidget.vala:1189
287 msgid "Copy _Link"
288 msgstr ""
289
290@@ -1612,6 +1645,7 @@
291 #: ../src/client/conversation-viewer/ConversationWidget.vala:1181
292 #: ../src/client/conversation-viewer/ConversationWidget.vala:1185
293 #: ../src/client/conversation-viewer/ConversationWidget.vala:1190
294+#: ../src/client/conversation-viewer/ConversationWidget.vala:1200
295 msgid "Select _All"
296 msgstr ""
297
298@@ -1621,6 +1655,7 @@
299 #: ../src/client/conversation-viewer/ConversationWidget.vala:1187
300 #: ../src/client/conversation-viewer/ConversationWidget.vala:1191
301 #: ../src/client/conversation-viewer/ConversationWidget.vala:1196
302+#: ../src/client/conversation-viewer/ConversationWidget.vala:1206
303 msgid "_Inspect"
304 msgstr ""
305
306@@ -1692,6 +1727,7 @@
307 #: ../src/client/conversation-viewer/ConversationWidget.vala:1062
308 #: ../src/client/conversation-viewer/ConversationWidget.vala:1066
309 #: ../src/client/conversation-viewer/ConversationWidget.vala:1071
310+#: ../src/client/conversation-viewer/ConversationWidget.vala:1081
311 msgid "Failed to open default text editor."
312 msgstr ""
313
314@@ -2717,30 +2753,35 @@
315 #: ../src/client/conversation-viewer/ConversationWidget.vala:218
316 #: ../src/client/conversation-viewer/ConversationWidget.vala:227
317 #: ../src/client/conversation-viewer/ConversationWidget.vala:230
318+#: ../src/client/conversation-viewer/ConversationWidget.vala:232
319 msgid "Save Attachment…"
320 msgstr ""
321
322 #: ../src/client/conversation-viewer/ConversationWidget.vala:220
323 #: ../src/client/conversation-viewer/ConversationWidget.vala:229
324 #: ../src/client/conversation-viewer/ConversationWidget.vala:232
325+#: ../src/client/conversation-viewer/ConversationWidget.vala:234
326 msgid "Save All Attachments…"
327 msgstr ""
328
329 #: ../src/client/conversation-viewer/ConversationWidget.vala:229
330 #: ../src/client/conversation-viewer/ConversationWidget.vala:238
331 #: ../src/client/conversation-viewer/ConversationWidget.vala:241
332+#: ../src/client/conversation-viewer/ConversationWidget.vala:243
333 msgid "Reply"
334 msgstr ""
335
336 #: ../src/client/conversation-viewer/ConversationWidget.vala:230
337 #: ../src/client/conversation-viewer/ConversationWidget.vala:239
338 #: ../src/client/conversation-viewer/ConversationWidget.vala:242
339+#: ../src/client/conversation-viewer/ConversationWidget.vala:244
340 msgid "Reply to All"
341 msgstr ""
342
343 #: ../src/client/conversation-viewer/ConversationWidget.vala:231
344 #: ../src/client/conversation-viewer/ConversationWidget.vala:240
345 #: ../src/client/conversation-viewer/ConversationWidget.vala:243
346+#: ../src/client/conversation-viewer/ConversationWidget.vala:245
347 msgid "Forward"
348 msgstr ""
349
350@@ -2751,6 +2792,8 @@
351 #: ../src/client/conversation-viewer/ConversationWidget.vala:1140
352 #: ../src/client/conversation-viewer/ConversationWidget.vala:270
353 #: ../src/client/conversation-viewer/ConversationWidget.vala:1145
354+#: ../src/client/conversation-viewer/ConversationWidget.vala:272
355+#: ../src/client/conversation-viewer/ConversationWidget.vala:1155
356 msgid "Mark as Unread"
357 msgstr ""
358
359@@ -2761,18 +2804,22 @@
360 #: ../src/client/conversation-viewer/ConversationWidget.vala:1138
361 #: ../src/client/conversation-viewer/ConversationWidget.vala:272
362 #: ../src/client/conversation-viewer/ConversationWidget.vala:1143
363+#: ../src/client/conversation-viewer/ConversationWidget.vala:274
364+#: ../src/client/conversation-viewer/ConversationWidget.vala:1153
365 msgid "Mark as Read"
366 msgstr ""
367
368 #: ../src/client/conversation-viewer/ConversationWidget.vala:252
369 #: ../src/client/conversation-viewer/ConversationWidget.vala:272
370 #: ../src/client/conversation-viewer/ConversationWidget.vala:275
371+#: ../src/client/conversation-viewer/ConversationWidget.vala:277
372 msgid "Print…"
373 msgstr ""
374
375 #: ../src/client/conversation-viewer/ConversationWidget.vala:253
376 #: ../src/client/conversation-viewer/ConversationWidget.vala:273
377 #: ../src/client/conversation-viewer/ConversationWidget.vala:276
378+#: ../src/client/conversation-viewer/ConversationWidget.vala:278
379 msgid "View Source"
380 msgstr ""
381
382@@ -2784,6 +2831,8 @@
383 #: ../src/client/conversation-viewer/ConversationWidget.vala:630
384 #: ../src/client/conversation-viewer/ConversationWidget.vala:343
385 #: ../src/client/conversation-viewer/ConversationWidget.vala:635
386+#: ../src/client/conversation-viewer/ConversationWidget.vala:345
387+#: ../src/client/conversation-viewer/ConversationWidget.vala:638
388 msgid "View message"
389 msgstr ""
390
391@@ -2791,6 +2840,7 @@
392 #: ../src/client/conversation-viewer/ConversationWidget.vala:406
393 #: ../src/client/conversation-viewer/ConversationWidget.vala:409
394 #: ../src/client/conversation-viewer/ConversationWidget.vala:412
395+#: ../src/client/conversation-viewer/ConversationWidget.vala:414
396 msgid "This message contains one or more attachments"
397 msgstr ""
398
399@@ -2798,6 +2848,7 @@
400 #: ../src/client/conversation-viewer/ConversationWidget.vala:449
401 #: ../src/client/conversation-viewer/ConversationWidget.vala:452
402 #: ../src/client/conversation-viewer/ConversationWidget.vala:455
403+#: ../src/client/conversation-viewer/ConversationWidget.vala:458
404 msgid "Always Show from Sender"
405 msgstr ""
406
407@@ -2805,6 +2856,7 @@
408 #: ../src/client/conversation-viewer/ConversationWidget.vala:577
409 #: ../src/client/conversation-viewer/ConversationWidget.vala:581
410 #: ../src/client/conversation-viewer/ConversationWidget.vala:584
411+#: ../src/client/conversation-viewer/ConversationWidget.vala:587
412 msgid "Compose New Message"
413 msgstr ""
414
415@@ -2812,6 +2864,7 @@
416 #: ../src/client/conversation-viewer/ConversationWidget.vala:578
417 #: ../src/client/conversation-viewer/ConversationWidget.vala:582
418 #: ../src/client/conversation-viewer/ConversationWidget.vala:585
419+#: ../src/client/conversation-viewer/ConversationWidget.vala:588
420 msgid "Copy Email Address"
421 msgstr ""
422
423@@ -2819,6 +2872,7 @@
424 #: ../src/client/conversation-viewer/ConversationWidget.vala:639
425 #: ../src/client/conversation-viewer/ConversationWidget.vala:643
426 #: ../src/client/conversation-viewer/ConversationWidget.vala:648
427+#: ../src/client/conversation-viewer/ConversationWidget.vala:651
428 msgid "Hide message"
429 msgstr ""
430
431@@ -2848,18 +2902,22 @@
432 #: ../src/client/conversation-viewer/ConversationWidget.vala:426
433 #: ../src/client/conversation-viewer/ConversationWidget.vala:416
434 #: ../src/client/conversation-viewer/ConversationWidget.vala:429
435+#: ../src/client/conversation-viewer/ConversationWidget.vala:418
436+#: ../src/client/conversation-viewer/ConversationWidget.vala:431
437 msgid "Star message"
438 msgstr ""
439
440 #: ../src/client/conversation-viewer/ConversationWidget.vala:420
441 #: ../src/client/conversation-viewer/ConversationWidget.vala:423
442 #: ../src/client/conversation-viewer/ConversationWidget.vala:426
443+#: ../src/client/conversation-viewer/ConversationWidget.vala:428
444 msgid "Unstar message"
445 msgstr ""
446
447 #: ../src/client/conversation-viewer/ConversationWidget.vala:430
448 #: ../src/client/conversation-viewer/ConversationWidget.vala:433
449 #: ../src/client/conversation-viewer/ConversationWidget.vala:436
450+#: ../src/client/conversation-viewer/ConversationWidget.vala:438
451 msgid "More"
452 msgstr ""
453
454@@ -2940,3 +2998,7 @@
455 #: ../src/client/conversation-list/formatted-conversation-data.vala:190
456 msgid ", "
457 msgstr ""
458+
459+#: ../src/client/application/geary-application.vala:15
460+msgid "Mail"
461+msgstr ""
462
463=== modified file 'src/client/application/geary-application.vala'
464--- src/client/application/geary-application.vala 2016-07-07 19:36:17 +0000
465+++ src/client/application/geary-application.vala 2016-07-30 14:08:20 +0000
466@@ -12,7 +12,7 @@
467 extern const string GETTEXT_PACKAGE;
468
469 public class GearyApplication : Gtk.Application {
470- public const string NAME = "Mail";
471+ public const string NAME = _("Mail");
472 public const string PRGNAME = "pantheon-mail";
473 public const string APP_ID = "org.pantheon.mail";
474 public const string COPYRIGHT = _("2011-2015 Yorba Foundation\n© 2016 elementary LLC.");
475@@ -46,16 +46,16 @@
476 "Sam Hewitt <sam@elementary.io>",
477 null
478 };
479-
480+
481 private const string ACTION_ENTRY_COMPOSE = "compose";
482-
483+
484 public const ActionEntry[] action_entries = {
485 {ACTION_ENTRY_COMPOSE, activate_compose, "s"},
486 };
487-
488+
489 private const int64 USEC_PER_SEC = 1000000;
490 private const int64 FORCE_SHUTDOWN_USEC = 5 * USEC_PER_SEC;
491-
492+
493 public static GearyApplication instance {
494 get { return _instance; }
495 private set {
496@@ -64,7 +64,7 @@
497 _instance = value;
498 }
499 }
500-
501+
502 /**
503 * Signal that is activated when 'exit' is called, but before the application actually exits.
504 *
505@@ -74,41 +74,41 @@
506 public virtual signal bool exiting(bool panicked) {
507 return true;
508 }
509-
510+
511 public GearyController controller { get; private set; default = new GearyController(); }
512-
513+
514 public Gtk.ActionGroup actions {
515 get; private set; default = new Gtk.ActionGroup("GearyActionGroup");
516 }
517 public Gee.Collection<Geary.ActionAdapter> action_adapters {
518 get; private set; default = new Gee.ArrayList<Geary.ActionAdapter>();
519 }
520-
521+
522 public Gtk.UIManager ui_manager {
523 get; private set; default = new Gtk.UIManager();
524 }
525-
526+
527 public Configuration config { get; private set; }
528
529 private static GearyApplication _instance = null;
530-
531+
532 private string bin;
533 private File exec_dir;
534 private bool exiting_fired = false;
535 private int exitcode = 0;
536 private bool is_destroyed = false;
537-
538+
539 public GearyApplication() {
540 Object(application_id: APP_ID);
541-
542+
543 _instance = this;
544 }
545-
546+
547 // Application.run() calls this as an entry point.
548 public override bool local_command_line(ref unowned string[] args, out int exit_status) {
549 bin = args[0];
550 exec_dir = (File.new_for_path(Posix.realpath(Environment.find_program_in_path(bin)))).get_parent();
551-
552+
553 try {
554 register();
555 } catch (Error e) {
556@@ -121,131 +121,131 @@
557 exit_status = 1;
558 return true;
559 }
560-
561+
562 activate();
563 foreach (unowned string arg in args) {
564 if (arg != null && arg.has_prefix(Geary.ComposedEmail.MAILTO_SCHEME))
565 activate_action(ACTION_ENTRY_COMPOSE, new Variant.string(arg));
566 }
567-
568+
569 exit_status = 0;
570 return true;
571 }
572-
573+
574 public override void startup() {
575 Configuration.init(is_installed(), GSETTINGS_DIR);
576-
577+
578 Environment.set_application_name(NAME);
579 Environment.set_prgname(PRGNAME);
580 International.init(GETTEXT_PACKAGE, bin);
581-
582+
583 Geary.Logging.init();
584 Date.init();
585 WebKit.set_cache_model(WebKit.CacheModel.DOCUMENT_BROWSER);
586-
587+
588 base.startup();
589-
590+
591 var notification_action = new SimpleAction ("go-to-notification", null);
592 notification_action.activate.connect (() => {
593 this.activate ();
594 controller.notification_clicked ();
595 });
596 add_action (notification_action);
597-
598+
599 add_action_entries(action_entries, this);
600 }
601-
602+
603 public override void activate() {
604 base.activate();
605-
606+
607 if (!present())
608 create_async.begin();
609 }
610-
611+
612 public void activate_compose(SimpleAction action, Variant? param) {
613 if (param == null)
614 return;
615-
616+
617 compose(param.get_string());
618 }
619-
620+
621 public bool present() {
622 if (controller == null)
623 return false;
624-
625+
626 // if LoginDialog (i.e. the opening dialog for creating the initial account) is present
627 // and visible, bring that to top (to prevent opening the hidden main window, which is
628 // empty)
629 if (controller.login_dialog != null && controller.login_dialog.visible) {
630 controller.login_dialog.present_with_time(Gdk.CURRENT_TIME);
631-
632+
633 return true;
634 }
635-
636+
637 if (controller.main_window == null)
638 return false;
639-
640+
641 if (!controller.main_window.get_realized())
642 controller.main_window.show_all();
643 else
644 controller.main_window.present_with_time(Gdk.CURRENT_TIME);
645-
646+
647 return true;
648 }
649-
650+
651 private async void create_async() {
652 // Manually keep the main loop around for the duration of this call.
653 // Without this, the main loop will exit as soon as we hit the yield
654 // below, before we create the main window.
655 hold();
656-
657+
658 // do *after* parsing args, as they dicate where logging is sent to, if anywhere, and only
659 // after activate (which means this is only logged for the one user-visible instance, not
660 // the other instances called when sending commands to the app via the command-line)
661 message("%s %s prefix=%s exec_dir=%s is_installed=%s", NAME, VERSION, INSTALL_PREFIX,
662 exec_dir.get_path(), is_installed().to_string());
663-
664+
665 config = new Configuration(APP_ID);
666 yield controller.open_async();
667-
668+
669 release();
670 }
671-
672+
673 private async void destroy_async() {
674 // see create_async() for reasoning hold/release is used
675 hold();
676-
677+
678 yield controller.close_async();
679-
680+
681 release();
682-
683+
684 is_destroyed = true;
685 }
686-
687+
688 public bool compose(string mailto) {
689 if (controller == null)
690 return false;
691-
692+
693 controller.compose_mailto(mailto);
694 return true;
695 }
696-
697+
698 // NOTE: This assert()'s if the Gtk.Action is not present in the default action group
699 public Gtk.Action get_action(string name) {
700 Gtk.Action? action = actions.get_action(name);
701 assert(action != null);
702-
703+
704 return action;
705 }
706-
707+
708 public File get_user_data_directory() {
709 return File.new_for_path(Environment.get_user_data_dir()).get_child("pantheon-mail");
710 }
711-
712+
713 public File get_user_config_directory() {
714 return File.new_for_path(Environment.get_user_config_dir()).get_child("pantheon-mail");
715 }
716-
717+
718 /**
719 * Returns the base directory that the application's various resource files are stored. If the
720 * application is running from its installed directory, this will point to
721@@ -258,54 +258,54 @@
722 else
723 return File.new_for_path(SOURCE_ROOT_DIR + "/data");
724 }
725-
726+
727 // Returns the directory the application is currently executing from.
728 public File get_exec_dir() {
729 return exec_dir;
730 }
731-
732+
733 public File? get_desktop_file() {
734 File? install_dir = get_install_dir();
735 File desktop_file = (install_dir != null)
736 ? install_dir.get_child("share").get_child("applications").get_child("pantheon-mail.desktop")
737 : File.new_for_path(SOURCE_ROOT_DIR).get_child("build").get_child("desktop").get_child("pantheon-mail.desktop");
738-
739+
740 return desktop_file.query_exists() ? desktop_file : null;
741 }
742-
743+
744 public bool is_installed() {
745 return exec_dir.has_prefix(get_install_prefix_dir());
746 }
747-
748+
749 // Returns the configure installation prefix directory, which does not imply Geary is installed
750 // or that it's running from this directory.
751 public File get_install_prefix_dir() {
752 return File.new_for_path(INSTALL_PREFIX);
753 }
754-
755+
756 // Returns the installation directory, or null if we're running outside of the installation
757 // directory.
758 public File? get_install_dir() {
759 File prefix_dir = get_install_prefix_dir();
760-
761+
762 return exec_dir.has_prefix(prefix_dir) ? prefix_dir : null;
763 }
764-
765+
766 // This call will fire "exiting" only if it's not already been fired.
767 public void exit(int exitcode = 0) {
768 if (exiting_fired)
769 return;
770-
771+
772 this.exitcode = exitcode;
773-
774+
775 exiting_fired = true;
776 if (!exiting(false)) {
777 exiting_fired = false;
778 this.exitcode = 0;
779-
780+
781 return;
782 }
783-
784+
785 // Give asynchronous destroy_async() a chance to complete, but to avoid bug(s) where
786 // Mail hangs at exit, shut the whole thing down if destroy_async() takes too long to
787 // complete
788@@ -313,23 +313,23 @@
789 destroy_async.begin();
790 while (!is_destroyed || Gtk.events_pending()) {
791 Gtk.main_iteration();
792-
793+
794 int64 delta_usec = get_monotonic_time() - start_usec;
795 if (delta_usec >= FORCE_SHUTDOWN_USEC) {
796 debug("Forcing shutdown of Mail, %ss passed...", (delta_usec / USEC_PER_SEC).to_string());
797-
798+
799 break;
800 }
801 }
802-
803+
804 if (Gtk.main_level() > 0)
805 Gtk.main_quit();
806 else
807 Posix.exit(exitcode);
808-
809+
810 Date.terminate();
811 }
812-
813+
814 /**
815 * A callback for GearyApplication.exiting should return cancel_exit() to prevent the
816 * application from exiting.
817@@ -338,7 +338,7 @@
818 Signal.stop_emission_by_name(this, "exiting");
819 return false;
820 }
821-
822+
823 // This call will fire "exiting" only if it's not already been fired and halt the application
824 // in its tracks.
825 public void panic() {
826@@ -346,8 +346,7 @@
827 exiting_fired = true;
828 exiting(true);
829 }
830-
831+
832 Posix.exit(1);
833 }
834 }
835-

Subscribers

People subscribed via source and target branches