Midori Web Browser

Merge lp:~midori/midori/fixGcrGuards into lp:midori

  1. fixGcrGuards
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6937
Merged at revision: 6938
Proposed branch: lp:~midori/midori/fixGcrGuards
Merge into: lp:midori
Diff against target: 22 lines (+3/-1)
1 file modified
midori/midori-locationaction.c (+3/-1)
To merge this branch: bzr merge lp:~midori/midori/fixGcrGuards
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+256753@code.launchpad.net

Commit message

Fix HAVE_GCR guards after GtkPopover port

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-locationaction.c'
2--- midori/midori-locationaction.c 2015-04-18 18:21:51 +0000
3+++ midori/midori-locationaction.c 2015-04-19 14:46:34 +0000
4@@ -1367,7 +1367,6 @@
5 }
6 gtk_widget_hide (dialog);
7 }
8-#endif
9
10 #if GTK_CHECK_VERSION (3, 12, 0)
11 static void
12@@ -1387,7 +1386,10 @@
13 g_assert_not_reached ();
14 midori_location_action_cert_response_cb (dialog, response, gcr_cert);
15 }
16+#endif
17+#endif
18
19+#if GTK_CHECK_VERSION (3, 12, 0)
20 static gboolean
21 midori_location_action_popover_button_press_event_cb (GtkWidget* widget,
22 GdkEventButton* event,

Subscribers

People subscribed via source and target branches

to all changes: