← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/midori-session.c

  • Committer: Tarmac
  • Author(s): Christian Dywan
  • Date: 2013-06-19 21:00:46 UTC
  • mfrom: (6216.1.10 midori.butcher)
  • Revision ID: tarmac-20130619210046-i3yv8cnkyjuafubb
Bump WebKit requirement to 1.8.3 and drop support for earlier versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-session.c
18
18
 
19
19
#include <glib/gi18n-lib.h>
20
20
 
21
 
#if WEBKIT_CHECK_VERSION (1, 3, 11)
22
21
    #define LIBSOUP_USE_UNSTABLE_REQUEST_API
23
22
    #include <libsoup/soup-cache.h>
24
 
#endif
25
23
 
26
24
static void
27
25
midori_soup_session_set_proxy_uri (SoupSession* session,
209
207
    g_free (certificate_file);
210
208
    #endif
211
209
 
212
 
    #if !WEBKIT_CHECK_VERSION (1, 3, 5)
213
 
    /* See http://stevesouders.com/ua/index.php */
214
 
    g_object_set (session, "max-conns", 60,
215
 
                           "max-conns-per-host", 6,
216
 
                           NULL);
217
 
    #endif
218
 
 
219
210
    g_object_set_data (G_OBJECT (session), "midori-settings", settings);
220
211
    soup_session_settings_notify_http_proxy_cb (settings, NULL, session);
221
212
    g_signal_connect (settings, "notify::http-proxy",
301
292
        }
302
293
    }
303
294
 
304
 
    #if WEBKIT_CHECK_VERSION (1, 3, 11)
305
295
    katze_assign (config_file, g_build_filename (midori_paths_get_cache_dir (), "web", NULL));
306
296
    feature = SOUP_SESSION_FEATURE (soup_cache_new (config_file, 0));
307
297
    soup_session_add_feature (session, feature);
308
298
    soup_cache_set_max_size (SOUP_CACHE (feature),
309
299
        katze_object_get_int (settings, "maximum-cache-size") * 1024 * 1024);
310
300
    soup_cache_load (SOUP_CACHE (feature));
311
 
    #endif
312
301
    g_free (config_file);
313
302
#endif
314
303
    return FALSE;