Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-11 01:04:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

finally rekonq google sync fix

Browse Source
This commit is contained in:
abveritas 2013-01-14 23:34:10 +00:00
parent d9c7432a3c
commit 2a320d1e2a
2 changed files with 159 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rekonq/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=rekonq
pkgver=2.0
pkgrel=3
pkgrel=4
pkgdesc='A WebKit based web browser for KDE'
arch=('x86_64')
url='http://rekonq.sourceforge.net/'
@ -18,17 +18,21 @@ install=${pkgname}.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'background.png'
'background.diff'
'searchengine.diff')
'searchengine.diff'
'google_sync.diff')
md5sums=('d73e3fdeefaaa4d9cf51dd4ba4395bd7'
'cd493df91e34030a8195eaf8b6d68140'
'5d7bab51b8f4b78c0f7cd94c885f22c3'
'7ab9dc2e4397a66c7a64e08265171996')
'7ab9dc2e4397a66c7a64e08265171996'
'e4fcbc0103d6a884dcd5f2e930bafb1c')
build(){
cd ${srcdir}/${pkgname}-${pkgver}
# Chakra theme:
patch -p1 -i "${srcdir}/background.diff"
patch -p1 -i "${srcdir}/google_sync.diff"
cd ${srcdir}
mkdir -p build
cd build

152
rekonq/google_sync.diff Normal file
View File

@ -0,0 +1,152 @@
commit 58bd0c195b60c3cf597a8d9296e5725dc4be7c9b
Author: Andrea Diamantini <adjam7@gmail.com>
Date: Tue Jan 8 17:09:03 2013 +0100
Workaround to fix Google Bookmarks sync + minor speed improvement
Courtesy patch by "Francesco". Thanks :)
BUG: 312824
diff --git a/src/sync/googlesynchandler.cpp b/src/sync/googlesynchandler.cpp
index c2de762..f2e23da 100644
--- a/src/sync/googlesynchandler.cpp
+++ b/src/sync/googlesynchandler.cpp
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com>
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2013 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -172,24 +172,24 @@ void GoogleSyncHandler::loadFinished(bool ok)
QString path = _webPage.mainFrame()->url().path();
- if (path == "/ServiceLogin" && _doLogin == true)
+ if ( (path == QL1S("/ServiceLogin") || path == QL1S("/Login")) && _doLogin == true)
{
// Let's login to our Google account
QWebFrame *frame = _webPage.mainFrame();
- QWebElement email = frame->findFirstElement("#Email");
- QWebElement passwd = frame->findFirstElement("#Passwd");
- QWebElement form = frame->findFirstElement("#gaia_loginform");
+ QWebElement email = frame->findFirstElement( QL1S("#Email") );
+ QWebElement passwd = frame->findFirstElement( QL1S("#Passwd") );
+ QWebElement form = frame->findFirstElement( QL1S("#gaia_loginform") );
- email.setAttribute("value", ReKonfig::syncUser());
- passwd.setAttribute("value", ReKonfig::syncPass());
- form.evaluateJavaScript("this.submit();");
+ email.setAttribute( QL1S("value"), ReKonfig::syncUser());
+ passwd.setAttribute( QL1S("value"), ReKonfig::syncPass());
+ form.evaluateJavaScript( QL1S("this.submit();") );
emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in..."));
// Login only once
_doLogin = false;
}
- else if (path == "/bookmarks/")
+ else if (path == QL1S("/bookmarks/") )
{
// We get to this page after successful login, let's fetch the bookmark list in Xml format.
QNetworkAccessManager *qnam = _webPage.networkAccessManager();
@@ -199,16 +199,16 @@ void GoogleSyncHandler::loadFinished(bool ok)
emit syncStatus(Rekonq::Bookmarks, true, i18n("Fetching bookmarks from server..."));
connect(_reply, SIGNAL(finished()), this, SLOT(fetchingBookmarksFinished()));
}
- else if (path == "/ServiceLoginAuth")
+ else if (path == QL1S("/ServiceLoginAuth") )
{
emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!"));
_isSyncing = false;
}
- else if (path == "/bookmarks/mark")
+ else if (path == QL1S("/bookmarks/mark") )
{
QWebFrame *frame = _webPage.mainFrame();
- QString sigKey = frame->findFirstElement("input[name=sig]").attribute("value");
+ QString sigKey = frame->findFirstElement( QL1S("input[name=sig]") ).attribute( QL1S("value") );
kDebug() << "Signature Key is : " << sigKey;
QNetworkAccessManager *qnam = _webPage.networkAccessManager();
@@ -219,7 +219,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter)
{
QNetworkRequest request;
- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey));
+ request.setUrl(QUrl( QL1S("https://www.google.com/bookmarks/mark?dlq=") + *iter + QL1S("&sig=") + sigKey));
kDebug() << "Delete url is : " << request.url();
QNetworkReply *r = qnam->get(request);
@@ -243,7 +243,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
postData.append("&sig=" + sigKey.toUtf8());
QNetworkRequest request;
- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA"));
+ request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + QL1S("&btnA") ));
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
kDebug() << "Url: " << request.url();
kDebug() << "Post data is :" << postData;
@@ -257,7 +257,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
_bookmarksToAdd.clear();
}
- else if (path == "/Logout")
+ else if (path == QL1S("/Logout") )
{
//Session finished
emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!"));
@@ -277,10 +277,10 @@ void GoogleSyncHandler::fetchingBookmarksFinished()
{
QString data = _reply->readAll();
- QDomDocument doc("bookmarks");
+ QDomDocument doc( QL1S("bookmarks") );
doc.setContent(data);
- QDomNodeList bookmarksOnServer = doc.elementsByTagName("bookmark");
+ QDomNodeList bookmarksOnServer = doc.elementsByTagName( QL1S("bookmark") );
emit syncStatus(Rekonq::Bookmarks, true, i18n("Reading bookmarks..."));
BookmarkManager *manager = BookmarkManager::self();
@@ -291,8 +291,8 @@ void GoogleSyncHandler::fetchingBookmarksFinished()
for (int i = 0; i < bookmarksOnServer.size(); ++i)
{
- QString title = getChildElement(bookmarksOnServer.at(i), "title");
- QString url = getChildElement(bookmarksOnServer.at(i), "url");
+ QString title = getChildElement(bookmarksOnServer.at(i), QL1S("title") );
+ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") );
KBookmark bookmark = manager->bookmarkForUrl(KUrl(url));
if (bookmark.isNull())
@@ -377,7 +377,7 @@ void GoogleSyncHandler::checkToAddGB(const KBookmarkGroup &root, const QDomNodeL
found = true;
break;
}
- else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url"))
+ else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), QL1S("url")) )
{
found = true;
}
@@ -398,13 +398,13 @@ void GoogleSyncHandler::checkToDeleteGB(BookmarkManager *manager, const QDomNode
for (int i = 0; i < bookmarksOnServer.count(); ++i)
{
- QString url = getChildElement(bookmarksOnServer.at(i), "url");
+ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") );
KBookmark result = manager->bookmarkForUrl(KUrl(url));
if (result.isNull())
{
kDebug() << "Deleting from Google Bookmarks: " << url;
- _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id"));
+ _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), QL1S("id") ));
}
}