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

[Cris Dywan]

Bump version to 0.5.4

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-17 18:40:41 +0000
+++ ChangeLog	2013-07-15 17:13:28 +0000
@@ -1,5 +1,70 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.5.4:
+ Refactor history step and allow multiple title updates
+ Call midori_browser_connect_tab with correct type
+ Don't add HistoryCompletion if there's no history
+ Restore reload button icon in error pages
+ Don't insert folders into the log
+ If an url is specified the fallback url should not be loaded
+ Fixed crashes when closing a loading tab + granite's tab moving
+ Test if plugins are redundant instead of skipping them all
+ Avoid selecting bookmark uris that begin by 'javascript:' for completion
+ Set FOREIGN_KEYS pragma on db initialization
+ Implement a default zoom level preference
+ Fix tautological use of G_MAXINT with enum
+ Take current selection into account for bookmark folders when adding/editing bookmark
+ Improve error page visuals, show suggestions on network errors
+ Bump vala to 0.16.0
+ Downgrade glib requirement to 2.32.3 to re-enable building under Ubuntu 12.04 (LTS)
+ Bump glib2 version to 2.32.4
+ Improve and unify thumbnail generation
+ Omit speed dial and blank pages from view completion
+ Makes the elements of the speed dial non-selectable
+ Use NULL-safe comparison in katze_item_icon_loaded_cb
+ Drop non-DOM style sheet injection code path
+ Clean small leftovers from GTK and WebKit version bumps
+ Bump GTK+ requirement to 2.24 and drop support for earlier versions
+ Check for app mode to set browser icon instead of readonly
+ Escape square brackets in adblock_fixup_regexp
+ Fix showing (sub)folders in bookmarkbar
+ Bump WebKit requirement to 1.8.3 and drop support for earlier versions
+ Set menu on dynamic notebook tab
+ Do not run toolbar editor's GtkDialog in its own main loop by prevent calling gtk_dialog_run(). Instead just set the GtkDialog modal and show it.
+ Remove unnecesary harmful code from tab_switched_cb
+ Fix segfault when deleteing tabs with history list
+ Specify int64 id item as a string in bookmark remove/update queries
+ Distinguish between box and event box in the tab label when colouring tabs
+ Show visual feedback when hovering over items in bookmark panel
+ Replace INSTALL/ HACKING with exported Contribute wiki page
+ Delete tabs from history list with Del
+ Check brightness of backgroung color when deciding foreground color of given tab
+ Clean launcher filenames, double-click to open and delete button
+ Avoid declaring browser twice within the same function
+ Add ./waf --update-pot
+ Fix memory leak introduced in r6184
+ Use old function name g_dbus_generate_guid for old valac
+ Move Import and Export into menu Bookmarks
+ Collect multiple download notifications within a minute
+ Fix segfault when right clicking on a web view.
+ Make libnotify mandatory except on Windows
+ Remove the rather unnecessary ./waf --run feature
+ Send a notification after creating a launcher
+ Ambiguous 'Open as App' context menu item was removed
+ Apply label color to label rather than event box
+ Store data of app mode based on URL in ~/.local/share/midori/apps
+ Split colorful tabs code into helper functions and add unit tests
+ Fix History List memory leak  when closing Midori window.
+ Replace .gitignore with a .bzrignore
+ Always define GCR_VERSION in GTK+2 build
+ Fix bookmarks dialog rename regression introduced in r6167.
+ Drop check for gcr-3-gtk2 which isn't being maintained.
+ Scrap unneeded background variables in location renderer callbacks
+ Title case and proper packing in bookmark dialog
+ Delete PO files Launchpad spewed into root directory when it couldn't find po/*.pot file.
+ Issue a warning when trying to use MIDORI_DEBUG while running
+ Update dates to 2013 to fix bug #1167075.
+
 v0.5.2:
  Re-release with a proper version number and changelog
 

=== modified file 'HACKING'
--- HACKING	2013-05-29 19:36:59 +0000
+++ HACKING	2013-07-15 17:13:28 +0000
@@ -1,3 +1,4 @@
+    
 ====== Midori - Contribute ======
 
 **This document is licensed under the LGPL 2.1.**
@@ -9,6 +10,10 @@
 The development **trunk** (master, tip) is the latest iteration of the next release. Browse it online and look for other branches at http://code.launchpad.net/midori or http://bazaar.launchpad.net/~midori/midori/trunk/tarball download a tarball of the latest revision.
 
 //The code used to be hosted in git.xfce.org/apps/midori.//
+
+Keep your copy updated:
+
+bzr merge --pull
 ====== Join IRC chat rooms ======
 
 Join irc://irc.freenode.net/midori #midori on Freenode https://kiwiirc.com/client/irc.freenode.net/midori or use webchat to talk about Midori, discuss bugs and new ideas.
@@ -16,7 +21,8 @@
 
   * http://bugs.launchpad.net/midori Go through problem reports and check Unconfirmed bugs or those lacking information and mark any duplicates you spot
   * https://www.bountysource.com/#trackers/130181-midori Add a bounty for a feature or bug you'd like to support
-
+  * https://translations.launchpad.net/midori/trunk/+pots/trunk Translate to your own language
+  * https://github.com/eustasy/midori-browser.org/issues Report website bugs
 ====== Build the code ======
 
 ./waf configure --prefix=/usr
@@ -42,10 +48,13 @@
 
 _build/default/midori/midori -g [OPTIONAL ARGUMENTS]
 
+If the problem is a warning, not a crash GLib has a handy feature
+
+env G_DEBUG=all _build/default/midori/midori -g
+
 For more specific debugging output, depending on the feature in question you may use
 
 env MIDORI_DEBUG=help _build/default/midori/midori
-
 ====== Coding style and quality ======
 
 Midori code should in general have:
@@ -87,6 +96,9 @@
 Commit all current changes - Bazaar automatically picks up edited files. //If you're used to git, think of an implicit staging area.//
     bzr commit -p
 
+If you have one or more related bug reports you should pass them as arguments. Once these commits are merged the bug will automatically be closed and the commit log shows clickable links to the reports.
+    bzr commit -p --fixes=lp:1111999
+
 If you've done several commits
     bzr log | less
     bzr log -p | less
@@ -100,12 +112,11 @@
     bzr unshelve
 
 Remember to keep your branch updated:
-    bzr pull
+    bzr merge --pull
 
 As a general rule of thumb, ''bzr help COMMAND'' gives you an explanation of any command and ''bzr help commands'' lists all available commands.
 
 //If you're a die-hard git user, http://zyga.github.io/git-lp/ checkout git-lp to use git commands with the Bazaar repository.//
-
 ====== Push proposed changes ======
 
 If you haven't yet, https://launchpad.net/~/+editsshkeys check that Launchpad has your SSH key - you can create an SSH key with **Passwords and Keys** aka **Seahorse** or ''ssh-keygen -t rsa'' - and use ''bzr launchpad-login'' to make youself known to bzr locally.
@@ -156,6 +167,27 @@
 cd midori.fix-bug1120383
 bzr pull lp:midori
 
+
+====== Backwards compatibility ======
+As of Midori 0.5.4 the formula is:
+  * Required dependencies need to be available on the previous stable https://apps.fedoraproject.org/packages/s/webkit Fedora and http://packages.ubuntu.com/search?suite=quantal&keywords=webkit&searchon=names Ubuntu
+  * For reference http://openports.se/www/webkit OpenBSD
+  * Windows XP through 8 are to date ABI compatible, all dependencies are included
+
+^ package ^ F17 (2012-05-29) ^ U 12.10 (2012-10-18) ^
+| glib2 | 2.32.4 | 2.34.0 |
+| vala | 0.16.1 | 0.16 |
+| gtk3 | 3.4.4 | 3.6.0 |
+| gtk2 | 2.24.13 | 2.24.13 |
+| soup | 2.38.1 | 2.40 |
+| webkit | 1.8.3-1.fc17 | 1.10.0-0ubuntu1 |
+====== Midori with(out) Granite ======
+When built with Granite (--enable-granite) there're a few key differences:
+  * Preferences uses a http://valadoc.elementaryos.org/Granite/Granite.Widgets.StaticNotebook.html Granite.Widgets.StaticNotebook
+  * URL completion styling is slightly different
+  * Clear Private Data uses **Granite.Widgets.LightWindow**
+  * Edit Bookmark and Security Details use http://valadoc.elementaryos.org/Granite/Granite.Widgets.PopOver.html Granite.Widgets.PopOver instead of Gtk.Window
+  * Browser uses **Granite.Widgets.DynamicNotebook** instead of Gtk.Notebook
 ====== Midori for Windows ======
 ===== Dependencies =====
 Midori for Windows is compiled on a Linux host and MinGW stack. For the current build Fedora 18 packages are used. Packages needed are listed below:
