commit 08389d291ded93bb50e1936f1daa5e5c948bd59a
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Mon Apr 17 11:58:40 2017 -0400
committer Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Mon Apr 17 12:08:56 2017 -0400
tree 42f6a6c8131cf6b3d1e46817b4a8ff2847925530
parent 6fa2205d8021f9a766658a17f7d72665d8892bd1

Revert "fix : AvailableAccountModel uses"

This reverts commit 11241729d14649213b96dc4cd0ffbe88536e60f7.

Change-Id: Ia7525b63c032f76a64441e7c7a07556152d927a6
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Tuleap: #1579

src/utils/accounts.cpp

diff --git a/src/utils/accounts.cpp b/src/utils/accounts.cpp
index b9aa20e..bbc182b 100644
--- a/src/utils/accounts.cpp
+++ b/src/utils/accounts.cpp
@@ -20,7 +20,6 @@
 #include "accounts.h"
 
 #include <accountmodel.h>
-#include <availableaccountmodel.h>
 
 // LRC
 #include <QItemSelectionModel>
@@ -59,8 +58,6 @@
 Account*
 get_active_ring_account()
 {
-    const auto idx = AvailableAccountModel::instance().selectionModel()->currentIndex();
-    auto account = idx.data(static_cast<int>(Account::Role::Object)).value<Account*>();
-
+    auto account = AccountModel::instance().userChosenAccount();
     return (account && account->protocol() == Account::Protocol::RING) ? account : nullptr;
 }