summaryrefslogtreecommitdiff
path: root/src/application.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-11-08 12:42:45 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-11-14 05:52:20 +0100
commit6ce25c6e5db5a90e272fb5ca1c665c65310c1b9f (patch)
tree33cd192ad9005fa4d9c2695ed98f626bb40783c3 /src/application.cpp
parentfixuifiles (diff)
downloadrekonq-6ce25c6e5db5a90e272fb5ca1c665c65310c1b9f.tar.xz
Remove postLaunch calls
This will help a lot in having a clean/easy startup, also a bit less fast. Let's see if this helps stability... PS: To the bug reporter. I pushed a "NoPostLaunch" in rekonq git repo. Can you please try compiling and testing if this fixes your troubles on startup?? Many thanks for any help. Andrea. CCBUG:284356
Diffstat (limited to 'src/application.cpp')
-rw-r--r--src/application.cpp44
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);