@@ -197,4 +229,11 @@
 ===== Testing =====
 For testing your changes unfortuantely a real system is needed because Midori and WebKitGTK+ don't work properly under Wine. Even if it works some problems are not visible when using Wine, but are present when running under a real Windows system and vice versa.
 
-One way around it is to virtualize Windows on a Linux host and mount your MinGW directories as a network drive or shared folder.
\ No newline at end of file
+One way around it is to virtualize Windows on a Linux host and mount your MinGW directories as a network drive or shared folder.
+
+====== Jargon ======
+    * freeze: the 4th week of a 4 week release cycle, bug fixes only
+    * MR: merge request, a branch proposed for review
+    * ninja: an internal tab, usually empty label, used for taking screenshots
+    * fortress: user of an ancient release like 0.4.3 as found on Raspberry Pie, Debian, Ubuntu
+    * katze, sokoke, tabby: API names and coincidentally cat breeds
\ No newline at end of file

=== modified file 'data/faq.html'
--- data/faq.html	2013-05-16 21:25:22 +0000
+++ data/faq.html	2013-07-15 17:13:28 +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-05-13T12:47:33+0200"/>
+<meta name="date" content="2013-07-12T03:32:14+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 +18,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=1358197876"></script>
+<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=1371413028"></script>
 </head>
 <body>
 <div class="dokuwiki export">
@@ -241,6 +241,10 @@
 <div class="level4">
 
 <p>
+Midori uses the system&#039;s ca-certificates, the exact locations depend on the distribution.
+</p>
+
+<p>
 Midori &gt;= 0.4.7 supports <a href="http://git.gnome.org/browse/gcr/tree/gcr" class="urlextern" title="http://git.gnome.org/browse/gcr/tree/gcr"  rel="nofollow">gcr</a> for certificate display and management, you can click the lock in the urlbar to see detailed information. Earlier versions, or one without gcr will not handle certificates beyond the lock icon in the urlbar.
 </p>
 
@@ -250,7 +254,7 @@
 <div class="level5">
 
 <p>
-No key store is available or it&#039;s incorrectly setup. By default GNOME keyring can do this. Under Xfce it is recommended to enable “GNOME services” under “Session and Startup settings”. Otherwise this can occur if a script doesn&#039;t correctly send the output of “gnome-keyring –startup” to the environment.
+No key store is available or it&#039;s incorrectly setup. By default GNOME keyring can do this. Under Xfce it is recommended to enable “GNOME services” under “Session and Startup settings”. To make sure, that the output of “gnome-keyring –startup” is correctly sent to the environment, you can add “export `gnome-keyring-daemon –start`” to .xinitrc.
 </p>
 
 </div>
@@ -263,7 +267,7 @@
 </p>
 
 </div>
-<!-- EDIT4 SECTION "Security features" [3301-4386] -->
+<!-- EDIT4 SECTION "Security features" [3301-4518] -->
 <h2 class="sectionedit5" id="flash_doesn_t_work">Flash doesn&#039;t work</h2>
 <div class="level2">
 
@@ -302,12 +306,15 @@
 <p>
 nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can&#039;t crash the whole browser and Flash, which is GTK+2 can run in GTK+3.
 </p>
-<pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer
-<span class="kw2">sudo</span> <span class="kw2">apt-get install</span> nspluginwrapper
+<pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer nspluginwrapper
 <span class="kw2">sudo</span> nspluginwrapper <span class="re5">-i</span> <span class="sy0">/</span>usr<span class="sy0">/</span>lib<span class="sy0">/</span>flashplugin-installer<span class="sy0">/</span>libflashplayer.so
 nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span></pre>
 
 <p>
