Merge lp:~midori/midori/release0.5.11 into lp:midori

[Cris Dywan]

Bump version to 0.5.11

[Cody Garver (codygarver)]

Tested with granite packaging and it built and ran fine

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-16 10:31:01 +0000
+++ CMakeLists.txt	2015-08-30 10:34:45 +0000
@@ -11,7 +11,7 @@
 add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"")
 add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"")
 
-set(VERSION 0.5.10)
+set(VERSION 0.5.11)
 add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"")
  
 string(REPLACE "." ";" VERSION_LIST ${VERSION})

=== modified file 'ChangeLog'
--- ChangeLog	2015-04-19 23:03:37 +0000
+++ ChangeLog	2015-08-30 10:34:45 +0000
@@ -1,5 +1,51 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.5.11
+ Add fake theme for built-in icons
+ * Don't truncate long speed dial titles if there's room to display them
+ Fix warnings for -Wformat-security
+ Ensure vala knows the prototypes of functions it calls, fixing pointer truncation in tests
+ Add unit test to check appmenu/menubar visibility
+ Fix last known GTK2 entry placeholder text bugs
+ Make sure that only one of appmenu and menubar are visible *initially* as well as when changed
+ Move adblock icons to hicolor
+ Limit bookmarks panel callbacks to the lifetime of the panel to fix a crash
+ Fix fallout (broken bookmarks and history panel search) from tweaks to GTK2 entry placeholder
+ fix property binding to ensure that exactly one of appmenu button and menubar is always visible
+ Skip open-with codepath with abp links, they are internal
+ Use find_file to locate execinfo.h
+ Fix middle/ctrl/normal clicking bookmarks (not folders) in the bookmarkbar.
+ Add copright header to sanitize_bar.sh
+ Adblock fixup: Escape . in filter with \
+ Don't shadow variable uri in midori_browser_save_uri
+ Switch Adblock icons to 24px color
+ Always include app menu in toolbar
+ Fix various mis[sing ]annotations and style issues in GIR
+ Compile typelib from gir
+ Fix assert when resetting webapp state after inactivity reset
+ clean up handling of double-valued db column in Tabby
+ Add a comment to explain MidoriBrowser popup callback
+ fix warnings printed when right-clicking resize grip between location and search entries
+ Win32: Use Dr. MinGW if present to preserve crash info
+ Fix menubar warning caused by direct cast instead of `as`
+ Helper script for setting up bzr with some usefull plugins and settings
+ Stop using Gtk.Entry.max_width_chars
+ avoid deprecated SoupServer API with libsoup 2.48
+ Use unowned in foreach loops in Midori.Window
+ Use unowned in foreach loops in Midori.Completion
+ Use unowned with Adblock.Subscription and Element in foreach loops
+ Use unowned strings in foreach loops
+ Enable openWith in app mode and make it work with view-new
+ Implement Midori.Window class with toolbar/ headerbar
+ Drop support for libsoup-gnome-2.4 < 2.37.1
+ Make search icons for engines work correctly
+ Move to WebKit2 4.0 which broke ABI
+ Port to zeitgeist-2.0
+ win32: Bump shipped GrayBird theme version to fix some rendering issues
+ avoid deprecated GtkDialog API with GTK+2 >= 2.22
+ Title case for "Export Certificate" button
+ fix incorrect type of MAX(sorting) in Tabby
+
 v0.5.10
  use exit instead of return in license script
  Fix HAVE_GCR guards after GtkPopover port

=== modified file 'HACKING'
--- HACKING	2014-11-10 22:59:26 +0000
+++ HACKING	2015-08-30 10:34:45 +0000
@@ -37,6 +37,8 @@
 cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 make
 sudo make install
+sudo gtk-update-icon-cache /usr/share/icons/hicolor
+
 
 //Advanced Tip: Pass "-G Ninja" to cmake to use http://martine.github.io/ninja/ Ninja instead of make (usually packaged as ninja or ninja-build).//
 

=== modified file 'data/faq.html'
--- data/faq.html	2014-11-10 22:59:26 +0000
+++ data/faq.html	2015-08-30 10:34:45 +0000
@@ -5,7 +5,6 @@
   <title>midori:faq</title>
 <meta name="generator" content="DokuWiki"/>
 <meta name="robots" content="index,follow"/>
-<meta name="date" content="2014-06-05T00:44:58+0200"/>
 <meta name="keywords" content="midori,faq"/>
 <link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki"/>
 <link rel="start" href="/"/>
