diff options
| author | Mario Sanchez Prada <msanchez@igalia.com> | 2012-10-10 00:01:18 +0800 |
|---|---|---|
| committer | Mario Sanchez Prada <msanchez@igalia.com> | 2012-10-10 00:01:18 +0800 |
| commit | 7946860578c2e1c80b87f3f9493e54c7763dfc06 (patch) | |
| tree | 22bbac0fac7c510abb4a94159c0872afcfd8bef3 | |
| parent | 0a18bf3d03cd78172dbcd87cb8755aeb395edce7 (diff) | |
| download | gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.tar gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.tar.gz gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.tar.bz2 gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.tar.lz gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.tar.xz gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.tar.zst gsoc2013-epiphany-7946860578c2e1c80b87f3f9493e54c7763dfc06.zip | |
Avoid a crash in EphyBookmarksEditor when using WebKit2.
Still need to figure out a way to port this to the new WebKit2GTK+ favicons API.
https://bugzilla.gnome.org/show_bug.cgi?id=679370
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 8ffd89dcb..8dc057b1e 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -1495,9 +1495,6 @@ icon_loaded_cb (WebKitFaviconDatabase *database, GAsyncResult *result, GtkTreeRo static void provide_favicon (EphyNode *node, GValue *value, gpointer user_data) { -#ifdef HAVE_WEBKIT2 - /* TODO: Favicons */ -#else const char *page_location; GdkPixbuf *favicon = NULL; @@ -1506,6 +1503,9 @@ provide_favicon (EphyNode *node, GValue *value, gpointer user_data) LOG ("Get favicon for %s", page_location ? page_location : "None"); +#ifdef HAVE_WEBKIT2 + /* TODO: Favicons */ +#else if (page_location) { WebKitFaviconDatabase *database = webkit_get_favicon_database (); @@ -1533,10 +1533,9 @@ provide_favicon (EphyNode *node, GValue *value, gpointer user_data) } } } - +#endif g_value_init (value, GDK_TYPE_PIXBUF); g_value_take_object (value, favicon); -#endif } static void |