+~/.mozilla can also be used with Adobe&#039;s tarball if system-wide install is not an option. The approach is confirmed to work with x86-64 as well.
+</p>
+
+<p>
 Another remedy is using WebKit2 - starting with Midori 0.4.9 experimental support is available, <a href="https://trac.webkit.org/wiki/WebKitGTK/WebKit2Roadmap" class="urlextern" title="https://trac.webkit.org/wiki/WebKitGTK/WebKit2Roadmap"  rel="nofollow">progress on WebKit2GTK+ can be seen in the WebKit wiki</a>.
 </p>
 
@@ -358,7 +365,7 @@
 </li>
 <li class="level1"><div class="li"> You may need gstreamer0.10-alsa for ALSA, depending on your distribution.</div>
 </li>
-<li class="level1"><div class="li"> You need plugins for Theora, gstreamer0.10-base and <abbr title="Motion Picture Experts Group">MPEG</abbr>-4 incluing aac (e.g. gst-plugins-faad), gstreamer0.10-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, gstreamer0.10-base and <abbr title="Moving Picture Experts Group">MPEG</abbr>-4 incluing aac (e.g. gst-plugins-faad), gstreamer0.10-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>
@@ -589,12 +596,12 @@
 </p>
 
 </div>
-<!-- EDIT5 SECTION "Flash doesn't work" [4387-12724] -->
+<!-- EDIT5 SECTION "Flash doesn't work" [4519-12981] -->
 <h1 class="sectionedit6" id="privacy">Privacy</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT6 SECTION "Privacy" [12725-12747] -->
+<!-- EDIT6 SECTION "Privacy" [12982-13004] -->
 <h2 class="sectionedit7" id="blacklist_cookies">Blacklist cookies</h2>
 <div class="level2">
 
@@ -620,7 +627,7 @@
 </p>
 
 </div>
-<!-- EDIT7 SECTION "Blacklist cookies" [12748-13284] -->
+<!-- EDIT7 SECTION "Blacklist cookies" [13005-13541] -->
 <h2 class="sectionedit8" id="adblock">Adblock</h2>
 <div class="level2">
 
@@ -629,12 +636,12 @@
 </p>
 
 </div>
-<!-- EDIT8 SECTION "Adblock" [13285-13540] -->
+<!-- EDIT8 SECTION "Adblock" [13542-13797] -->
 <h1 class="sectionedit9" id="modes">Modes</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT9 SECTION "Modes" [13541-13561] -->
+<!-- EDIT9 SECTION "Modes" [13798-13818] -->
 <h2 class="sectionedit10" id="web_applications">Web Applications</h2>
 <div class="level2">
 
@@ -655,7 +662,7 @@
 </p>
 
 </div>
-<!-- EDIT10 SECTION "Web Applications" [13562-14078] -->
+<!-- EDIT10 SECTION "Web Applications" [13819-14335] -->
 <h2 class="sectionedit11" id="private_browsing">Private Browsing</h2>
 <div class="level2">
 
@@ -681,7 +688,7 @@
 </p>
 
 </div>
-<!-- EDIT11 SECTION "Private Browsing" [14079-14998] -->
+<!-- EDIT11 SECTION "Private Browsing" [14336-15255] -->
 <h2 class="sectionedit12" id="portable_modewin32">Portable mode/ Win32</h2>
 <div class="level2">
 
@@ -690,7 +697,7 @@
 </p>
 
 </div>
-<!-- EDIT12 SECTION "Portable mode/ Win32" [14999-15312] -->
+<!-- EDIT12 SECTION "Portable mode/ Win32" [15256-15569] -->
 <h2 class="sectionedit13" id="kiosk_mode">Kiosk mode</h2>
 <div class="level2">
 
@@ -722,7 +729,7 @@
 </p>
 
 </div>
-<!-- EDIT13 SECTION "Kiosk mode" [15313-16350] -->
+<!-- EDIT13 SECTION "Kiosk mode" [15570-16607] -->
 <h2 class="sectionedit14" id="always_open_midori_in_fullscreen">Always open Midori in Fullscreen</h2>
 <div class="level2">
 