@@ -18,7 +17,7 @@
 <link rel="stylesheet" href="faq.css" />
 <script type="text/javascript">/*<![CDATA[*/var NS='midori';var JSINFO = {"id":"midori:faq","namespace":"midori"};
 /*!]]>*/</script>
-<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=34912f2e1a4daa1bfa9afb3096df0197"></script>
+<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=af5aadc3291d3baa2d8665b51a0cedf3"></script>
 </head>
 <body>
 <div class="dokuwiki export">
@@ -410,7 +409,7 @@
 </li>
 <li class="level1"><div class="li"> You may need gstreamer(0.10/1.0)-alsa for ALSA, depending on your distribution.</div>
 </li>
-<li class="level1"><div class="li"> You need plugins for Theora, gstreamer(0.10/1.0)-base and <abbr title="Moving Picture Experts Group">MPEG</abbr>-4 incluing aac (e.g. gst-plugins-faad), gstreamer(0.10/1.0)-bad. For WebM, you&#039;ll need plugins for vorbis (-base), matroska (-good), and vp8 (-bad). Have a look at <a href="http://www.gstreamer.net/documentation/plugins.html" class="urlextern" title="http://www.gstreamer.net/documentation/plugins.html"  rel="nofollow">http://www.gstreamer.net/documentation/plugins.html</a> for details.</div>
+<li class="level1"><div class="li"> You need plugins for Theora, gstreamer(0.10/1.0)-base and MPEG-4 incluing aac (e.g. gst-plugins-faad), gstreamer(0.10/1.0)-bad. For WebM, you&#039;ll need plugins for vorbis (-base), matroska (-good), and vp8 (-bad). Have a look at <a href="http://www.gstreamer.net/documentation/plugins.html" class="urlextern" title="http://www.gstreamer.net/documentation/plugins.html"  rel="nofollow">http://www.gstreamer.net/documentation/plugins.html</a> for details.</div>
 </li>
 <li class="level1"><div class="li"> For Youtube or Vimeo, you need WebKitGTK+ 1.1.20 or newer.</div>
 </li>
@@ -524,7 +523,7 @@
 <div class="level4">
 
 <p>
-Midori opens files with GIO, and falls back to xdg-open, exo-open or gnome-open if these are available. All of this relies on freedesktop.org <abbr title="Multipurpose Internet Mail Extension">MIME</abbr> configuration. To tweak this there are multiple options:
+Midori opens files with GIO, and falls back to xdg-open, exo-open or gnome-open if these are available. All of this relies on freedesktop.org MIME configuration. To tweak this there are multiple options:
 </p>
 <ol>
 <li class="level1"><div class="li"> Use &#039;Open With&#039; with a graphical file manager</div>
@@ -655,11 +654,11 @@
 </p>
 <pre class="code">site-data-rules=-google.com,-facebook.com,!bugzilla.gnome.org,+bugs.launchpad.net</pre>
 <ol>
-<li class="level1"><div class="li"> Values prefixed with ”-” are always blocked</div>
-</li>
-<li class="level1"><div class="li"> Values prefixed with ”+” are always accepted</div>
-</li>
-<li class="level1"><div class="li"> Values prefixed with ”!” are not cleared in Clear Private Data</div>
+<li class="level1"><div class="li"> Values prefixed with “-” are always blocked</div>
+</li>
+<li class="level1"><div class="li"> Values prefixed with “+” are always accepted</div>
+</li>
+<li class="level1"><div class="li"> Values prefixed with “!” are not cleared in Clear Private Data</div>
 </li>
 <li class="level1"><div class="li"> No wildcards.</div>
 </li>
@@ -720,7 +719,7 @@
 </p>
 
 <p>
-As of Midori 0.2.9 Private Browsing uses preferences, cookies, keyboard shortcuts and search engines from the normal session, but it won&#039;t save any changes. This behaviour can be emulated from the command line with ”-a” and ”-c”.
+As of Midori 0.2.9 Private Browsing uses preferences, cookies, keyboard shortcuts and search engines from the normal session, but it won&#039;t save any changes. This behaviour can be emulated from the command line with “-a” and “-c”.
 </p>
 
 <p>
@@ -756,7 +755,7 @@
 </p>
 
 <p>
-If needed, a customized profile can be created with “midori -c /path/to/folder”. Using the shortcut editor extension, keyboard shortcuts can be removed as needed. Afterwards just append ”-c /path/to/folder” to the kiosk mode command line.
+If needed, a customized profile can be created with “midori -c /path/to/folder”. Using the shortcut editor extension, keyboard shortcuts can be removed as needed. Afterwards just append “-c /path/to/folder” to the kiosk mode command line.
 </p>
 
 <p>
