[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kdelibs/KDE/4.13] kdewebkit: Handle "Cancel" in the file dialog correctly.
From:       Dawit A <adawit () kde ! org>
Date:       2014-03-05 13:35:29
Message-ID: CALa28R7S0VO+VyrHh-5E_VwUQQ-g_EfLzuyPy23ZdFLdmJ_oJw () mail ! gmail ! com
[Download RAW message or body]

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:
>

[Attachment #3 (text/html)]

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

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">Git commit fa77b7702fb698ee0bc74e4818eb4060ca636848 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="http://bugs.kde.org" \
target="_blank">bugs.kde.org</a> :/<br> <br>
CCMAIL: <a href="mailto:adawit@kde.org">adawit@kde.org</a><br>
<br>
M   +1      -1      kdewebkit/kwebpage.cpp<br>
<br>
<a href="http://commits.kde.org/kdelibs/fa77b7702fb698ee0bc74e4818eb4060ca636848" \
target="_blank">http://commits.kde.org/kdelibs/fa77b7702fb698ee0bc74e4818eb4060ca636848</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, QString* \
contentType, KIO::Meta<br>  return true;<br>
                                }<br>
                                if (!downloadResource(replyUrl, suggestedFileName, \
                d-&gt;windowWidget()))<br>
-                                    break;<br>
+                                    return true; // file dialog was cancelled, stop \
here<br>  }<br>
                          return true;<br>
                    case KParts::BrowserOpenOrSaveQuestion::Cancel:<br>
</blockquote></div><br></div>



[prev in list] [next in list] [prev in thread] [next in thread]