From 8d8f29078b2e7fd07e8b21fe238a76f9eb134492 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 21 Oct 2010 23:28:53 +0200 Subject: This commit fixes icons handling for "rekonq pages" (eg: about urls). It also contains a cleaned version of the WebTab::url() method (the previous one was not working on loading pages. And also immediately after the loadFinished signal) This should also fix some "bad" handling on back/forward buttons. Finally, it contains some unrelated QLatin1String --> QL1S changes. Benjamin, I spoke too early about those. I squashed merged my work and removed previous branch :( --- src/mainview.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mainview.cpp') diff --git a/src/mainview.cpp b/src/mainview.cpp index 4ccbe937..beaf4e21 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -562,10 +562,13 @@ void MainView::webViewLoadFinished(bool ok) void MainView::webViewIconChanged() { WebView *view = qobject_cast(sender()); - int index = indexOf(view->parentWidget()); + WebTab *tab = qobject_cast(view->parent()); + int index = indexOf(tab); + if (-1 != index) { - KIcon icon = Application::iconManager()->iconForUrl(view->url()); + kDebug() << "TAB URL: " << tab->url(); + KIcon icon = Application::iconManager()->iconForUrl(tab->url()); QLabel *label = animatedLoading(index, false); QMovie *movie = label->movie(); delete movie; -- cgit v1.2.1