diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c8894832..25ae3a36 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,10 +20,7 @@ #include #include - -#if HAVE_LIBSOUP - #include -#endif +#include struct _MidoriPreferences { @@ -244,7 +241,6 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); } -#if HAVE_LIBSOUP static void midori_preferences_notify_auto_detect_proxy_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -265,7 +261,6 @@ midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, identify_as == MIDORI_IDENT_CUSTOM); } -#endif #if HAVE_OSX static void @@ -332,11 +327,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; - #if HAVE_LIBSOUP - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - GObjectClass* webkit_class; - #endif - #endif g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -583,15 +573,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ - #if HAVE_LIBSOUP - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); - if (g_object_class_find_property (webkit_class, "session") || - /* If a cookie jar was created, WebKit is using Soup */ - g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar"))) - { - #endif PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); TABLE_NEW (5, 2); @@ -623,21 +604,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 4, 5); - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - } - #endif - #endif /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); - #if HAVE_LIBSOUP_2_25_2 - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - if (g_object_class_find_property (webkit_class, "session") || - /* If a cookie jar was created, WebKit is using Soup */ - g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar"))) - { - #endif FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); @@ -654,10 +623,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 2, 3); - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - } - #endif - #endif FRAME_NEW (_("History")); TABLE_NEW (3, 2); button = katze_property_proxy (settings, "remember-last-visited-pages", NULL);