minor correction

diff --git a/src/client/client.h b/src/client/client.h
index 30a3d16..4d1bad6 100644 (file)
--- 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; }
 
   static Buffer *buffer(BufferInfo);
   static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
 

-  Buffer *statusBuffer(const NetworkId &networkid) const;
-

   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 


@@ -195,6 +193,8 @@ private:
   static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 

+  Buffer *statusBuffer(const NetworkId &networkid) const;
+

   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index d4deeea..6cf3e50 100644 (file)
--- 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()) {
                                                 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<NetworkId>());
-      if(statusbuffer) {
-        Client::instance()->userInput(statusbuffer->bufferInfo(), QString("/J %1").arg(channelName));
+      BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+      if(bufferInfo.isValid()) {
+        Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName));

       }
     }
   } else
       }
     }
   } else

diff --git a/version.inc b/version.inc
index a9c6054..0d8d0dd 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-alpha1+";
   quasselDate = "2008-02-27";
 
   quasselVersion = "0.2.0-alpha1+";
   quasselDate = "2008-02-27";

-  quasselBuild = 595;
+  quasselBuild = 596;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 563;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 563;