[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 69176] Empty trash doesn't work when trash folder not selected
From:       Ingo "Klöcker" <kloecker () kde ! org>
Date:       2003-11-29 15:16:36
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=69176     
kloecker@kde.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From kloecker@kde.org  2003-11-29 16:16 -------
Subject: kdepim/kmail

CVS commit by kloecker: 

Fix bug 69176: Empty trash doesn't work when trash folder not selected
and bug 69230: different problems regarding searching / virtual folders

It's actually the same bug and it was introduced by a recent patch which was reviewed \
by two (!) persons. The next time you review something please actually test the patch \
and don't just say "Hmm, looks good.". Yes, I'm guilty of the same lazyness. Let's \
make sure it doesn't happen again.

CCMAIL: kmail@kde.org
CCMAIL: 69176-fixed@bugs.kde.org
CCMAIL: 69230-fixed@bugs.kde.org


  M +8 -4      kmfoldertree.cpp   1.271
  M +1 -2      kmfoldertree.h   1.76


--- kdepim/kmail/kmfoldertree.h  #1.75:1.76
@@ -231,6 +231,5 @@ protected slots:
   void autoScroll();
 
-  /** right mouse button */
-  void rightButtonPressed( QListViewItem *, const QPoint &, int);
+  void slotContextMenuRequested( QListViewItem *, const QPoint & );
 
   /** Fires a new-mail-check of the account that is accociated with currentItem */

--- kdepim/kmail/kmfoldertree.cpp  #1.270:1.271
@@ -297,6 +297,6 @@ void KMFolderTree::connectSignals()
            this, SLOT( autoScroll() ) );
 
-  connect( this, SIGNAL( rightButtonPressed( QListViewItem*, const QPoint &, int)),
-           this, SLOT( rightButtonPressed( QListViewItem*, const QPoint &, int)));
+  connect( this, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint &, int ) \
), +           this, SLOT( slotContextMenuRequested( QListViewItem*, const QPoint & ) \
) );  
   connect( this, SIGNAL( expanded( QListViewItem* ) ),
@@ -932,6 +932,7 @@ QListViewItem* KMFolderTree::indexOfFold
 
 //-----------------------------------------------------------------------------
-// Handle RMB press, show pop up menu
-void KMFolderTree::rightButtonPressed(QListViewItem *lvi, const QPoint &p, int)
+// show context menu
+void KMFolderTree::slotContextMenuRequested( QListViewItem *lvi,
+                                             const QPoint &p )
 {
   if (!lvi)
@@ -943,4 +944,6 @@ void KMFolderTree::rightButtonPressed(QL
 
   KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(lvi);
+  if ( fti != mLastItem )
+    doFolderSelected( fti );
 
   if (!fti )
@@ -1048,4 +1051,5 @@ void KMFolderTree::rightButtonPressed(QL
   triggerUpdate();
   delete folderMenu;
+  folderMenu = 0;
 }


[prev in list] [next in list] [prev in thread] [next in thread]