Mail

Merge lp:~elementary-apps/pantheon-mail/own-gsettings into lp:~elementary-apps/pantheon-mail/trunk

  1. own-gsettings
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 1958
Merged at revision: 1962
Proposed branch: lp:~elementary-apps/pantheon-mail/own-gsettings
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 49 lines (+5/-5)
3 files modified
data/org.pantheon.mail.gschema.xml (+1/-1)
src/client/application/geary-application.vala (+1/-1)
src/client/application/secret-mediator.vala (+3/-3)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-mail/own-gsettings
Reviewer Review Type Date Requested Status
Ralph Plawetzki (community) Approve
Review via email: mp+285257@code.launchpad.net

Commit message

create org.pantheon.mail gsettings schema

To post a comment you must log in.
lp:~elementary-apps/pantheon-mail/own-gsettings updated
1958. By Danielle Foré

merge trunk

Revision history for this message
Ralph Plawetzki (purejava) wrote :

Works as expected. GSettings and credentials are saved to and read from the new location.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'data/org.yorba.geary.gschema.xml' => 'data/org.pantheon.mail.gschema.xml'
2--- data/org.yorba.geary.gschema.xml 2016-01-16 07:46:11 +0000
3+++ data/org.pantheon.mail.gschema.xml 2016-02-08 16:01:38 +0000
4@@ -1,6 +1,6 @@
5 <schemalist>
6
7-<schema id="org.yorba.geary" path="/org/yorba/geary/">
8+<schema id="org.pantheon.mail" path="/org/pantheon/mail/">
9
10 <key name="window-maximize" type="b">
11 <default>false</default>
12
13=== modified file 'src/client/application/geary-application.vala'
14--- src/client/application/geary-application.vala 2016-01-18 20:58:35 +0000
15+++ src/client/application/geary-application.vala 2016-02-08 16:01:38 +0000
16@@ -14,7 +14,7 @@
17 public class GearyApplication : Gtk.Application {
18 public const string NAME = "Mail";
19 public const string PRGNAME = "geary";
20- public const string APP_ID = "org.yorba.geary";
21+ public const string APP_ID = "org.pantheon.mail";
22 public const string DESCRIPTION = _("Mail Client");
23 public const string COPYRIGHT = _("© 2011-2015 Yorba Foundation, © 2016 elementary LLC.");
24 public const string WEBSITE = "https://www.elementary.io";
25
26=== modified file 'src/client/application/secret-mediator.vala'
27--- src/client/application/secret-mediator.vala 2015-02-06 20:43:33 +0000
28+++ src/client/application/secret-mediator.vala 2016-02-08 16:01:38 +0000
29@@ -6,17 +6,17 @@
30
31 // LibSecret password adapter.
32 public class SecretMediator : Geary.CredentialsMediator, Object {
33- private const string OLD_GEARY_USERNAME_PREFIX = "org.yorba.geary username:";
34+ private const string OLD_GEARY_USERNAME_PREFIX = "org.pantheon.mail username:";
35
36 private Geary.Nonblocking.Mutex dialog_mutex = new Geary.Nonblocking.Mutex();
37
38 private string get_key_name(Geary.Service service, string user) {
39 switch (service) {
40 case Geary.Service.IMAP:
41- return "org.yorba.geary imap_username:" + user;
42+ return "org.pantheon.mail imap_username:" + user;
43
44 case Geary.Service.SMTP:
45- return "org.yorba.geary smtp_username:" + user;
46+ return "org.pantheon.mail smtp_username:" + user;
47
48 default:
49 assert_not_reached();

Subscribers

People subscribed via source and target branches