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

Proposed by Goncalo Margalho
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 Pending
Review via email: mp+185931@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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

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
=== modified file 'src/Lib/telepathy_manager.vala'
--- src/Lib/telepathy_manager.vala 2013-09-16 14:37:45 +0000
+++ src/Lib/telepathy_manager.vala 2013-09-16 21:04:12 +0000
@@ -27,7 +27,8 @@
2727
28 public MainWindow mw;28 public MainWindow mw;
2929
30 const string DOMAIN = "localhost";30 const string DOMAIN = "elementary.io";
31 const string DOMAIN_TELEPATHY = "elementary_2eio";
3132
32 public TelepathyManager () {33 public TelepathyManager () {
3334
@@ -75,9 +76,12 @@
75 public bool need_login () {76 public bool need_login () {
76 List<TelepathyGLib.Account> accounts = this.am.dup_valid_accounts();77 List<TelepathyGLib.Account> accounts = this.am.dup_valid_accounts();
77 debug("Need Login found %u accounts", accounts.length() );78 debug("Need Login found %u accounts", accounts.length() );
78 foreach (TelepathyGLib.Account account in accounts)79 foreach (TelepathyGLib.Account account in accounts) {
79 if (account.get_path_suffix().contains(DOMAIN))80 stdout.printf(account.get_path_suffix() + "SUFFIX\n");
81 if (account.get_path_suffix().contains(DOMAIN_TELEPATHY))
82
80 return false;83 return false;
84 }
8185
82 return true;86 return true;
83 }87 }
@@ -87,7 +91,7 @@
87 debug("found %u accounts", accounts.length() );91 debug("found %u accounts", accounts.length() );
88 foreach(TelepathyGLib.Account account in accounts){ 92 foreach(TelepathyGLib.Account account in accounts){
89 stdout.printf(account.get_path_suffix() + "SUFFIX\n");93 stdout.printf(account.get_path_suffix() + "SUFFIX\n");
90 if(account.get_path_suffix().contains(DOMAIN)) {94 if(account.get_path_suffix().contains(DOMAIN_TELEPATHY)) {
91 account.set_enabled_async.begin (true, (obj, res) => {95 account.set_enabled_async.begin (true, (obj, res) => {
9296
93 try {97 try {

Subscribers

People subscribed via source and target branches

to all changes: