From d1192c9aeef46d5d995c728812740b765cb98b28 Mon Sep 17 00:00:00 2001 From: Alexander von Renteln Date: Fri, 29 Feb 2008 16:27:02 +0000 Subject: [PATCH 1/1] minor correction --- src/client/client.h | 4 ++-- src/uisupport/bufferview.cpp | 6 +++--- version.inc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/client.h b/src/client/client.h index 30a3d164..4d1bad6c 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -62,8 +62,6 @@ public: static Buffer *buffer(BufferInfo); static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; } - Buffer *statusBuffer(const NetworkId &networkid) const; - static QList networkIds(); static const Network * network(NetworkId); @@ -195,6 +193,8 @@ private: static void setCurrentCoreAccount(AccountId); static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } + Buffer *statusBuffer(const NetworkId &networkid) const; + static QPointer instanceptr; QPointer socket; diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index d4deeea9..6cf3e502 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -232,9 +232,9 @@ void BufferView::showContextMenu(const QPoint &pos) { tr("Input channel name:"),QLineEdit::Normal, QDir::home().dirName(), &ok); if (ok && !channelName.isEmpty()) { - const Buffer *statusbuffer = Client::instance()->statusBuffer(index.data(NetworkModel::NetworkIdRole).value()); - if(statusbuffer) { - Client::instance()->userInput(statusbuffer->bufferInfo(), QString("/J %1").arg(channelName)); + BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value(); + if(bufferInfo.isValid()) { + Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName)); } } } else diff --git a/version.inc b/version.inc index a9c60541..0d8d0dde 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-alpha1+"; quasselDate = "2008-02-27"; - quasselBuild = 595; + quasselBuild = 596; //! Minimum client build number the core needs clientBuildNeeded = 563; -- 2.20.1