Merge lp:~pantheon-friends-dev/pantheon-friends/elementaryio_account into lp:pantheon-friends

Proposed by Goncalo Margalho on 2013-09-16
Status: Needs review
Proposed branch: lp:~pantheon-friends-dev/pantheon-friends/elementaryio_account
Merge into: lp:pantheon-friends
Diff against target: 37 lines (+8/-4)
1 file modified
src/Lib/telepathy_manager.vala (+8/-4)
To merge this branch: bzr merge lp:~pantheon-friends-dev/pantheon-friends/elementaryio_account
Reviewer Review Type Date Requested Status
Developers of Friends 2013-09-16 Pending
Review via email: mp+185931@code.launchpad.net
To post a comment you must log in.
Rico Tzschichholz (ricotz) wrote :

Remove the debug output and check that is correct *const string DOMAIN_TELEPATHY = "elementary_2eio"*
So look at the diff and minimize the changes.

Unmerged revisions

2. By Goncalo Margalho on 2013-09-16

change telepathy manager to look for an elementary.io account instead of a localhost one

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Lib/telepathy_manager.vala'
2--- src/Lib/telepathy_manager.vala 2013-09-16 14:37:45 +0000
3+++ src/Lib/telepathy_manager.vala 2013-09-16 21:04:12 +0000
4@@ -27,7 +27,8 @@
5
6 public MainWindow mw;
7
8- const string DOMAIN = "localhost";
9+ const string DOMAIN = "elementary.io";
10+ const string DOMAIN_TELEPATHY = "elementary_2eio";
11
12 public TelepathyManager () {
13
14@@ -75,9 +76,12 @@
15 public bool need_login () {
16 List<TelepathyGLib.Account> accounts = this.am.dup_valid_accounts();
17 debug("Need Login found %u accounts", accounts.length() );
18- foreach (TelepathyGLib.Account account in accounts)
19- if (account.get_path_suffix().contains(DOMAIN))
20+ foreach (TelepathyGLib.Account account in accounts) {
21+ stdout.printf(account.get_path_suffix() + "SUFFIX\n");
22+ if (account.get_path_suffix().contains(DOMAIN_TELEPATHY))
23+
24 return false;
25+ }
26
27 return true;
28 }
29@@ -87,7 +91,7 @@
30 debug("found %u accounts", accounts.length() );
31 foreach(TelepathyGLib.Account account in accounts){
32 stdout.printf(account.get_path_suffix() + "SUFFIX\n");
33- if(account.get_path_suffix().contains(DOMAIN)) {
34+ if(account.get_path_suffix().contains(DOMAIN_TELEPATHY)) {
35 account.set_enabled_async.begin (true, (obj, res) => {
36
37 try {

Subscribers

People subscribed via source and target branches

to all changes: