diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-27 20:23:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-27 20:23:53 -0300 |
| commit | 3a3f329b736af639fdd3c9621816bad627b96903 (patch) | |
| tree | a0935f38e21136a3b7eeb93d0ec5c449c12de5b0 /kde-unstable | |
| parent | 4d788e769855cbef2539d7cf7049dc2b4d9ac2e0 (diff) | |
| parent | 2c30604c9ff749660a4b8507eec99e679cf19508 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kdenlive/PKGBUILD
community-staging/openscenegraph/PKGBUILD
community-staging/schroot/PKGBUILD
community-staging/wt/PKGBUILD
community-testing/cdfs/PKGBUILD
community-testing/pingus/PKGBUILD
community-testing/tagpy/PKGBUILD
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
community/surf/PKGBUILD
community/unpaper/PKGBUILD
core/flex/PKGBUILD
core/gcc/PKGBUILD
extra/boost/PKGBUILD
extra/cups/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtk2/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/qt/PKGBUILD
kde-unstable/akonadi/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
libre/virtualbox-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/bind/PKGBUILD
testing/dnsutils/PKGBUILD
testing/iptables/PKGBUILD
testing/nouveau-dri/PKGBUILD
Diffstat (limited to 'kde-unstable')
| -rw-r--r-- | kde-unstable/kdeplasma-addons/fix-twitter-auth.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch new file mode 100644 index 000000000..0a55ce6ce --- /dev/null +++ b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch @@ -0,0 +1,40 @@ +commit edc7699f4f4b6d9fc0568b031143cb653ae4294e +Author: Sebastian Kügler <sebas@kde.org> +Date: Tue Jul 10 00:56:58 2012 +0200 + + fix authorization from twitter applet + + user in authorize() can be empty when it's already set in d->user, + respect that and successfully authorize. + + Thanks to phoenix_fbrd for finding this issue and the patch. + + REVIEW:105498 + BUG:302267 + + Please reopen the bug report if you still encounter crashes. + + Cherry-picked from 28f6d7cee7e81fda9ba396cc6477370a8ed3ada7 + +diff --git a/dataengines/microblog/koauth.cpp b/dataengines/microblog/koauth.cpp +index 565d79f..7566b95 100644 +--- a/dataengines/microblog/koauth.cpp ++++ b/dataengines/microblog/koauth.cpp +@@ -168,13 +168,15 @@ void KOAuth::run() + + void KOAuth::authorize(const QString &serviceBaseUrl, const QString &user, const QString &password) + { +- d->user = user; ++ if (!user.isEmpty()) { ++ d->user = user; ++ } + d->password = password; + d->serviceBaseUrl = serviceBaseUrl; + d->accessToken = QByteArray(); + d->accessTokenSecret = QByteArray(); + +- d->w->setUser(user); ++ d->w->setUser(d->user); + d->w->setServiceBaseUrl(serviceBaseUrl); + d->w->setPassword(password); + |