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

[Paweł Forysiuk]

Clean small leftovers from GTK and WebKit version bumps

[André Stösel (ivaldi)]

Looks good to me!

review: Approve

=== modified file 'extensions/cookie-permissions/cookie-permission-manager.c'
--- extensions/cookie-permissions/cookie-permission-manager.c	2013-03-28 17:27:56 +0000
+++ extensions/cookie-permissions/cookie-permission-manager.c	2013-06-22 19:58:24 +0000
@@ -540,11 +540,7 @@
 /* FIXME: Find a way to add "details" widget */
 #ifndef NO_INFOBAR_DETAILS
 	/* Get content area of infobar */
-#if HAVE_GTK_INFO_BAR
 	contentArea=gtk_info_bar_get_content_area(GTK_INFO_BAR(infobar));
-#else
-	contentArea=infobar;
-#endif
 
 	/* Create list and set up columns of list */
 	list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(listStore));
 
=== modified file 'wscript'
--- wscript	2013-06-20 21:11:52 +0000
+++ wscript	2013-06-22 19:58:24 +0000
@@ -291,13 +291,6 @@
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
         conf.define ('HAVE_LIBSOUP_2_37_1', 1)
 
-    if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 8):
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_8')
-    if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 13):
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_13')
-    if check_version (conf.env['WEBKIT_VERSION'], 1, 8, 0):
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_8_0')
-
     check_pkg ('libxml-2.0', '2.6')
     conf.undefine ('LIBXML_VERSION') # Defined in xmlversion.h
     check_pkg ('sqlite3', '3.6.19', var='SQLITE')