this shoud fix user duplication bug introduced in the last commit - sorry

[quassel.git] / src / qtopia / coreconnectdlg.cpp

diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp
index d02d737..3fe1e35 100644 (file)
--- a/src/qtopia/coreconnectdlg.cpp
+++ b/src/qtopia/coreconnectdlg.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development 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        *
@@ -22,9 +22,9 @@
 #include <QSoftMenuBar>
 
 #include "coreconnectdlg.h"
-#include "global.h"
 #include "client.h"
 #include "clientsettings.h"
+#include "global.h"
 
 CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) {
   ui.setupUi(this);
@@ -59,6 +59,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo
   ui.accountList->addItems(s.knownAccounts());
   if(ui.accountList->count()) ui.accountList->item(0)->setSelected(true);
   setWidgetStates();
+  doConnect(); // shortcut for development
 }
 
 CoreConnectDlg::~CoreConnectDlg() {
@@ -236,7 +237,7 @@ void CoreConnectProgressDlg::coreConnected() {
 }
 
 void CoreConnectProgressDlg::coreConnectionError(QString err) {
-  QMessageBox::warning(this, tr("Connection Error"), tr("<b>Could not connect to Quassel Core!</b><br>\n") + err, QMessageBox::Retry);
+  QMessageBox::warning(this, tr("Connection Error"), tr("<b>Could not connect to Quassel Core!</b><br>\n") + err, QMessageBox::Ok);
   reject();
 }