@@ -755,7 +762,7 @@
 </p>
 
 </div>
-<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16351-16878] -->
+<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16608-17135] -->
 <h2 class="sectionedit15" id="overriding_settings_and_loading_extensions">Overriding settings and loading extensions</h2>
 <div class="level2">
 
@@ -772,7 +779,7 @@
 </p>
 
 </div>
-<!-- EDIT15 SECTION "Overriding settings and loading extensions" [16879-17086] -->
+<!-- EDIT15 SECTION "Overriding settings and loading extensions" [17136-17343] -->
 <h1 class="sectionedit16" id="proxy_servers">Proxy servers</h1>
 <div class="level1">
 
@@ -856,7 +863,7 @@
 </ol>
 
 </div>
-<!-- EDIT16 SECTION "Proxy servers" [17087-18908] -->
+<!-- EDIT16 SECTION "Proxy servers" [17344-19165] -->
 <h1 class="sectionedit17" id="keyboard_hotkeys">Keyboard Hotkeys</h1>
 <div class="level1">
 
@@ -938,7 +945,7 @@
 </p>
 
 </div>
-<!-- EDIT17 SECTION "Keyboard Hotkeys" [18909-20241] -->
+<!-- EDIT17 SECTION "Keyboard Hotkeys" [19166-20498] -->
 <h1 class="sectionedit18" id="mouse_gestures">Mouse Gestures</h1>
 <div class="level1">
 
@@ -975,7 +982,7 @@
 </p>
 
 </div>
-<!-- EDIT18 SECTION "Mouse Gestures" [20242-21006] -->
+<!-- EDIT18 SECTION "Mouse Gestures" [20499-21263] -->
 <h1 class="sectionedit19" id="user_scripts_and_styles">User scripts and styles</h1>
 <div class="level1">
 
@@ -1036,7 +1043,7 @@
 </p>
 
 </div>
-<!-- EDIT19 SECTION "User scripts and styles" [21007-23561] -->
+<!-- EDIT19 SECTION "User scripts and styles" [21264-23818] -->
 <h2 class="sectionedit20" id="user_styles">User styles</h2>
 <div class="level2">
 
@@ -1098,6 +1105,6 @@
         }</pre>
 
 </div>
-<!-- EDIT20 SECTION "User styles" [23562-] --></div>
+<!-- EDIT20 SECTION "User styles" [23819-] --></div>
 </body>
 </html>

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-07-09 16:24:32 +0000
+++ midori/midori-view.c	2013-07-15 17:13:28 +0000
@@ -5459,7 +5459,7 @@
  * Returns: a newly allocated #GdkPixbuf
  *
  * Since: 0.2.1
- * Deprecated: 0.5.3
+ * Deprecated: 0.5.4
  **/
 GdkPixbuf*
 midori_view_get_snapshot (MidoriView* view,

=== modified file 'tools/release'
--- tools/release	2013-05-29 19:36:59 +0000
+++ tools/release	2013-07-15 17:13:28 +0000
@@ -13,9 +13,8 @@
 NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))")
 if [ "x$1" = "xbefore" ]; then
     echo Bumping from $OLDVER to $NEWVER
-    OLDVER=0.5.1
     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]+ @@' | grep -v l10n | grep -v makedist | grep -v tools/release | grep -v nsi | grep -v -E 'Update .+ translation'; 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'; 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-07-14 18:08:55 +0000
+++ win32/makedist/midori.nsi	2013-07-15 17:13:28 +0000
@@ -21,7 +21,7 @@
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Midori"
-!define PRODUCT_VERSION "0.5.2"
+!define PRODUCT_VERSION "0.5.4"
 !define PRODUCT_BUILD "0"
 !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
 !define PRODUCT_PUBLISHER "Christian Dywan"

=== modified file 'wscript'
--- wscript	2013-06-30 14:37:38 +0000
+++ wscript	2013-07-15 17:13:28 +0000
@@ -28,7 +28,7 @@
 from Configure import find_program_impl
 
 APPNAME = 'midori'
-VERSION = VERSION_FULL = '0.5.2'
+VERSION = VERSION_FULL = '0.5.4'
 VERSION_SUFFIX = ' (%s)' % VERSION
 
 try: