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

List:       kde-bugs-dist
Subject:    [Bug 53603] crash on closing any open konqueror window
From:       Maksim Orlovich <mo002j () mail ! rochester ! edu>
Date:       2003-02-03 3:38:04
[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=53603     




------- Additional Comments From mo002j@mail.rochester.edu  2003-02-03 04:38 -------
Subject: KDE_3_1_BRANCH: kdelibs/kio/bookmarks

CVS commit by orlovich: 


Backport Alex Kellett's fix that uses ordinal addresses instead of URL's as action names;
fixes konqueror crashes on exit for most people.

This doesn't fix the case where NS4 bookmarks are merged in; that'll be fixed separately later on, 
as it's more involved; and this patch should fix it probably for 99% of people.


CCMAIL: 53603@bugs.kde.org


  M +8 -4      kbookmarkmenu.cc   1.108.2.2


--- kdelibs/kio/bookmarks/kbookmarkmenu.cc  #1.108.2.1:1.108.2.2
@@ -270,8 +270,8 @@ void KBookmarkMenu::fillBookmarkMenu()
       {
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
-        // create a normal URL item, with ID as a name
+        // create a normal URL item, with address as a name
         KAction * action = new KAction( text, bm.icon(), 0,
                                         this, SLOT( slotBookmarkSelected() ),
-                                        m_actionCollection, bm.url().url().utf8() );
+                                        m_actionCollection, bm.address().utf8() );
 
         action->setStatusText( bm.url().prettyURL() );
@@ -370,6 +370,10 @@ void KBookmarkMenu::slotBookmarkSelected
   //kdDebug(1203) << sender()->name() << endl;
 
-  // The name of the action is the URL to open
-  m_pOwner->openBookmarkURL( QString::fromUtf8(sender()->name()) );
+
+  KBookmark bookmark = m_pManager->findByAddress( QString::fromUtf8(sender()->name()) );
+  Q_ASSERT(!bookmark.isNull());
+  Q_ASSERT(!bookmark.isGroup());
+
+  m_pOwner->openBookmarkURL( bookmark.url().url() );  
 }
[prev in list] [next in list] [prev in thread] [next in thread]