X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=3ba9c29737314b737a7f036db9423de591655c3a;hb=8f6f3932998ffb3778e4e077dfb301da4cf34c1f;hp=2f51fddf022e458348ba285e29df79b82669921f;hpb=97d674034551438238c568e8b42efb08e1ba7354;p=quassel.git diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index 2f51fddf..3ba9c297 100644 --- a/src/qtui/coreconnectdlg.cpp +++ b/src/qtui/coreconnectdlg.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel Team * + * Copyright (C) 2005-07 by the Quassel IRC Team * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -20,10 +20,10 @@ #include #include "coreconnectdlg.h" -#include "global.h" #include "client.h" #include "clientsettings.h" #include "configwizard.h" +#include "global.h" CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) { ui.setupUi(this); //qDebug() << "new dlg"; @@ -59,8 +59,8 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo connect(Client::instance(), SIGNAL(showConfigWizard(const QVariantMap &)), this, SLOT(showConfigWizard(const QVariantMap &))); AccountSettings s; + QString lastacc = s.lastAccount(); ui.accountList->addItems(s.knownAccounts()); - curacc = s.lastAccount(); if(!ui.accountList->count()) { //if(doAutoConnect) reject(); @@ -90,7 +90,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo autoConnectToggled(true); */ } else { - if(!curacc.isEmpty()) { + if(!lastacc.isEmpty()) { //if(doAutoConnect) { qDebug() << "auto"; // AccountSettings s; // int idx = ui.accountList->findText(s.autoConnectAccount()); @@ -100,7 +100,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo // doConnect(); // } //} else { - int idx = ui.accountList->findText(curacc); + int idx = ui.accountList->findText(lastacc); ui.accountList->setCurrentIndex(idx); //} }