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

List:       kde-commits
Subject:    kdebase/konqueror
From:       Stephan Kulow <coolo () kde ! org>
Date:       2003-09-18 8:18:34
[Download RAW message or body]

CVS commit by coolo: 

going through the bugs that involve this=0x0 ;-)
CCMAIL: 64387-close@bugs.kde.org


  M +6 -2      konq_mainwindow.cc   1.1227


--- kdebase/konqueror/konq_mainwindow.cc  #1.1226:1.1227
@@ -96,4 +96,5 @@
 #include <kprocess.h>
 #include <kio/scheduler.h>
+#include <kaccelmanager.h>
 
 #ifdef KDE_MALLINFO_STDLIB
@@ -378,5 +379,5 @@ void KonqMainWindow::removeContainer( QW
   {
     assert( container->inherits( "KToolBar" ) );
-
+    if (m_paBookmarkBar)
     m_paBookmarkBar->clear();
   }
@@ -1882,4 +1883,7 @@ void KonqMainWindow::slotPartActivated( 
   }
   createGUI( part );
+  QPopupMenu *popup = static_cast<QPopupMenu*>(factory()->container("edit",this));
+  if (popup)
+        KAcceleratorManager::manage(popup);
 
   KActionCollection *coll = m_currentView->part()->actionCollection();


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