@@ -883,7 +882,7 @@
 </p>
 
 <p>
-libSoup &lt; 2.40 only supports <abbr title="Hyper Text Transfer Protocol">HTTP</abbr> proxy servers directly. A way to use SOCKS on Unix is to use tsocks with <abbr title="Secure Shell">SSH</abbr> as follows:
+libSoup &lt; 2.40 only supports HTTP proxy servers directly. A way to use SOCKS on Unix is to use tsocks with SSH as follows:
 </p>
 <ol>
 <li class="level1"><div class="li"> Install &#039;tsocks&#039;</div>
@@ -895,13 +894,13 @@
 server_port = 5555</pre>
 </div>
 </li>
-<li class="level1"><div class="li"> Open an <abbr title="Secure Shell">SSH</abbr> connection with the same port: <pre class="code"> ssh -D localhost:5555 myhost.com </pre>
+<li class="level1"><div class="li"> Open an SSH connection with the same port: <pre class="code"> ssh -D localhost:5555 myhost.com </pre>
 </div>
 </li>
 <li class="level1"><div class="li"> Run Midori with “tsocks” in front of it: <pre class="code"> tsocks midori </pre>
 </div>
 </li>
-<li class="level1"><div class="li"> Now you can use for example <a href="http://www.whatsmyip.org/" class="urlextern" title="http://www.whatsmyip.org/"  rel="nofollow">http://www.whatsmyip.org/</a> to verify that you are using a SOCKS connection. The IP address should match the one of your <abbr title="Secure Shell">SSH</abbr> host. Remember to keep the <abbr title="Secure Shell">SSH</abbr> login running, and don&#039;t suspend it, otherwise it won&#039;t work.</div>
+<li class="level1"><div class="li"> Now you can use for example <a href="http://www.whatsmyip.org/" class="urlextern" title="http://www.whatsmyip.org/"  rel="nofollow">http://www.whatsmyip.org/</a> to verify that you are using a SOCKS connection. The IP address should match the one of your SSH host. Remember to keep the SSH login running, and don&#039;t suspend it, otherwise it won&#039;t work.</div>
 </li>
 <li class="level1"><div class="li"> If the connection fails for some reason, you should see a connection error.</div>
 </li>
@@ -973,7 +972,7 @@
 </p>
 
 <p>
-Find:         Ctrl+f ”/” and ”,”<br/>
+Find:         Ctrl+f “/” and “,”<br/>
 
 FindNext:     Ctrl+g and Enter<br/>
 
@@ -986,7 +985,7 @@
 </p>
 
 <p>
-When using Ctrl+f to bring up Find, use Ctrl+f again or ESC. When using ”/” or ”,” to bring up Find, the previous works here as well and by simply moving focus away from the Find box. For example: a Tab or a mouse click anywhere[besides links of course].
+When using Ctrl+f to bring up Find, use Ctrl+f again or ESC. When using “/” or “,” to bring up Find, the previous works here as well and by simply moving focus away from the Find box. For example: a Tab or a mouse click anywhere[besides links of course].
 </p>
 
 </div>
@@ -1054,7 +1053,7 @@
 </p>
 
 <p>
-If the script is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-script.js where ”.js” is the extension.
+If the script is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-script.js where “.js” is the extension.
 </p>
 
 </div>
@@ -1107,7 +1106,7 @@
 </p>
 
 <p>
-Note, if the style is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-style.css where ”.css” is the extension.
+Note, if the style is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-style.css where “.css” is the extension.
 </p>
 
 </div>

=== modified file 'tools/release'
--- tools/release	2015-04-19 23:03:37 +0000
+++ tools/release	2015-08-30 10:34:45 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # Copyright (C) 2013-2014 Christian Dywan <[e-mail]>
 #

=== modified file 'win32/makedist/midori.nsi'
--- win32/makedist/midori.nsi	2015-04-19 23:03:37 +0000
+++ win32/makedist/midori.nsi	2015-08-30 10:34:45 +0000
@@ -21,7 +21,7 @@
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Midori"
-!define PRODUCT_VERSION "0.5.10"
+!define PRODUCT_VERSION "0.5.11"
 !define PRODUCT_BUILD "0"
 !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
 !define PRODUCT_PUBLISHER "Christian Dywan"