diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2012-05-06 22:47:19 +0800 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2012-06-21 19:54:16 +0800 |
| commit | 97c91b2fc2059b1e358bb19896203afaa44bfd33 (patch) | |
| tree | 6aa01250a99fa884d177ce3202d8ff41e8e96d74 /src/bookmarks/ephy-bookmarks.c | |
| parent | a8767266443074689200fff9ca43531d88d65aed (diff) | |
| download | gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.gz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.bz2 gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.lz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.xz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.zst gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.zip | |
Initial WebKit2 port
It builds and basic functionality works.
Diffstat (limited to 'src/bookmarks/ephy-bookmarks.c')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index f2a5ea677..764032b1a 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -247,6 +247,9 @@ ephy_bookmarks_save_delayed (EphyBookmarks *bookmarks, int delay) } } +#ifdef HAVE_WEBKIT2 +/* TODO: Favicons */ +#else static void icon_updated_cb (WebKitFaviconDatabase *favicon_database, const char *address, @@ -258,15 +261,20 @@ icon_updated_cb (WebKitFaviconDatabase *favicon_database, ephy_bookmarks_set_icon (eb, address, icon); g_free (icon); } +#endif static void ephy_setup_history_notifiers (EphyBookmarks *eb) { +#ifdef HAVE_WEBKIT2 + /* TODO: Favicons */ +#else WebKitFaviconDatabase *favicon_database; favicon_database = webkit_get_favicon_database (); g_signal_connect (favicon_database, "icon-loaded", G_CALLBACK (icon_updated_cb), eb); +#endif } static void @@ -1166,7 +1174,11 @@ ephy_bookmarks_add (EphyBookmarks *eb, const char *url) { EphyNode *bm; +#ifdef HAVE_WEBKIT2 + /* TODO: Favicons */ +#else WebKitFaviconDatabase *favicon_database; +#endif bm = ephy_node_new (eb->priv->db); @@ -1181,7 +1193,9 @@ ephy_bookmarks_add (EphyBookmarks *eb, } ephy_node_set_property_string (bm, EPHY_NODE_BMK_PROP_TITLE, title); - +#ifdef HAVE_WEBKIT2 + /* TODO: Favicons */ +#else favicon_database = webkit_get_favicon_database (); if (favicon_database != NULL) { @@ -1193,6 +1207,7 @@ ephy_bookmarks_add (EphyBookmarks *eb, g_free (icon); } } +#endif update_has_smart_address (eb, bm, url); update_bookmark_keywords (eb, bm); |