← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/midori-view.c

  • Committer: Rico Tzschichholz
  • Date: 2015-03-23 11:33:24 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: ricotz@ubuntu.com-20150323113324-t79qqqpwgtxzrdsq
Drop support for libsoup-gnome-2.4 < 2.37.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-view.c
27
27
    #include <gcr/gcr.h>
28
28
#endif
29
29
 
30
 
#if !defined (HAVE_WEBKIT2) && defined (HAVE_LIBSOUP_2_34_0)
 
30
#if !defined (HAVE_WEBKIT2)
31
31
SoupMessage*
32
32
midori_map_get_message (SoupMessage* message);
33
33
#endif
478
478
        midori_tab_set_load_status (MIDORI_TAB (view), load_status);
479
479
}
480
480
 
481
 
#ifdef HAVE_LIBSOUP_2_34_0
482
481
/**
483
482
 * midori_view_get_tls_info
484
483
 * @view: a #MidoriView
520
519
    return FALSE;
521
520
    #endif
522
521
}
523
 
#endif
524
522
 
525
523
static gboolean
526
524
midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view,
723
721
    g_object_set (view, "title", NULL, NULL);
724
722
    midori_view_unset_icon (view);
725
723
 
726
 
    #ifdef HAVE_LIBSOUP_2_34_0
727
724
    if (!strncmp (uri, "https", 5))
728
725
    {
729
726
        #ifdef HAVE_WEBKIT2
769
766
        g_free (hostname);
770
767
        #endif
771
768
    }
772
 
    #endif
773
769
    else
774
770
        midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_NONE);
775
771