Midori Web Browser

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

  1. wk2feedpanelwarn
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 6307
Merged at revision: 6316
Proposed branch: lp:~kalikiana/midori/wk2feedpanelwarn
Merge into: lp:midori
Diff against target: 35 lines (+2/-2)
1 file modified
extensions/feed-panel/katze-net.c (+2/-2)
To merge this branch: bzr merge lp:~kalikiana/midori/wk2feedpanelwarn
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+178354@code.launchpad.net

Commit message

Move #ifndef HAVE_WEBKIT2 to fix feed panel warnings

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/feed-panel/katze-net.c'
2--- extensions/feed-panel/katze-net.c 2013-07-27 12:35:55 +0000
3+++ extensions/feed-panel/katze-net.c 2013-08-02 18:05:31 +0000
4@@ -66,6 +66,7 @@
5 KatzeNetRequest* request;
6 } KatzeNetPriv;
7
8+#ifndef HAVE_WEBKIT2
9 static void
10 katze_net_priv_free (KatzeNetPriv* priv)
11 {
12@@ -85,7 +86,6 @@
13 katze_net_got_headers_cb (SoupMessage* msg,
14 KatzeNetPriv* priv)
15 {
16-#ifndef HAVE_WEBKIT2
17 KatzeNetRequest* request = priv->request;
18
19 switch (msg->status_code)
20@@ -106,7 +106,6 @@
21 g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv);
22 soup_session_cancel_message (webkit_get_default_session (), msg, 1);
23 }
24-#endif
25 }
26
27 static void
28@@ -144,6 +143,7 @@
29 katze_net_priv_free (priv);
30 return FALSE;
31 }
32+#endif
33
34 /**
35 * katze_net_load_uri:

Subscribers

People subscribed via source and target branches

to all changes: