Midori Web Browser

Merge lp:~tuxator/midori/version-bump-cleanup into lp:midori

  1. version-bump-cleanup
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: André Stösel
Approved revision: 6229
Merged at revision: 6229
Proposed branch: lp:~tuxator/midori/version-bump-cleanup
Merge into: lp:midori
Diff against target: 33 lines (+0/-11)
2 files modified
extensions/cookie-permissions/cookie-permission-manager.c (+0/-4)
wscript (+0/-7)
To merge this branch: bzr merge lp:~tuxator/midori/version-bump-cleanup
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+170963@code.launchpad.net

Commit message

Clean small leftovers from GTK and WebKit version bumps

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

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/cookie-permissions/cookie-permission-manager.c'
2--- extensions/cookie-permissions/cookie-permission-manager.c 2013-03-28 17:27:56 +0000
3+++ extensions/cookie-permissions/cookie-permission-manager.c 2013-06-22 19:58:24 +0000
4@@ -540,11 +540,7 @@
5 /* FIXME: Find a way to add "details" widget */
6 #ifndef NO_INFOBAR_DETAILS
7 /* Get content area of infobar */
8-#if HAVE_GTK_INFO_BAR
9 contentArea=gtk_info_bar_get_content_area(GTK_INFO_BAR(infobar));
10-#else
11- contentArea=infobar;
12-#endif
13
14 /* Create list and set up columns of list */
15 list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(listStore));
16
17=== modified file 'wscript'
18--- wscript 2013-06-20 21:11:52 +0000
19+++ wscript 2013-06-22 19:58:24 +0000
20@@ -291,13 +291,6 @@
21 if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
22 conf.define ('HAVE_LIBSOUP_2_37_1', 1)
23
24- if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 8):
25- conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_8')
26- if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 13):
27- conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_13')
28- if check_version (conf.env['WEBKIT_VERSION'], 1, 8, 0):
29- conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_8_0')
30-
31 check_pkg ('libxml-2.0', '2.6')
32 conf.undefine ('LIBXML_VERSION') # Defined in xmlversion.h
33 check_pkg ('sqlite3', '3.6.19', var='SQLITE')

Subscribers

People subscribed via source and target branches

to all changes: