diff options
Diffstat (limited to 'src/application.cpp')
| -rw-r--r-- | src/application.cpp | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/src/application.cpp b/src/application.cpp index 6fd5e3c5..fcabc201 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -269,8 +269,24 @@ int Application::newInstance() if (isFirstLoad) { - // give me some time to do the other things.. - QTimer::singleShot(100, this, SLOT(postLaunch())); + // updating rekonq configuration + updateConfiguration(); + + setWindowIcon(KIcon("rekonq")); + + historyManager(); + + // bookmarks loading + connect(bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), + instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); + + // crash recovering + if (ReKonfig::recoverOnCrash()) + { + mainWindow()->currentTab()->showMessageBar(); + } + ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1); + saveConfiguration(); } return exitValue; @@ -283,29 +299,6 @@ Application *Application::instance() } -void Application::postLaunch() -{ - // updating rekonq configuration - updateConfiguration(); - - setWindowIcon(KIcon("rekonq")); - - historyManager(); - - // bookmarks loading - connect(bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), - instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); - - // crash recovering - if (ReKonfig::recoverOnCrash()) - { - mainWindow()->currentTab()->showMessageBar(); - } - ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1); - saveConfiguration(); -} - - void Application::saveConfiguration() const { ReKonfig::self()->writeConfig(); @@ -442,7 +435,6 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type) barForTab->setQUrl(url); WebView *view = tab->view(); - if (view) { FilterUrlJob *job = new FilterUrlJob(view, url.pathOrUrl(), this); |