- rename updater.cpp to faviconupdater.cpp to match classname

- connect to completed(bool) so that we get notified even in case of a delayed redirect (testcase: http://www.citefutee.com/orienter/rer.php). This was another case of "update all favicons" hanging forever.
CCBUG: 23102

svn path=/trunk/KDE/kdebase/apps/; revision=1119159
This commit is contained in:
David Faure 2010-04-26 17:46:35 +00:00
parent 3b5ccaacf5
commit 77780fb6dd
4 changed files with 8 additions and 8 deletions

View file

@ -22,7 +22,7 @@ set(keditbookmarks_KDEINIT_SRCS
bookmarkiterator.cpp
testlink.cpp
favicons.cpp
updater.cpp
faviconupdater.cpp
exporters.cpp
bookmarkinfowidget.cpp
kebsearchline.cpp

View file

@ -20,7 +20,7 @@
#include "favicons.h"
#include "bookmarkiterator.h"
#include "updater.h"
#include "faviconupdater.h"
#include "kbookmarkmodel/commands.h"
#include "kbookmarkmodel/model.h"

View file

@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
#include "updater.h"
#include "faviconupdater.h"
#include "bookmarkiterator.h"
#include "toplevel.h"
@ -169,7 +169,7 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KUrl &url
// this, SLOT( slotCompleted()));
connect(part, SIGNAL(canceled(QString)),
this, SLOT(slotCanceled(QString)));
connect(part, SIGNAL(completed()),
connect(part, SIGNAL(completed(bool)),
this, SLOT(slotCompleted()));
// the use of KIO rather than directly using KHTML is to allow silently abort on error
@ -217,4 +217,4 @@ void FavIconWebGrabber::slotCanceled(const QString& errorString)
emit done(false, errorString);
}
#include "updater.moc"
#include "faviconupdater.moc"

View file

@ -15,11 +15,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#ifndef __updater_h
#define __updater_h
#ifndef FAVICONUPDATER_H
#define FAVICONUPDATER_H
#include <kbookmark.h>
#include "favicon_interface.h"
#include "favicon_interface.h" // org::kde::FavIcon
#include <kparts/part.h>
#include <kparts/browserinterface.h>