<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[126330] trunk/dports/www/QupZilla</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/126330">126330</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-10-07 16:38:36 -0700 (Tue, 07 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>QupZilla: fix more runtime crashes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwQupZillaPortfile">trunk/dports/www/QupZilla/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwQupZillafilespatchsrclibhistoryhistorymenucppdiff">trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff</a></li>
<li><a href="#trunkdportswwwQupZillafilespatchsrclibpreferencespreferencescppdiff">trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwQupZillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/QupZilla/Portfile (126329 => 126330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/QupZilla/Portfile 2014-10-07 23:28:23 UTC (rev 126329)
+++ trunk/dports/www/QupZilla/Portfile 2014-10-07 23:38:36 UTC (rev 126330)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">
</span><span class="cx"> github.setup QupZilla qupzilla 1.8.1 v
</span><span class="cx"> name QupZilla
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories www
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-mac-macdeploy.sh.diff
</span><span class="cx"> patchfiles-append patch-src-lib-app-browserwindow.cpp.diff
</span><ins>+patchfiles-append patch-src-lib-history-historymenu.cpp.diff
+patchfiles-append patch-src-lib-preferences-preferences.cpp.diff
</ins><span class="cx"> patchfiles-append patch-src-main-Info.plist.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre></div>
<a id="trunkdportswwwQupZillafilespatchsrclibhistoryhistorymenucppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff (0 => 126330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff 2014-10-07 23:38:36 UTC (rev 126330)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Fix crash when clicking History menu with no browser window
+https://github.com/QupZilla/qupzilla/issues/1487
+https://github.com/QupZilla/qupzilla/commit/b6f913dafe2fce92f406ec3f21970df2151bde8d
+--- src/lib/history/historymenu.cpp.orig
++++ src/lib/history/historymenu.cpp
+@@ -81,7 +81,7 @@ void HistoryMenu::showHistoryManager()
+ void HistoryMenu::aboutToShow()
+ {
+ // Set enabled states for Back/Forward actions according to current WebView
+- TabbedWebView* view = m_window->weView();
++ TabbedWebView* view = m_window ? m_window->weView() : 0;
+
+ if (view) {
+ actions().at(0)->setEnabled(view->history()->canGoBack());
</ins></span></pre></div>
<a id="trunkdportswwwQupZillafilespatchsrclibpreferencespreferencescppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff (0 => 126330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff 2014-10-07 23:38:36 UTC (rev 126330)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Fix crash when opening Preferences with no browser window
+https://github.com/QupZilla/qupzilla/issues/1488
+https://github.com/QupZilla/qupzilla/commit/21fb7bff31a5b0d9cad1e4229ff3b03b84a9fefe
+--- src/lib/preferences/preferences.cpp.orig
++++ src/lib/preferences/preferences.cpp
+@@ -265,7 +265,7 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent)
+ bool pbInABuseCC = settings.value("UseCustomProgressColor", false).toBool();
+ ui->checkBoxCustomProgressColor->setChecked(pbInABuseCC);
+ ui->progressBarColorSelector->setEnabled(pbInABuseCC);
+- QColor pbColor = settings.value("CustomProgressColor", m_window->palette().color(QPalette::Highlight)).value<QColor>();
++ QColor pbColor = settings.value("CustomProgressColor", palette().color(QPalette::Highlight)).value<QColor>();
+ setProgressBarColorIcon(pbColor);
+ connect(ui->customColorToolButton, SIGNAL(clicked(bool)), SLOT(selectCustomProgressBarColor()));
+ connect(ui->resetProgressBarcolor, SIGNAL(clicked()), SLOT(setProgressBarColorIcon()));
+@@ -592,11 +592,17 @@ void Preferences::allowCacheChanged(bool state)
+
+ void Preferences::useActualHomepage()
+ {
++ if (!m_window)
++ return;
++
+ ui->homepage->setText(m_window->weView()->url().toString());
+ }
+
+ void Preferences::useActualNewTab()
+ {
++ if (!m_window)
++ return;
++
+ ui->newTabUrl->setText(m_window->weView()->url().toString());
+ }
+
+@@ -1118,7 +1124,7 @@ void Preferences::setProgressBarColorIcon(QColor color)
+ const int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+ QPixmap pm(QSize(size, size));
+ if (!color.isValid()) {
+- color = m_window->palette().color(QPalette::Highlight);
++ color = palette().color(QPalette::Highlight);
+ }
+ pm.fill(color);
+ ui->customColorToolButton->setIcon(pm);
</ins></span></pre>
</div>
</div>
</body>
</html>