← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to katze/katze-item.c

  • Committer: Christian Dywan
  • Date: 2013-06-19 20:27:53 UTC
  • mto: This revision was merged to the branch mainline in revision 6220.
  • Revision ID: christian.dywan@canonical.com-20130619202753-mzmahpq29x0xl3om
Drop unneeded WebKit < 1.8 version guards

Show diffs side-by-side

added added

removed removed

Lines of Context:
katze/katze-item.c
458
458
katze_item_image_destroyed_cb (GtkWidget* image,
459
459
                               KatzeItem* item);
460
460
#ifndef HAVE_WEBKIT2
461
 
#if WEBKIT_CHECK_VERSION (1, 8, 0)
462
461
static void
463
462
katze_item_icon_loaded_cb (WebKitFaviconDatabase* database,
464
463
                           const gchar*           frame_uri,
477
476
    }
478
477
}
479
478
#endif
480
 
#endif
481
479
 
482
480
static void
483
481
katze_item_image_destroyed_cb (GtkWidget* image,
484
482
                               KatzeItem* item)
485
483
{
486
484
#ifndef HAVE_WEBKIT2
487
 
    #if WEBKIT_CHECK_VERSION (1, 8, 0)
488
485
    g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
489
486
        katze_item_icon_loaded_cb, image);
490
 
    #endif
491
487
#endif
492
488
    g_object_unref (item);
493
489
}
524
520
    g_signal_connect (image, "destroy",
525
521
        G_CALLBACK (katze_item_image_destroyed_cb), item);
526
522
#ifndef HAVE_WEBKIT2
527
 
    #if WEBKIT_CHECK_VERSION (1, 8, 0)
528
523
    g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
529
524
        G_CALLBACK (katze_item_icon_loaded_cb), image);
530
 
    #endif
531
525
#endif
532
526
    return image;
533
527
}