From 6f59bd806b18825bb5ece44b65680a2dc5752510 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 5 May 2009 19:50:45 +0000 Subject: [PATCH] Corrected setLogInfo core dump state. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1176 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/main.cpp | 1 + retroshare-gui/src/rsiface/notifyqt.cpp | 10 ++-------- retroshare-gui/src/rsiface/notifyqt.h | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 970e97408..a76ee2177 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -170,6 +170,7 @@ int main(int argc, char *argv[]) QObject::connect(notify,SIGNAL(configChanged()) ,w->messagesDialog ,SLOT(displayConfig() )) ; QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&)),w->peersDialog,SLOT(updatePeerStatusString(const QString&,const QString&))); + QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)),w->networkDialog,SLOT(setLogInfo(QString))) ; /* only show window, if not startMinimized */ if (!startMinimised) diff --git a/retroshare-gui/src/rsiface/notifyqt.cpp b/retroshare-gui/src/rsiface/notifyqt.cpp index 2fbfe05b3..5598940c0 100644 --- a/retroshare-gui/src/rsiface/notifyqt.cpp +++ b/retroshare-gui/src/rsiface/notifyqt.cpp @@ -274,15 +274,9 @@ void NotifyQt::UpdateGUI() switch(type) { case RS_SYS_ERROR: - cDialog->setLogInfo(QString(logMesString.c_str())); - break; case RS_SYS_WARNING: - cDialog->setLogInfo(QString(logMesString.c_str())); - break; - default: - case RS_SYS_INFO: - cDialog->setLogInfo(QString(logMesString.c_str())); - break; + case RS_SYS_INFO: emit logInfoChanged(QString(logMesString.c_str())); + default:; } } } diff --git a/retroshare-gui/src/rsiface/notifyqt.h b/retroshare-gui/src/rsiface/notifyqt.h index 717d1b62d..09e33cf84 100644 --- a/retroshare-gui/src/rsiface/notifyqt.h +++ b/retroshare-gui/src/rsiface/notifyqt.h @@ -68,6 +68,7 @@ class NotifyQt: public QObject, public NotifyBase void neighborsChanged() const ; void messagesChanged() const ; void configChanged() const ; + void logInfoChanged(const QString&) const ; void chatStatusChanged(const QString&,const QString&) const ; #ifdef TURTLE_HOPPING void gotTurtleSearchResult(qulonglong search_id,TurtleFileInfo file) const ;