diff options
| author | Xan Lopez <xan@gnome.org> | 2009-12-11 20:01:34 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2009-12-11 20:01:34 +0800 |
| commit | 012be8884f3fb3a618af3d7dfac29ad40de99f1a (patch) | |
| tree | bb5b6f6b3920ca13e992ec3be751beed25fe9282 | |
| parent | 5e0f51772f48a473d3e1fce9757320a15c6d82d5 (diff) | |
| download | gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.tar gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.tar.gz gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.tar.bz2 gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.tar.lz gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.tar.xz gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.tar.zst gsoc2013-epiphany-012be8884f3fb3a618af3d7dfac29ad40de99f1a.zip | |
Remove the 'favicon' signal from EphyWebView
We already have WebKitWebView::icon-loaded, so it's redundant now.
| -rw-r--r-- | embed/ephy-embed.c | 9 | ||||
| -rw-r--r-- | embed/ephy-web-view.c | 19 | ||||
| -rw-r--r-- | embed/ephy-web-view.h | 2 |
3 files changed, 1 insertions, 29 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index fd981ceaf..b839c6baf 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -772,14 +772,6 @@ load_error_cb (WebKitWebView *web_view, } static void -icon_loaded_cb (WebKitWebView *web_view, const char* icon_uri, gpointer *data) -{ - g_signal_emit_by_name (EPHY_WEB_VIEW (web_view), - "favicon", - icon_uri); -} - -static void ephy_embed_constructed (GObject *object) { EphyEmbed *embed = (EphyEmbed*)object; @@ -802,7 +794,6 @@ ephy_embed_constructed (GObject *object) "signal::notify::title", G_CALLBACK (title_changed_cb), embed, "signal::notify::uri", G_CALLBACK (uri_changed_cb), embed, "signal::load-error", G_CALLBACK (load_error_cb), embed, - "signal::icon-loaded", G_CALLBACK (icon_loaded_cb), embed, NULL); embed->priv->inspector_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index 04d317209..0d35810b3 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -694,23 +694,6 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); /** - * EphyWebView::favicon: - * @view: the #EphyWebView that received the signal - * @address: the URL to @embed's web site's favicon - * - * The ::ge_favicon signal is emitted when @embed discovers that a favourite - * icon (favicon) is available for the site it is visiting. - **/ - g_signal_new ("favicon", - EPHY_TYPE_WEB_VIEW, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyWebViewClass, favicon), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, - G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); -/** * EphyWebView::ge-search-link: * @view: the #EphyWebView that received the signal * @type: the mime-type of the search description @@ -1077,7 +1060,7 @@ ephy_web_view_init (EphyWebView *web_view) G_CALLBACK (mime_type_policy_decision_requested_cb), NULL); - g_signal_connect_object (web_view, "favicon", + g_signal_connect_object (web_view, "icon-loaded", G_CALLBACK (favicon_cb), web_view, (GConnectFlags)0); diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h index 8a8185386..0612f48fd 100644 --- a/embed/ephy-web-view.h +++ b/embed/ephy-web-view.h @@ -121,8 +121,6 @@ struct _EphyWebViewClass WebKitWebViewClass parent_class; /* Signals */ - void (* favicon) (EphyWebView *view, - const char *location); void (* feed_link) (EphyWebView *view, const char *type, const char *title, |