From kde-commits  Wed Mar 05 13:35:29 2014
From: Dawit A <adawit () kde ! org>
Date: Wed, 05 Mar 2014 13:35:29 +0000
To: kde-commits
Subject: Re: [kdelibs/KDE/4.13] kdewebkit: Handle "Cancel" in the file dialog correctly.
Message-Id: <CALa28R7S0VO+VyrHh-5E_VwUQQ-g_EfLzuyPy23ZdFLdmJ_oJw () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-commits&m=139402658311547
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--089e0160c66078ede804f3dc1a9b"

--089e0160c66078ede804f3dc1a9b
Content-Type: text/plain; charset=UTF-8

Thanks for fixing this. However, shouldn't this have been pushed into the
4.12 branch first since it is a bug fix?


On Wed, Mar 5, 2014 at 4:50 AM, David Faure <faure@kde.org> wrote:

> Git commit fa77b7702fb698ee0bc74e4818eb4060ca636848 by David Faure.
> Committed on 05/03/2014 at 09:49.
> Pushed by dfaure into branch 'KDE/4.13'.
>
> Handle "Cancel" in the file dialog correctly.
>
> It used to loop in the while(true) and keep popping up the dialog
> over and over again.
>
> No time to look up for bug reports on bugs.kde.org :/
>
> CCMAIL: adawit@kde.org
>
> M  +1    -1    kdewebkit/kwebpage.cpp
>
> http://commits.kde.org/kdelibs/fa77b7702fb698ee0bc74e4818eb4060ca636848
>
> diff --git a/kdewebkit/kwebpage.cpp b/kdewebkit/kwebpage.cpp
> index 63fd293..04f5081 100644
> --- a/kdewebkit/kwebpage.cpp
> +++ b/kdewebkit/kwebpage.cpp
> @@ -582,7 +582,7 @@ bool KWebPage::handleReply(QNetworkReply* reply,
> QString* contentType, KIO::Meta
>                              return true;
>                      }
>                      if (!downloadResource(replyUrl, suggestedFileName,
> d->windowWidget()))
> -                        break;
> +                        return true; // file dialog was cancelled, stop
> here
>                  }
>                  return true;
>              case KParts::BrowserOpenOrSaveQuestion::Cancel:
>

--089e0160c66078ede804f3dc1a9b
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Thanks for fixing this. However, shouldn&#39;t this have b=
een pushed into the 4.12 branch first since it is a bug fix?</div><div clas=
s=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Wed, Mar 5, 2014 at=
 4:50 AM, David Faure <span dir=3D"ltr">&lt;<a href=3D"mailto:faure@kde.org=
" target=3D"_blank">faure@kde.org</a>&gt;</span> wrote:<br>

<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex">Git commit fa77b7702fb698ee0bc74e4818eb4060c=
a636848 by David Faure.<br>
Committed on 05/03/2014 at 09:49.<br>
Pushed by dfaure into branch &#39;KDE/4.13&#39;.<br>
<br>
Handle &quot;Cancel&quot; in the file dialog correctly.<br>
<br>
It used to loop in the while(true) and keep popping up the dialog<br>
over and over again.<br>
<br>
No time to look up for bug reports on <a href=3D"http://bugs.kde.org" targe=
t=3D"_blank">bugs.kde.org</a> :/<br>
<br>
CCMAIL: <a href=3D"mailto:adawit@kde.org">adawit@kde.org</a><br>
<br>
M =C2=A0+1 =C2=A0 =C2=A0-1 =C2=A0 =C2=A0kdewebkit/kwebpage.cpp<br>
<br>
<a href=3D"http://commits.kde.org/kdelibs/fa77b7702fb698ee0bc74e4818eb4060c=
a636848" target=3D"_blank">http://commits.kde.org/kdelibs/fa77b7702fb698ee0=
bc74e4818eb4060ca636848</a><br>
<br>
diff --git a/kdewebkit/kwebpage.cpp b/kdewebkit/kwebpage.cpp<br>
index 63fd293..04f5081 100644<br>
--- a/kdewebkit/kwebpage.cpp<br>
+++ b/kdewebkit/kwebpage.cpp<br>
@@ -582,7 +582,7 @@ bool KWebPage::handleReply(QNetworkReply* reply, QStrin=
g* contentType, KIO::Meta<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return true;<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0}<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0if (!downloadResource(replyUrl, suggestedFileName, d-&gt;windowWidget())=
)<br>
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0break;<br>
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0return true; // file dialog was cancelled, stop here<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return true;<=
br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case KParts::BrowserOpenOrS=
aveQuestion::Cancel:<br>
</blockquote></div><br></div>

--089e0160c66078ede804f3dc1a9b--