Midori Web Browser

Merge lp:~kalikiana/midori/wk2viewwarn into lp:midori

  1. wk2viewwarn
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: André Stösel
Approved revision: 6307
Merged at revision: 6319
Proposed branch: lp:~kalikiana/midori/wk2viewwarn
Merge into: lp:midori
Diff against target: 45 lines (+4/-2)
1 file modified
midori/midori-view.c (+4/-2)
To merge this branch: bzr merge lp:~kalikiana/midori/wk2viewwarn
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+178355@code.launchpad.net

Commit message

Move #ifndef guards in Midori.View to fix warnings

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-view.c'
2--- midori/midori-view.c 2013-08-02 12:00:42 +0000
3+++ midori/midori-view.c 2013-08-02 18:05:32 +0000
4@@ -1296,8 +1296,8 @@
5 static void
6 midori_view_load_finished (MidoriView* view)
7 {
8- #ifndef HAVE_WEBKIT2
9 midori_view_apply_scroll_position (view);
10+ #ifndef HAVE_WEBKIT2
11
12 {
13 WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
14@@ -1488,6 +1488,7 @@
15 g_object_notify (G_OBJECT (view), "title");
16 }
17
18+#ifndef HAVE_WEBKIT2
19 static void
20 webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view,
21 const gchar* text,
22@@ -1495,6 +1496,7 @@
23 {
24 midori_tab_set_statusbar_text (MIDORI_TAB (view), text);
25 }
26+#endif
27
28 static gboolean
29 midori_view_web_view_leave_notify_event_cb (WebKitWebView* web_view,
30@@ -2569,6 +2571,7 @@
31 return FALSE;
32 }
33
34+#ifndef HAVE_WEBKIT2
35 static gboolean
36 webkit_web_view_web_view_ready_cb (GtkWidget* web_view,
37 MidoriView* view)
38@@ -2595,7 +2598,6 @@
39 return TRUE;
40 }
41
42-#ifndef HAVE_WEBKIT2
43 static GtkWidget*
44 webkit_web_view_create_web_view_cb (GtkWidget* web_view,
45 WebKitWebFrame* web_frame,

Subscribers

People subscribed via source and target branches

to all changes: