[akonadi-google/f17] fix/rebase patch

Rex Dieter rdieter at fedoraproject.org
Wed Jun 20 16:43:08 UTC 2012


commit 56fd9c057df0870b9574395fb58f84d6321734aa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 20 11:46:05 2012 -0500

    fix/rebase patch

 akonadi-google-auth_token.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/akonadi-google-auth_token.patch b/akonadi-google-auth_token.patch
index 313f684..e6e503a 100644
--- a/akonadi-google-auth_token.patch
+++ b/akonadi-google-auth_token.patch
@@ -1,13 +1,13 @@
 diff -up akonadi-google/libkgoogle/authdialog.cpp.auth_token akonadi-google/libkgoogle/authdialog.cpp
 --- akonadi-google/libkgoogle/authdialog.cpp.auth_token	2012-04-27 08:19:17.000000000 -0500
-+++ akonadi-google/libkgoogle/authdialog.cpp	2012-06-20 11:19:59.436455525 -0500
++++ akonadi-google/libkgoogle/authdialog.cpp	2012-06-20 11:44:03.179406253 -0500
 @@ -102,13 +102,18 @@ void AuthDialog::webviewFinished()
      }
  
      if (url.host() == "accounts.google.com" && url.path() == "/o/oauth2/approval") {
 -        QWebElement el = m_webiew->page()->mainFrame()->findFirstElement("textarea");
 -        if (el.isNull()) {
-+        QString title = webview->title();
++        QString title = m_webiew->title();
 +        QString token;
 +
 +        if (title.startsWith(QLatin1String("success"), Qt::CaseInsensitive)) {


More information about the scm-commits mailing list