← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to katze/katze-item.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:
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, 3, 13)
462
461
static void
463
 
#if WEBKIT_CHECK_VERSION (1, 8, 0)
464
462
katze_item_icon_loaded_cb (WebKitFaviconDatabase* database,
465
 
#elif WEBKIT_CHECK_VERSION (1, 3, 13)
466
 
katze_item_icon_loaded_cb (WebKitIconDatabase*    database,
467
 
                           WebKitWebFrame*        web_frame,
468
 
#endif
469
463
                           const gchar*           frame_uri,
470
464
                           GtkWidget*             image)
471
465
{
482
476
    }
483
477
}
484
478
#endif
485
 
#endif
486
479
 
487
480
static void
488
481
katze_item_image_destroyed_cb (GtkWidget* image,
489
482
                               KatzeItem* item)
490
483
{
491
484
#ifndef HAVE_WEBKIT2
492
 
    #if WEBKIT_CHECK_VERSION (1, 8, 0)
493
485
    g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
494
486
        katze_item_icon_loaded_cb, image);
495
 
    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
496
 
    g_signal_handlers_disconnect_by_func (webkit_get_icon_database (),
497
 
        katze_item_icon_loaded_cb, image);
498
 
    #endif
499
487
#endif
500
488
    g_object_unref (item);
501
489
}
532
520
    g_signal_connect (image, "destroy",
533
521
        G_CALLBACK (katze_item_image_destroyed_cb), item);
534
522
#ifndef HAVE_WEBKIT2
535
 
    #if WEBKIT_CHECK_VERSION (1, 8, 0)
536
523
    g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
537
524
        G_CALLBACK (katze_item_icon_loaded_cb), image);
538
 
    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
539
 
    g_signal_connect (webkit_get_icon_database (), "icon-loaded",
540
 
        G_CALLBACK (katze_item_icon_loaded_cb), image);
541
 
    #endif
542
525
#endif
543
526
    return image;
544
527
}