Fixing incorrect coreAccountId in client.

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5e472a1..8d60689 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -333,11 +333,12 @@ void Client::disconnectFromCore() {
     socket->deleteLater();
   }
   _syncedToCore = false;
     socket->deleteLater();
   }
   _syncedToCore = false;

-  setCurrentCoreAccount(0);

   emit disconnected();
   emit coreConnectionStateChanged(false);
 
   // Clear internal data. Hopefully nothing relies on it at this point.
   emit disconnected();
   emit coreConnectionStateChanged(false);
 
   // Clear internal data. Hopefully nothing relies on it at this point.

+  setCurrentCoreAccount(0);
+

   if(_bufferSyncer) {
     _bufferSyncer->deleteLater();
     _bufferSyncer = 0;
   if(_bufferSyncer) {
     _bufferSyncer->deleteLater();
     _bufferSyncer = 0;

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 64274a3..3a1dbd8 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -39,7 +39,8 @@ CoreAccountSettings::CoreAccountSettings(const QString &subgroup) : ClientSettin
 QList<AccountId> CoreAccountSettings::knownAccounts() {
   QList<AccountId> ids;
   foreach(QString key, localChildGroups()) {
 QList<AccountId> CoreAccountSettings::knownAccounts() {
   QList<AccountId> ids;
   foreach(QString key, localChildGroups()) {

-    ids << key.toInt();
+    AccountId acc = key.toInt();
+    if(acc.isValid()) ids << acc;

   }
   return ids;
 }
   }
   return ids;
 }

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 4811e2e..7490cb4 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -52,6 +52,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
   foreach(AccountId id, s.knownAccounts()) {
     if(!id.isValid()) continue;
     QVariantMap data = s.retrieveAccountData(id);
   foreach(AccountId id, s.knownAccounts()) {
     if(!id.isValid()) continue;
     QVariantMap data = s.retrieveAccountData(id);

+    data["AccountId"] = QVariant::fromValue<AccountId>(id);

     accounts[id] = data;
     QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
     item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));
     accounts[id] = data;
     QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
     item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));

diff --git a/version.inc b/version.inc
index 69bacae..8369a3d 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-beta1-pre";
   quasselDate = "2008-04-14";
 
   quasselVersion = "0.2.0-beta1-pre";
   quasselDate = "2008-04-14";

-  quasselBuild = 740;
+  quasselBuild = 741;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;