Midori Web Browser

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

  1. midori-small-fixes
  2. Merge into webkit2gtk4abiBreak
Proposed by Gero.Bare
Status: Merged
Merged at revision: 6940
Proposed branch: lp:~gero-bare/midori/midori-small-fixes
Merge into: lp:~midori/midori/webkit2gtk4abiBreak
Diff against target: 41 lines (+3/-3)
3 files modified
midori/midori-browser.c (+1/-1)
midori/midori-privatedata.c (+1/-1)
midori/midori-view.c (+1/-1)
To merge this branch: bzr merge lp:~gero-bare/midori/midori-small-fixes
Reviewer Review Type Date Requested Status
Cris Dywan Pending
Review via email: mp+256876@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
lp:~gero-bare/midori/midori-small-fixes updated
6940. By Gero.Bare

Fix blank line.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2015-04-21 00:54:44 +0000
3+++ midori/midori-browser.c 2015-04-21 02:08:13 +0000
4@@ -3637,10 +3637,10 @@
5 MidoriBrowser* browser,
6 gboolean use_dom)
7 {
8- GtkWidget* view = midori_browser_get_current_tab (browser);
9 #ifdef HAVE_WEBKIT2
10 /* TODO: midori_view_save_source isn't async and not WebKit2-friendly */
11 #else
12+ GtkWidget* view = midori_browser_get_current_tab (browser);
13 gchar* filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, use_dom);
14 gchar* text_editor;
15 GFileInfo* info;
16
17=== modified file 'midori/midori-privatedata.c'
18--- midori/midori-privatedata.c 2015-04-16 01:47:45 +0000
19+++ midori/midori-privatedata.c 2015-04-21 02:08:13 +0000
20@@ -119,7 +119,7 @@
21 {
22 MidoriPrivateDataItem* privacy = data_items->data;
23 button = g_object_get_data (G_OBJECT (dialog), privacy->name);
24- g_return_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button));
25+ g_return_val_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button), false);
26 if (gtk_toggle_button_get_active (button))
27 count++;
28 }
29
30=== modified file 'midori/midori-view.c'
31--- midori/midori-view.c 2015-04-21 00:54:44 +0000
32+++ midori/midori-view.c 2015-04-21 02:08:13 +0000
33@@ -4545,7 +4545,7 @@
34 GFile *file;
35 char *converted = NULL;
36 WebKitWebView * web_view = WEBKIT_WEB_VIEW (view->web_view);
37- g_return_if_fail (uri);
38+ g_return_val_if_fail (uri,NULL);
39
40 if (!outfile)
41 converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);

Subscribers

People subscribed via source and target branches

to all changes: