Merge lp:~kalikiana/midori/release0.5.6 into lp:midori

[Cris Dywan]

Bump version to 0.5.5

[André Stösel (ivaldi)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-07-15 17:07:45 +0000
+++ ChangeLog	2013-08-14 18:13:41 +0000
@@ -1,5 +1,37 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.5.5:
+ Fix name and text fields inversion in XBEL folder import
+ Correct packing of cookie and nojs permission dialog.
+ Don't set tab title/special when a non-main frame displays an error
+ Revise "cookies" debug output, merge expiry check and disallow revival of old cookies
+ Drop now unused cgit module.xml file
+ Use SoupProxyResolverGnome unconditionally and disable prefetching if proxy is active
+ win32: Hide gui for profiles in webapp manager, as they are currently broken on Windows
+ win32: support additional mouse buttons for going back/forward in history
+ Enrich app error messages with filenames
+ Fix segfault if url contains " %00"
+ Replace 'Run as app' in bookmark dialog with 'Create launcher'
+ Split config files and install from folders recursively
+ Implement GTK+ theme switching via Preferences (Win32)
+ Enable set_disk_cache_directory with WebKit2
+ Introduce Midori.ContextAction and refactor page menu from scratch
+ Define large dialog icon size relative to dialog icon size
+ Extension Devpet which shows error messages and backtraces in systray
+ WebKit2 cookie support
+ Check the hit test result for editable to see if , should search
+ Use SoupCookieJarSqlite and drop KatzeHttpCookies(Sqlite)
+ Show folder tree when editing bookmarks
+ Handle double value in _midori_browser_activate_action
+ Add privacy preferences in web app mode
+ Escape parentheses in adblock_fixup_regexp
+ Introduce object oriented API for access to History Database
+ Allow rss feeds with version 0.92
+ Rename History completion to Bookmarks and History
+ Don't show rss feed icon on twitter, underlying API was retired
+ Read apps/ profiles from folder, leave launchers separate
+ Fill in bookmark folder attributes in bookmarkbar populate
+
 v0.5.4:
  Refactor history step and allow multiple title updates
  Call midori_browser_connect_tab with correct type

=== modified file 'HACKING'
--- HACKING	2013-07-15 17:07:45 +0000
+++ HACKING	2013-08-14 18:13:41 +0000
@@ -1,4 +1,3 @@
-    
 ====== Midori - Contribute ======
 
 **This document is licensed under the LGPL 2.1.**
@@ -55,6 +54,13 @@
 For more specific debugging output, depending on the feature in question you may use
 
 env MIDORI_DEBUG=help _build/default/midori/midori
+
+To verify a regression you might need to revert a particular change:
+
+
+# Revert only r6304
+bzr merge . -r 6304..6303
+
 ====== Coding style and quality ======
 
 Midori code should in general have:

=== modified file 'data/faq.html'
--- data/faq.html	2013-07-15 17:07:45 +0000
+++ data/faq.html	2013-08-14 18:13:41 +0000
@@ -5,7 +5,7 @@
   <title>midori:faq</title>
 <meta name="generator" content="DokuWiki"/>
 <meta name="robots" content="noindex,nofollow"/>
-<meta name="date" content="2013-07-12T03:32:14+0200"/>
+<meta name="date" content="2013-08-13T17:48:26+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="/"/>
@@ -58,6 +58,7 @@
 <li class="level1"><div class="li"><a href="#user_scripts_and_styles">User scripts and styles</a></div>
 <ul class="toc">
 <li class="level2"><div class="li"><a href="#user_styles">User styles</a></div></li>
+<li class="level2"><div class="li"><a href="#understanding_webkit_version_numbers">Understanding WebKit Version Numbers</a></div></li>
 </ul></li>
 </ul>
 </div>
@@ -201,6 +202,21 @@
 
 </div>
 
+<h4 id="disable_middle_click_pasting">Disable middle click pasting</h4>
+<div class="level4">
+
+<p>
+As of GTK+ &gt;= 3.4 one can disable it globally in ~/.gtkrc-2.0
+</p>
+<pre class="code">gtk-enable-primary-paste = 0</pre>
+
+<p>
+Otherwise by adding a line to ~/.config/midori/config
+</p>
+<pre class="code">middle-click-opens-selection=false</pre>
+
+</div>
+
 <h4 id="midori_crashes_shortly_before_pages_are_loaded">Midori crashes shortly before pages are loaded</h4>
 <div class="level4">
 
@@ -222,7 +238,7 @@
 </p>
 
 </div>
-<!-- EDIT3 SECTION "Common problems" [1189-3300] -->
+<!-- EDIT3 SECTION "Common problems" [1189-3545] -->
 <h2 class="sectionedit4" id="security_features">Security features</h2>
 <div class="level2">
 
@@ -267,7 +283,7 @@
 </p>
 
 </div>
-<!-- EDIT4 SECTION "Security features" [3301-4518] -->
+<!-- EDIT4 SECTION "Security features" [3546-4763] -->
 <h2 class="sectionedit5" id="flash_doesn_t_work">Flash doesn&#039;t work</h2>
 <div class="level2">
 
@@ -596,12 +612,12 @@
 </p>
 
 </div>
-<!-- EDIT5 SECTION "Flash doesn't work" [4519-12981] -->
+<!-- EDIT5 SECTION "Flash doesn't work" [4764-13226] -->
 <h1 class="sectionedit6" id="privacy">Privacy</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT6 SECTION "Privacy" [12982-13004] -->
+<!-- EDIT6 SECTION "Privacy" [13227-13249] -->
 <h2 class="sectionedit7" id="blacklist_cookies">Blacklist cookies</h2>
 <div class="level2">
 
@@ -627,7 +643,7 @@
 </p>
 
 </div>
-<!-- EDIT7 SECTION "Blacklist cookies" [13005-13541] -->
+<!-- EDIT7 SECTION "Blacklist cookies" [13250-13786] -->
 <h2 class="sectionedit8" id="adblock">Adblock</h2>
 <div class="level2">
 
@@ -636,12 +652,12 @@
 </p>
 
 </div>
-<!-- EDIT8 SECTION "Adblock" [13542-13797] -->
+<!-- EDIT8 SECTION "Adblock" [13787-14042] -->
 <h1 class="sectionedit9" id="modes">Modes</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT9 SECTION "Modes" [13798-13818] -->
+<!-- EDIT9 SECTION "Modes" [14043-14063] -->
 <h2 class="sectionedit10" id="web_applications">Web Applications</h2>
 <div class="level2">
 
@@ -662,7 +678,7 @@
 </p>
 
 </div>
-<!-- EDIT10 SECTION "Web Applications" [13819-14335] -->
+<!-- EDIT10 SECTION "Web Applications" [14064-14580] -->
 <h2 class="sectionedit11" id="private_browsing">Private Browsing</h2>
 <div class="level2">
 
@@ -688,7 +704,7 @@
 </p>
 
 </div>
-<!-- EDIT11 SECTION "Private Browsing" [14336-15255] -->
+<!-- EDIT11 SECTION "Private Browsing" [14581-15500] -->
 <h2 class="sectionedit12" id="portable_modewin32">Portable mode/ Win32</h2>
 <div class="level2">
 
@@ -697,7 +713,7 @@
 </p>
 
 </div>
-<!-- EDIT12 SECTION "Portable mode/ Win32" [15256-15569] -->
+<!-- EDIT12 SECTION "Portable mode/ Win32" [15501-15814] -->
 <h2 class="sectionedit13" id="kiosk_mode">Kiosk mode</h2>
 <div class="level2">
 
@@ -729,7 +745,7 @@
 </p>
 
 </div>
-<!-- EDIT13 SECTION "Kiosk mode" [15570-16607] -->
+<!-- EDIT13 SECTION "Kiosk mode" [15815-16852] -->
 <h2 class="sectionedit14" id="always_open_midori_in_fullscreen">Always open Midori in Fullscreen</h2>
 <div class="level2">
 
@@ -762,7 +778,7 @@
 </p>
 
 </div>
-<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16608-17135] -->
+<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16853-17380] -->
 <h2 class="sectionedit15" id="overriding_settings_and_loading_extensions">Overriding settings and loading extensions</h2>
 <div class="level2">
 
