[Telepathy-commits] [telepathy-qt4/master] Fixed merge conflict.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/pending-account.cpp    |    5 -----
 TelepathyQt4/Client/pending-connection.cpp |    6 ------
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/TelepathyQt4/Client/pending-account.cpp b/TelepathyQt4/Client/pending-account.cpp
index 7d0ad43..f4fc49d 100644
--- a/TelepathyQt4/Client/pending-account.cpp
+++ b/TelepathyQt4/Client/pending-account.cpp
@@ -130,11 +130,6 @@ AccountPtr PendingAccount::account() const
                 new Account(mPriv->manager, mPriv->objectPath.path()));
     }
 
-    if (!mPriv->account) {
-        mPriv->account = QSharedPointer<Account>(
-                new Account(mPriv->manager, mPriv->objectPath.path()));
-    }
-
     return mPriv->account;
 }
 
diff --git a/TelepathyQt4/Client/pending-connection.cpp b/TelepathyQt4/Client/pending-connection.cpp
index 99dc540..d5e4f62 100644
--- a/TelepathyQt4/Client/pending-connection.cpp
+++ b/TelepathyQt4/Client/pending-connection.cpp
@@ -130,12 +130,6 @@ ConnectionPtr PendingConnection::connection() const
                     mPriv->serviceName, mPriv->objectPath.path()));
     }
 
-    if (!mPriv->connection) {
-        mPriv->connection = QSharedPointer<Connection>(
-                new Connection(mPriv->manager->dbusConnection(),
-                    mPriv->serviceName, mPriv->objectPath.path()));
-    }
-
     return mPriv->connection;
 }
 
-- 
1.5.6.5