From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 9 May 2008 15:33:46 +0000 (+0000)
Subject: Merging r820:825 from trunk to branches/0.3
X-Git-Tag: 0.3.0~425^2~1
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ec2fa6a18bc2231d88603152d44e5a20980681f7;hp=dbdca302fc349d0e3d46aa0d8091c08b2df28af5

Merging r820:825 from trunk to branches/0.3
---

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index d19f4881..8e90fc6b 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -281,17 +281,17 @@ void BufferView::showContextMenu(const QPoint &pos) {
   QModelIndex index = indexAt(pos);
   if(!index.isValid()) return;
   QMenu contextMenu(this);
-  QAction *connectNetAction = new QAction(tr("Connect"), this);
-  QAction *disconnectNetAction = new QAction(tr("Disconnect"), this);
-  QAction *joinChannelAction = new QAction(tr("Join Channel"), this);
+  QAction *connectNetAction = contextMenu.addAction(tr("Connect"));
+  QAction *disconnectNetAction = contextMenu.addAction(tr("Disconnect"));
+  QAction *joinChannelAction = contextMenu.addAction(tr("Join Channel"));
 
-  QAction *joinBufferAction = new QAction(tr("Join"), this);
-  QAction *partBufferAction = new QAction(tr("Part"), this);
-  QAction *hideBufferAction = new QAction(tr("Remove buffers"), this);
+  QAction *joinBufferAction = contextMenu.addAction(tr("Join"));
+  QAction *partBufferAction = contextMenu.addAction(tr("Part"));
+  QAction *hideBufferAction = contextMenu.addAction(tr("Remove buffers"));
   hideBufferAction->setToolTip(tr("Removes the selected buffers from a custom view but leaves the buffer itself untouched"));
-  QAction *removeBufferAction = new QAction(tr("Delete buffer"), this);
+  QAction *removeBufferAction = contextMenu.addAction(tr("Delete buffer"));
 
-  QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this);
+  QMenu *hideEventsMenu = contextMenu.addMenu(tr("Hide Events"));
   QAction *hideJoinAction = hideEventsMenu->addAction(tr("Join Events"));
   QAction *hidePartAction = hideEventsMenu->addAction(tr("Part Events"));
   QAction *hideKillAction = hideEventsMenu->addAction(tr("Kill Events"));
diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 5470d69f..7a2c477d 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -154,7 +154,7 @@ void NickView::showContextMenu(const QPoint & pos ) {
   else if(action == banAction)      { executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
   else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); 
                                       executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
-  else if(action == queryAction)    { executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); }
+  else if(action == queryAction)    { startQuery(index); }
 
 }
 
diff --git a/version.inc b/version.inc
index 0241bdea..786e9740 100644
--- a/version.inc
+++ b/version.inc
@@ -4,8 +4,8 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-beta1-pre";
-  quasselDate = "2008-05-08";
-  quasselBuild = 821;
+  quasselDate = "2008-05-09";
+  quasselBuild = 825;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;