Midori Web Browser

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

  1. wk2browserwarn
  2. Merge into trunk
Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp:~kalikiana/midori/wk2browserwarn
Merge into: lp:midori
Diff against target: 19 lines (+2/-0)
1 file modified
midori/midori-browser.c (+2/-0)
To merge this branch: bzr merge lp:~kalikiana/midori/wk2browserwarn
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+180262@code.launchpad.net

Commit message

Move #ifndef HAVE_WEBKIT2 to fix warning in Browser

To post a comment you must log in.

Unmerged revisions

6307. By Cris Dywan

Move #ifndef HAVE_WEBKIT2 to fix warning in Browser

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 2013-08-12 19:21:06 +0000
3+++ midori/midori-browser.c 2013-08-14 22:27:28 +0000
4@@ -6498,6 +6498,7 @@
5 gtk_toolbar_style);
6 }
7
8+#ifndef HAVE_WEBKIT2
9 static void
10 midori_browser_toolbar_popup_context_menu_history_cb (GtkMenuItem* menu_item,
11 MidoriBrowser* browser)
12@@ -6506,6 +6507,7 @@
13 MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
14 midori_view_go_back_or_forward (view, steps);
15 }
16+#endif
17
18 static void
19 midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser,

Subscribers

People subscribed via source and target branches

to all changes: