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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2008-10-18 17:42:43
Message-ID: 1224351763.133489.22874.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 873080 by mjansen:

Do not remove the action. Remove its shortcut instead. This crashed kmail
sometime if khtmlpart tried to address the deleted action.

 M  +3 -2      kmreaderwin.cpp  


--- trunk/KDE/kdepim/kmail/kmreaderwin.cpp #873079:873080
@@ -444,11 +444,12 @@
   mColorBar->setObjectName( "mColorBar" );
   mViewer = new KHTMLPart( mBox );
   mViewer->setObjectName( "mViewer" );
-  // Remove the select all action from khtml part. It's redefined to
+  // Remove this SelectAll standard action from khtml part. It's redefined to
   // CTRL-SHIFT-A in kmail and clashes with kmails CTRL-A action.
-  mViewer->actionCollection()->removeAction(
+  KAction *selectAll = qobject_cast<KAction*>(
           mViewer->actionCollection()->action(
                   KStandardAction::name(KStandardAction::SelectAll)));
+  selectAll->setShortcut(KShortcut());
   mSplitter->setStretchFactor( mSplitter->indexOf(mMimePartTree), 0 );
   mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
 }
[prev in list] [next in list] [prev in thread] [next in thread]