Fixes.

diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp
index d02d737..2ffc986 100644 (file)
--- a/src/qtopia/coreconnectdlg.cpp
+++ b/src/qtopia/coreconnectdlg.cpp
@@ -236,7 +236,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();
 }
 

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index 8625e02..7a4a480 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -20,10 +20,11 @@
 
 #include "qtopiamainwin.h"
 
+#include "coreconnectdlg.h"
 #include "global.h"
 #include "message.h"
 #include "qtopiagui.h"
-#include "coreconnectdlg.h"
+#include "signalproxy.h"
 
 // This constructor is the first thing to be called for a Qtopia app, so we do the init stuff
 // here (rather than in a main.cpp).
@@ -44,6 +45,7 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   //Style::init();
   QtopiaGui *gui = new QtopiaGui(this);
   Client::init(gui);
+  init();
   //gui->init();
 
   setWindowTitle("Quassel IRC");
@@ -51,6 +53,12 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   setWindowIcon(QIcon(":/qirc-icon.png"));
   setWindowIconText("Quassel IRC");
 
+}
+
+// at this point, client is fully initialized
+void QtopiaMainWin::init() {
+  Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)));
+
   CoreConnectDlg *dlg = new CoreConnectDlg(this);
   //setCentralWidget(dlg);
   dlg->showMaximized();

diff --git a/src/qtopia/qtopiamainwin.h b/src/qtopia/qtopiamainwin.h
index 2c5cbc4..528fd81 100644 (file)
--- a/src/qtopia/qtopiamainwin.h
+++ b/src/qtopia/qtopiamainwin.h
@@ -45,6 +45,7 @@ class QtopiaMainWin : public QMainWindow {
     void requestBacklog(BufferId, QVariant, QVariant);
 
   private:
+    void init();
 
     friend class QtopiaGui;
 };