@@ -779,7 +795,7 @@
 </p>
 
 </div>
-<!-- EDIT15 SECTION "Overriding settings and loading extensions" [17136-17343] -->
+<!-- EDIT15 SECTION "Overriding settings and loading extensions" [17381-17588] -->
 <h1 class="sectionedit16" id="proxy_servers">Proxy servers</h1>
 <div class="level1">
 
@@ -863,7 +879,7 @@
 </ol>
 
 </div>
-<!-- EDIT16 SECTION "Proxy servers" [17344-19165] -->
+<!-- EDIT16 SECTION "Proxy servers" [17589-19410] -->
 <h1 class="sectionedit17" id="keyboard_hotkeys">Keyboard Hotkeys</h1>
 <div class="level1">
 
@@ -945,7 +961,7 @@
 </p>
 
 </div>
-<!-- EDIT17 SECTION "Keyboard Hotkeys" [19166-20498] -->
+<!-- EDIT17 SECTION "Keyboard Hotkeys" [19411-20743] -->
 <h1 class="sectionedit18" id="mouse_gestures">Mouse Gestures</h1>
 <div class="level1">
 
@@ -954,10 +970,10 @@
 </p>
 
 <p>
-You can change the button using a hidden option:
+You can change the button (for example, to the middle mouse button) using a hidden option:
 </p>
 <ol>
