netsurf: branch master updated. release/3.10-43-g410cb9a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/410cb9a8fd9354b4c3b95...
...commit http://git.netsurf-browser.org/netsurf.git/commit/410cb9a8fd9354b4c3b9582...
...tree http://git.netsurf-browser.org/netsurf.git/tree/410cb9a8fd9354b4c3b95824e...
The branch, master has been updated
via 410cb9a8fd9354b4c3b95824e135b64cc002986f (commit)
from 1f2946a7109310ddc8fa21ff28ce0add14c09a02 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=410cb9a8fd9354b4c3b...
commit 410cb9a8fd9354b4c3b95824e135b64cc002986f
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
gtk compile din resource list was missing pageinfo for gtk2 build
diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index 17d2c08..0f32a4e 100644
--- a/frontends/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
@@ -2,29 +2,30 @@
<gresources>
<gresource prefix="/org/netsurf">
<file>cookies.gtk2.ui</file>
+ <file>cookies.gtk3.ui</file>
+ <file>downloads.gtk2.ui</file>
+ <file>downloads.gtk3.ui</file>
+ <file>globalhistory.gtk2.ui</file>
<file>globalhistory.gtk3.ui</file>
+ <file>hotlist.gtk2.ui</file>
+ <file>hotlist.gtk3.ui</file>
+ <file>localhistory.gtk2.ui</file>
<file>localhistory.gtk3.ui</file>
<file>netsurf.gtk2.ui</file>
- <file>password.gtk3.ui</file>
- <file>toolbar.gtk2.ui</file>
- <file>warning.gtk3.ui</file>
- <file>cookies.gtk3.ui</file>
- <file>hotlist.gtk2.ui</file>
<file>netsurf.gtk3.ui</file>
- <file>pageinfo.gtk3.ui</file>
- <file>toolbar.gtk3.ui</file>
- <file>downloads.gtk2.ui</file>
- <file>hotlist.gtk3.ui</file>
<file>options.gtk2.ui</file>
- <file>viewdata.gtk2.ui</file>
- <file>downloads.gtk3.ui</file>
<file>options.gtk3.ui</file>
- <file>tabcontents.gtk2.ui</file>
- <file>viewdata.gtk3.ui</file>
- <file>localhistory.gtk2.ui</file>
- <file>globalhistory.gtk2.ui</file>
+ <file>pageinfo.gtk2.ui</file>
+ <file>pageinfo.gtk3.ui</file>
<file>password.gtk2.ui</file>
+ <file>password.gtk3.ui</file>
+ <file>tabcontents.gtk2.ui</file>
<file>tabcontents.gtk3.ui</file>
+ <file>toolbar.gtk2.ui</file>
+ <file>toolbar.gtk3.ui</file>
+ <file>viewdata.gtk2.ui</file>
+ <file>viewdata.gtk3.ui</file>
+ <file>warning.gtk3.ui</file>
<file>warning.gtk2.ui</file>
<file preprocess="to-pixdata">favicon.png</file>
<file preprocess="to-pixdata">netsurf.xpm</file>
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/res/netsurf.gresource.xml | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index 17d2c08..0f32a4e 100644
--- a/frontends/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
@@ -2,29 +2,30 @@
<gresources>
<gresource prefix="/org/netsurf">
<file>cookies.gtk2.ui</file>
+ <file>cookies.gtk3.ui</file>
+ <file>downloads.gtk2.ui</file>
+ <file>downloads.gtk3.ui</file>
+ <file>globalhistory.gtk2.ui</file>
<file>globalhistory.gtk3.ui</file>
+ <file>hotlist.gtk2.ui</file>
+ <file>hotlist.gtk3.ui</file>
+ <file>localhistory.gtk2.ui</file>
<file>localhistory.gtk3.ui</file>
<file>netsurf.gtk2.ui</file>
- <file>password.gtk3.ui</file>
- <file>toolbar.gtk2.ui</file>
- <file>warning.gtk3.ui</file>
- <file>cookies.gtk3.ui</file>
- <file>hotlist.gtk2.ui</file>
<file>netsurf.gtk3.ui</file>
- <file>pageinfo.gtk3.ui</file>
- <file>toolbar.gtk3.ui</file>
- <file>downloads.gtk2.ui</file>
- <file>hotlist.gtk3.ui</file>
<file>options.gtk2.ui</file>
- <file>viewdata.gtk2.ui</file>
- <file>downloads.gtk3.ui</file>
<file>options.gtk3.ui</file>
- <file>tabcontents.gtk2.ui</file>
- <file>viewdata.gtk3.ui</file>
- <file>localhistory.gtk2.ui</file>
- <file>globalhistory.gtk2.ui</file>
+ <file>pageinfo.gtk2.ui</file>
+ <file>pageinfo.gtk3.ui</file>
<file>password.gtk2.ui</file>
+ <file>password.gtk3.ui</file>
+ <file>tabcontents.gtk2.ui</file>
<file>tabcontents.gtk3.ui</file>
+ <file>toolbar.gtk2.ui</file>
+ <file>toolbar.gtk3.ui</file>
+ <file>viewdata.gtk2.ui</file>
+ <file>viewdata.gtk3.ui</file>
+ <file>warning.gtk3.ui</file>
<file>warning.gtk2.ui</file>
<file preprocess="to-pixdata">favicon.png</file>
<file preprocess="to-pixdata">netsurf.xpm</file>
--
NetSurf Browser