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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-baseapps=5D_konqueror/src=3A_Do_not_change_the_?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-06-17 4:34:22
Message-ID: 20110617043422.1CBEAA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 56299fa980c40096ce30a850ded19f75155db70c by Dawit Alemayehu.
Committed on 11/06/2011 at 08:31.
Pushed by adawit into branch 'master'.

Do not change the tab icon if the supplied url is invalid, e.g blank.

BUG: 131909
FIXED-IN: 4.6.5
REVIEW: 101626

(cherry picked from commit 831d3d151f517e41c87bd1c6f8338cec225959ea)

M  +1    -1    konqueror/src/konqview.cpp     

http://commits.kde.org/kde-baseapps/56299fa980c40096ce30a850ded19f75155db70c

diff --git a/konqueror/src/konqview.cpp b/konqueror/src/konqview.cpp
index efd7f07..6da341f 100644
--- a/konqueror/src/konqview.cpp
+++ b/konqueror/src/konqview.cpp
@@ -643,7 +643,7 @@ void KonqView::setPageSecurity( int pageSecurity )
 
 void KonqView::setTabIcon( const KUrl &url )
 {
-  if (!m_bPassiveMode) frame()->setTabIcon( url, 0L );
+  if (!m_bPassiveMode && url.isValid()) frame()->setTabIcon( url, 0L );
 }
 
 void KonqView::setCaption( const QString & caption )

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