-<li class="level1"><div class="li"> Create a text file ~/.config/midori/extensions/libmouse-gestures.so/config .</div>
+<li class="level1"><div class="li"> Create a text file ~/.config/midori/extensions/libmouse-gestures.so/<strong>config</strong> .</div>
 </li>
 <li class="level1"><div class="li"> Type the following in there:</div>
 </li>
@@ -966,7 +982,8 @@
   button=2</pre>
 
 <p>
-As of Midori 0.5.0 individual gestures can be configured freely, consult “midori –help-execute” for a list of available left-hand actions:
+As of Midori 0.5.0 individual gestures can be configured freely in the file ~/.config/midori/extensions/libmouse-gestures.so/<strong>gestures</strong> .
+Consult “midori –help-execute” for a list of available actions, which are placed on the left of the equals sign. On the right goes a sequence of directions, (W)est, (E)east, (N)orth, (S)outh, (S)outh(W)est, etc., with a semicolon (;) after each, as shown below:
 </p>
 <pre class="code">  [gestures]
   Quit=W;E;
@@ -974,15 +991,11 @@
   TabNext=SE;</pre>
 
 <p>
-Separated by ; the right-hand values are cardinal directions, (W)est, (E)east, (N)orth, (S)outh. You can also combine eg. WE for West East.
-</p>
-
-<p>
 Additionally, there are programs allowing mouse gestures system-wide, for example <a href="http://easystroke.wiki.sourceforge.net/" class="urlextern" title="http://easystroke.wiki.sourceforge.net/"  rel="nofollow">EasyStroke</a>.
 </p>
 
 </div>
-<!-- EDIT18 SECTION "Mouse Gestures" [20499-21263] -->
+<!-- EDIT18 SECTION "Mouse Gestures" [20744-21676] -->
 <h1 class="sectionedit19" id="user_scripts_and_styles">User scripts and styles</h1>
 <div class="level1">
 
@@ -1043,7 +1056,7 @@
 </p>
 
 </div>
-<!-- EDIT19 SECTION "User scripts and styles" [21264-23818] -->
+<!-- EDIT19 SECTION "User scripts and styles" [21677-24231] -->
 <h2 class="sectionedit20" id="user_styles">User styles</h2>
 <div class="level2">
 
@@ -1105,6 +1118,44 @@
         }</pre>
 
 </div>
