← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/midori-view.c

  • Committer: Tarmac
  • Author(s): Christian Dywan
  • Date: 2013-12-09 20:41:11 UTC
  • mfrom: (6509.3.1 midori.trunks)
  • Revision ID: tarmac-20131209204111-w5n01vtgkkze18ta
Drop unused GraniteClutter-based animation support

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-view.c
22
22
 
23
23
#include <config.h>
24
24
 
25
 
#ifdef HAVE_GRANITE
26
 
#include <granite.h>
27
 
#endif
28
 
 
29
25
#ifdef HAVE_GCR
30
26
    #define GCR_API_SUBJECT_TO_CHANGE
31
27
    #include <gcr/gcr.h>
683
679
static void
684
680
midori_view_load_committed (MidoriView* view)
685
681
{
686
 
    #ifdef HAVE_GRANITE_CLUTTER
687
 
    GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
688
 
    granite_widgets_navigation_box_transition_ready (navigation_box);
689
 
    #endif
690
 
 
691
682
    katze_assign (view->icon_uri, NULL);
692
683
 
693
684
    GList* children = gtk_container_get_children (GTK_CONTAINER (view));
3538
3529
    #if GTK_CHECK_VERSION(3, 2, 0)
3539
3530
    view->overlay = gtk_overlay_new ();
3540
3531
    gtk_widget_show (view->overlay);
3541
 
    #ifdef HAVE_GRANITE_CLUTTER
3542
 
    {
3543
 
    GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
3544
 
    granite_widgets_navigation_box_add (navigation_box, GTK_WIDGET (view->scrolled_window));
3545
 
    gtk_widget_show (GTK_WIDGET (view->scrolled_window));
3546
 
    gtk_container_add (GTK_CONTAINER (view->overlay), GTK_WIDGET (navigation_box));
3547
 
    }
3548
 
    #else
3549
3532
    gtk_container_add (GTK_CONTAINER (view->overlay), view->scrolled_window);
3550
 
    #endif
3551
3533
    gtk_box_pack_start (GTK_BOX (view), view->overlay, TRUE, TRUE, 0);
3552
3534
 
3553
3535
    /* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */
4619
4601
{
4620
4602
    g_return_if_fail (MIDORI_IS_VIEW (view));
4621
4603
 
4622
 
    #ifdef HAVE_GRANITE_CLUTTER
4623
 
    GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
4624
 
    granite_widgets_navigation_box_back (navigation_box);
4625
 
    #endif
4626
 
 
4627
4604
    webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view));
4628
4605
    /* Force the speed dial to kick in if going back to a blank page */
4629
4606
    if (midori_view_is_blank (view))