┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <[email protected]>2007-12-20 20:44:58 +0000
committerDavid Faure <[email protected]>2007-12-20 20:44:58 +0000
commitd56ae4eda3918e004738c7ed45ee96e250ebeb3c (patch)
tree90afa3bef42ffc6e144578d703f557ffd5e47bd5
parent15bf95490629522479bd234e1f8ebcc29c8c20d6 (diff)
If we should open the URL right away, then let's do it right away.
We can tell konqueror afterwards by using the openUrlNotify() signal. Note: this design bit is a bit strange; the controller has urlChanged() and requestUrlChange(), but they are both channeled to DolphinView::urlChanged(), which means the recipient has to figure out if the url change was already done or not, with "if (m_view->url() != url)". Wouldn't it be simpler to just have both signals coming out of DolphinView? (but some receivers like the view container don't seem to care which one was emitted... strange) CCMAIL: [email protected], [email protected] CCBUG: 154053 svn path=/trunk/KDE/kdebase/apps/; revision=750996
-rw-r--r--src/dolphinpart.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 616351d04..981bb7028 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -319,8 +319,8 @@ void DolphinPart::slotUrlChanged(const KUrl& url)
if (m_view->url() != url) {
// If the view URL is not equal to 'url', then an inner URL change has
// been done (e. g. by activating an existing column in the column view).
- // From the hosts point of view this must be handled like changing the URL.
- emit m_extension->openUrlRequestDelayed(url, KParts::OpenUrlArguments(), KParts::BrowserArguments());
+ openUrl(url);
+ emit m_extension->openUrlNotify();
}
}