-<!-- EDIT20 SECTION "User styles" [23819-] --></div>
+<!-- EDIT20 SECTION "User styles" [24232-26469] -->
+<h2 class="sectionedit21" id="understanding_webkit_version_numbers">Understanding WebKit Version Numbers</h2>
+<div class="level2">
+
+<p>
+WebKit is the core of the Midori browser and often shows up in bug reports. Because WebKit is a complex piece of software and compatible with various libraries, its version numbers and naming schemes are not always clear to end-users. Read on and be enlightened:
+</p>
+
+<p>
+WebKit itself is a library which works in many environments, such as Windows, <abbr title="Operating System">OS</abbr> X, and various Linux DE. There are different “ports”, one of which corresponds to each of these environments, and each of which is slightly different in bugs and features at any given time. The WebKit port used by Midori (because Midori is built with GTK+) is WebKitGTK+.
+</p>
+
+<p>
+WebKitGTK+ can be compiled against either GTK+2 or GTK+3. This will result in library filenames like libwebkitgtk-1.0.so or libwebkitgtk-3.0.so, respectively. This has nothing to do with the version of WebKit itself.
+</p>
+
+<p>
+WebKit has a “new <abbr title="Application Programming Interface">API</abbr> layer … designed from the ground up to support a split process model”–so pages can crash without the entire browser crashing. This layer is called WebKit2, and for WebKitGTK+ it requires building against GTK+3, producing a library file called libwebkit2gtk-3.0.so.
+</p>
+
+<p>
+The version of WebKitGTK+ is only interesting from the standpoint of which <abbr title="Application Programming Interface">API</abbr> features were available and which bugs were present in that particular release; it&#039;s best checked by visiting about:version.
+</p>
+
+</div>
+
+<h4 id="version_number_interactions">Version Number Interactions</h4>
+<div class="level4">
+
+<p>
+WebKit2 can be built even with quite old WebKit versions, though Midori&#039;s WebKit2 support requires version 2.0.0 or newer of WebKit. Current versions of WebKitGTK+ continues to support GTK+2 and GTK+3 (the latter since 1.4.x or so). As stated above, the WebKit2 <abbr title="Application Programming Interface">API</abbr> layer is only available with GTK+3.
+</p>
+
+<p>
+Midori&#039;s support for WebKit2 is still provisional, and likely unsuitable for real-world daily usage; much work is being done in this area so that Midori can use WebKit2 by default at some point in the future.
+</p>
+
+</div>
+<!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [26470-] --></div>
 </body>
 </html>

=== modified file 'tools/release'
--- tools/release	2013-07-14 17:08:14 +0000
+++ tools/release	2013-08-14 18:13:41 +0000
@@ -14,7 +14,7 @@
 if [ "x$1" = "xbefore" ]; then
     echo Bumping from $OLDVER to $NEWVER
     sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi
-    echo; echo v$NEWVER:; bzr log --line -rtag:$OLDVER.. | sed -r 's@.+2013-[0-9]+-[0-9]+ @@' | sed 's@\[merge\] @@' | grep -v -E 'l10n|makedist|tools(/release)?: |nsi|translation|Bump version to|Merge lp:midori'; echo
+    echo; echo v$NEWVER:; bzr log --line -rtag:$OLDVER.. | sed -r 's@.+2013-[0-9]+-[0-9]+ @@' | sed 's@\[merge\] @@' | grep -v -E 'l10n|makedist|tools(/release)?: |nsi|translation|Bump version to|Merge lp:midori|POTFILES.in'; echo
     curl http://wiki.xfce.org/_export/raw/midori/contribute | \
         sed -r 's@\[\[([^|]+)\|([^]]+)\]\]@\1 \2@g' | \
         sed -r 's@<code( bash|)>|</code>@@g' > HACKING

=== modified file 'win32/makedist/midori.nsi'
--- win32/makedist/midori.nsi	2013-08-07 16:55:37 +0000
+++ win32/makedist/midori.nsi	2013-08-14 18:13:41 +0000
@@ -21,7 +21,7 @@
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Midori"
-!define PRODUCT_VERSION "0.5.4"
+!define PRODUCT_VERSION "0.5.5"
 !define PRODUCT_BUILD "0"
 !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
 !define PRODUCT_PUBLISHER "Christian Dywan"

=== modified file 'wscript'
--- wscript	2013-08-04 23:36:42 +0000
+++ wscript	2013-08-14 18:13:41 +0000
@@ -28,7 +28,7 @@
 from Configure import find_program_impl
 
 APPNAME = 'midori'
-VERSION = VERSION_FULL = '0.5.4'
+VERSION = VERSION_FULL = '0.5.5'
 VERSION_SUFFIX = ' (%s)' % VERSION
 
 try: