diff -Nru rekonq-0.6.1+git20100914~ppa1/debian/changelog rekonq-0.6.1+git20100916~ppa1/debian/changelog --- rekonq-0.6.1+git20100914~ppa1/debian/changelog 2010-09-13 22:38:39.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/debian/changelog 2010-09-16 20:07:17.000000000 +0000 @@ -1,5 +1,5 @@ -rekonq (0.6.1+git20100914~ppa1) lucid; urgency=low +rekonq (0.6.1+git20100916~ppa1) lucid; urgency=low * New GIT snapshot - -- Emanuele Tue, 14 September 2010 00:00:00 +0200 + -- Emanuele Thu, 16 September 2010 00:00:00 +0200 diff -Nru rekonq-0.6.1+git20100914~ppa1/.git/FETCH_HEAD rekonq-0.6.1+git20100916~ppa1/.git/FETCH_HEAD --- rekonq-0.6.1+git20100914~ppa1/.git/FETCH_HEAD 2010-09-13 22:38:39.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/.git/FETCH_HEAD 2010-09-16 20:07:17.000000000 +0000 @@ -1,3 +1,3 @@ -feac8789c12f060111cb32e5902cf137eec625cb not-for-merge branch 'Branches.0.6' of git://gitorious.org/rekonq/mainline +ba565429306acedd18d0aef524883202a0c84ceb not-for-merge branch 'Branches.0.6' of git://gitorious.org/rekonq/mainline 4b26856731110c0bc4123e1874c6726ffbeb797d not-for-merge branch 'adblockfix2' of git://gitorious.org/rekonq/mainline -fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc branch 'master' of git://gitorious.org/rekonq/mainline +b33af30051796d6e150bc632da102124d9939ea7 branch 'master' of git://gitorious.org/rekonq/mainline Binary files /tmp/XI1ok5PqPw/rekonq-0.6.1+git20100914~ppa1/.git/index and /tmp/oU2v_d3YE_/rekonq-0.6.1+git20100916~ppa1/.git/index differ diff -Nru rekonq-0.6.1+git20100914~ppa1/.git/logs/HEAD rekonq-0.6.1+git20100916~ppa1/.git/logs/HEAD --- rekonq-0.6.1+git20100914~ppa1/.git/logs/HEAD 2010-09-13 22:38:39.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/.git/logs/HEAD 2010-09-16 20:07:17.000000000 +0000 @@ -12,3 +12,4 @@ a88d2a6c5156f020d4cc34c54650ace6b9d0be4e 821460600690723043ec844b4187362ca758a6a3 Emanuele Tartaglia 1283540785 +0200 pull : Fast-forward 821460600690723043ec844b4187362ca758a6a3 feac8789c12f060111cb32e5902cf137eec625cb Emanuele Tartaglia 1284375899 +0200 pull : Fast-forward feac8789c12f060111cb32e5902cf137eec625cb fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc Emanuele Tartaglia 1284417519 +0200 pull : Fast-forward +fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc b33af30051796d6e150bc632da102124d9939ea7 Emanuele Tartaglia 1284667637 +0200 pull : Fast-forward diff -Nru rekonq-0.6.1+git20100914~ppa1/.git/logs/refs/heads/master rekonq-0.6.1+git20100916~ppa1/.git/logs/refs/heads/master --- rekonq-0.6.1+git20100914~ppa1/.git/logs/refs/heads/master 2010-09-13 22:38:39.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/.git/logs/refs/heads/master 2010-09-16 20:07:17.000000000 +0000 @@ -12,3 +12,4 @@ a88d2a6c5156f020d4cc34c54650ace6b9d0be4e 821460600690723043ec844b4187362ca758a6a3 Emanuele Tartaglia 1283540785 +0200 pull : Fast-forward 821460600690723043ec844b4187362ca758a6a3 feac8789c12f060111cb32e5902cf137eec625cb Emanuele Tartaglia 1284375899 +0200 pull : Fast-forward feac8789c12f060111cb32e5902cf137eec625cb fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc Emanuele Tartaglia 1284417519 +0200 pull : Fast-forward +fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc b33af30051796d6e150bc632da102124d9939ea7 Emanuele Tartaglia 1284667637 +0200 pull : Fast-forward diff -Nru rekonq-0.6.1+git20100914~ppa1/.git/logs/refs/remotes/origin/Branches.0.6 rekonq-0.6.1+git20100916~ppa1/.git/logs/refs/remotes/origin/Branches.0.6 --- rekonq-0.6.1+git20100914~ppa1/.git/logs/refs/remotes/origin/Branches.0.6 2010-09-13 11:04:59.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/.git/logs/refs/remotes/origin/Branches.0.6 2010-09-16 20:07:17.000000000 +0000 @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 feac8789c12f060111cb32e5902cf137eec625cb Emanuele Tartaglia 1284375899 +0200 pull : storing head +feac8789c12f060111cb32e5902cf137eec625cb ba565429306acedd18d0aef524883202a0c84ceb Emanuele Tartaglia 1284667637 +0200 pull : fast-forward diff -Nru rekonq-0.6.1+git20100914~ppa1/.git/logs/refs/remotes/origin/master rekonq-0.6.1+git20100916~ppa1/.git/logs/refs/remotes/origin/master --- rekonq-0.6.1+git20100914~ppa1/.git/logs/refs/remotes/origin/master 2010-09-13 22:38:39.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/.git/logs/refs/remotes/origin/master 2010-09-16 20:07:17.000000000 +0000 @@ -11,3 +11,4 @@ a88d2a6c5156f020d4cc34c54650ace6b9d0be4e 821460600690723043ec844b4187362ca758a6a3 Emanuele Tartaglia 1283540785 +0200 pull : fast-forward 821460600690723043ec844b4187362ca758a6a3 feac8789c12f060111cb32e5902cf137eec625cb Emanuele Tartaglia 1284375899 +0200 pull : fast-forward feac8789c12f060111cb32e5902cf137eec625cb fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc Emanuele Tartaglia 1284417519 +0200 pull : fast-forward +fdd9ad2ac4d689f97b91ccc87ca846a20de5abfc b33af30051796d6e150bc632da102124d9939ea7 Emanuele Tartaglia 1284667637 +0200 pull : fast-forward Binary files /tmp/XI1ok5PqPw/rekonq-0.6.1+git20100914~ppa1/.git/objects/39/5256dad2493f2477b50baf4f45d89f56851a88 and /tmp/oU2v_d3YE_/rekonq-0.6.1+git20100916~ppa1/.git/objects/39/5256dad2493f2477b50baf4f45d89f56851a88 differ Binary files /tmp/XI1ok5PqPw/rekonq-0.6.1+git20100914~ppa1/.git/objects/40/2f16f222a3123057af9a2e75331fa9207a9299 and /tmp/oU2v_d3YE_/rekonq-0.6.1+git20100916~ppa1/.git/objects/40/2f16f222a3123057af9a2e75331fa9207a9299 differ Binary files /tmp/XI1ok5PqPw/rekonq-0.6.1+git20100914~ppa1/.git/objects/4a/5c8ed6479ebe79884c3a2da33a8ec201fc0aa5 and /tmp/oU2v_d3YE_/rekonq-0.6.1+git20100916~ppa1/.git/objects/4a/5c8ed6479ebe79884c3a2da33a8ec201fc0aa5 differ diff -Nru rekonq-0.6.1+git20100914~ppa1/.git/objects/56/c8c25d6a5be302e99de869ea52b1fad763998d rekonq-0.6.1+git20100916~ppa1/.git/objects/56/c8c25d6a5be302e99de869ea52b1fad763998d --- rekonq-0.6.1+git20100914~ppa1/.git/objects/56/c8c25d6a5be302e99de869ea52b1fad763998d 1970-01-01 00:00:00.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/.git/objects/56/c8c25d6a5be302e99de869ea52b1fad763998d 2010-09-16 20:07:17.000000000 +0000 @@ -0,0 +1,2 @@ +xKN0Yc<'n#8búݞ1' S2McweU8)yשDb1cJUg,H΁;.<5@ZsetDuration(animationDuration); diff -Nru rekonq-0.6.1+git20100914~ppa1/src/notificationbar.h rekonq-0.6.1+git20100916~ppa1/src/notificationbar.h --- rekonq-0.6.1+git20100914~ppa1/src/notificationbar.h 2010-09-13 11:04:59.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/src/notificationbar.h 2010-09-16 20:07:17.000000000 +0000 @@ -37,8 +37,9 @@ { public: explicit NotificationBar(QWidget *parent = 0); + ~NotificationBar(); - void notifyUser(int animationDuration = 500); + void notifyUser(int animationDuration = 400); private: BlinkEffect *m_blinkEffect; diff -Nru rekonq-0.6.1+git20100914~ppa1/src/previewselectorbar.h rekonq-0.6.1+git20100916~ppa1/src/previewselectorbar.h --- rekonq-0.6.1+git20100914~ppa1/src/previewselectorbar.h 2010-09-13 11:04:59.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/src/previewselectorbar.h 2010-09-16 20:07:17.000000000 +0000 @@ -45,6 +45,8 @@ PreviewSelectorBar(int index, QWidget *parent); ~PreviewSelectorBar(); + inline void setIndex(int index) { m_previewIndex = index; } + private slots: void clicked(); diff -Nru rekonq-0.6.1+git20100914~ppa1/src/webtab.cpp rekonq-0.6.1+git20100916~ppa1/src/webtab.cpp --- rekonq-0.6.1+git20100914~ppa1/src/webtab.cpp 2010-09-13 11:04:59.000000000 +0000 +++ rekonq-0.6.1+git20100916~ppa1/src/webtab.cpp 2010-09-16 20:07:17.000000000 +0000 @@ -129,19 +129,20 @@ if (blackList.contains(urlString)) return; + KWebWallet *wallet = page()->wallet(); if(_walletBar.isNull()) { _walletBar = new WalletBar(this); - KWebWallet *wallet = page()->wallet(); _walletBar.data()->onSaveFormData(key, url); qobject_cast(layout())->insertWidget(0, _walletBar.data() ); - - connect(_walletBar.data(), SIGNAL(saveFormDataAccepted(const QString &)), - wallet, SLOT(acceptSaveFormDataRequest(const QString &))); - connect(_walletBar.data(), SIGNAL(saveFormDataRejected(const QString &)), - wallet, SLOT(rejectSaveFormDataRequest(const QString &))); } else { + disconnect(wallet); _walletBar.data()->notifyUser(); } + + connect(_walletBar.data(), SIGNAL(saveFormDataAccepted(const QString &)), + wallet, SLOT(acceptSaveFormDataRequest(const QString &)), Qt::UniqueConnection); + connect(_walletBar.data(), SIGNAL(saveFormDataRejected(const QString &)), + wallet, SLOT(rejectSaveFormDataRequest(const QString &)), Qt::UniqueConnection); } @@ -150,14 +151,16 @@ if(_previewSelectorBar.isNull()) { _previewSelectorBar = new PreviewSelectorBar(index, this); qobject_cast(layout())->insertWidget(0, _previewSelectorBar.data()); - - connect(page(), SIGNAL(loadStarted()), _previewSelectorBar.data(), SLOT(loadProgress())); - connect(page(), SIGNAL(loadProgress(int)), _previewSelectorBar.data(), SLOT(loadProgress())); - connect(page(), SIGNAL(loadFinished(bool)), _previewSelectorBar.data(), SLOT(loadFinished())); - connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), _previewSelectorBar.data(), SLOT(verifyUrl())); } else { + disconnect(_previewSelectorBar.data()); + _previewSelectorBar.data()->setIndex(index); _previewSelectorBar.data()->notifyUser(); } + + connect(page(), SIGNAL(loadStarted()), _previewSelectorBar.data(), SLOT(loadProgress()), Qt::UniqueConnection); + connect(page(), SIGNAL(loadProgress(int)), _previewSelectorBar.data(), SLOT(loadProgress()), Qt::UniqueConnection); + connect(page(), SIGNAL(loadFinished(bool)), _previewSelectorBar.data(), SLOT(loadFinished()), Qt::UniqueConnection); + connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), _previewSelectorBar.data(), SLOT(verifyUrl()), Qt::UniqueConnection); }