Merge lp:~gero-bare/midori/midori-small-fixes into lp:~midori/midori/webkit2gtk4abiBreak

[Gero.Bare]

My compiler (both clang 3.6 and gcc 4.9 in Arch Linux) is bitching about some small errors.
This should address that.
Thanks for your branch man.

[lp:~gero-bare/midori/midori-small-fixes]

6940. By Gero.Bare on 2015-04-21

Fix blank line.

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2015-04-21 00:54:44 +0000
+++ midori/midori-browser.c	2015-04-21 02:08:13 +0000
@@ -3637,10 +3637,10 @@
                      MidoriBrowser* browser,
                      gboolean       use_dom)
 {
-    GtkWidget* view = midori_browser_get_current_tab (browser);
     #ifdef HAVE_WEBKIT2
     /* TODO: midori_view_save_source isn't async and not WebKit2-friendly */
     #else
+    GtkWidget* view = midori_browser_get_current_tab (browser);
     gchar* filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, use_dom);
     gchar* text_editor;
     GFileInfo* info;
 
=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2015-04-16 01:47:45 +0000
+++ midori/midori-privatedata.c	2015-04-21 02:08:13 +0000
@@ -119,7 +119,7 @@
     {
         MidoriPrivateDataItem* privacy = data_items->data;
         button = g_object_get_data (G_OBJECT (dialog), privacy->name);
-        g_return_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button));
+        g_return_val_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button), false);
         if (gtk_toggle_button_get_active (button))
             count++;
     }
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-04-21 00:54:44 +0000
+++ midori/midori-view.c	2015-04-21 02:08:13 +0000
@@ -4545,7 +4545,7 @@
     GFile *file;
     char *converted = NULL;
     WebKitWebView * web_view = WEBKIT_WEB_VIEW (view->web_view);
-    g_return_if_fail (uri);
+    g_return_val_if_fail (uri,NULL);
 
     if (!outfile)
         converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);