[epiphany/overview] ephy-window: sync icon and address taking into account the overview

[Claudio Saavedra <csaavedra src gnome org>]

commit 303b0f11ad25e579b574e33236afcbbe9c21ec46
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Mon Aug 20 18:36:11 2012 +0300

    ephy-window: sync icon and address taking into account the overview

 src/ephy-window.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1448647..749b58d 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1550,7 +1550,8 @@ sync_tab_icon (EphyWebView *view,
 
 	if (priv->closing) return;
 
-	icon = ephy_web_view_get_icon (view);
+	icon = ephy_embed_get_overview_mode (EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (view)) ?
+		NULL : ephy_web_view_get_icon (view);
 
 	_ephy_window_action_set_favicon (window, icon);
 }
@@ -1673,7 +1674,7 @@ sync_tab_popups_allowed (EphyWebView *view,
 }
 
 static void
-sync_tab_title (EphyWebView *view,
+sync_tab_title (EphyEmbed *embed,
 		GParamSpec *pspec,
 		EphyWindow *window)
 {
@@ -1682,7 +1683,7 @@ sync_tab_title (EphyWebView *view,
 	if (priv->closing) return;
 
 	gtk_window_set_title (GTK_WINDOW(window),
-			      ephy_web_view_get_title_composite (view));
+			      ephy_embed_get_title (embed));
 }
 
 static void
@@ -2500,7 +2501,7 @@ ephy_window_connect_active_embed (EphyWindow *window)
 	sync_tab_load_status	(view, NULL, window);
 	sync_tab_is_blank	(view, NULL, window);
 	sync_tab_navigation	(view, NULL, window);
-	sync_tab_title		(view, NULL, window);
+	sync_tab_title		(embed, NULL, window);
 	sync_tab_address	(view, NULL, window);
 	sync_tab_icon		(view, NULL, window);
 	sync_tab_popup_windows	(view, NULL, window);
@@ -2548,7 +2549,7 @@ ephy_window_connect_active_embed (EphyWindow *window)
 	g_signal_connect_object (view, "notify::popups-allowed",
 				 G_CALLBACK (sync_tab_popups_allowed),
 				 window, 0);
-	g_signal_connect_object (view, "notify::embed-title",
+	g_signal_connect_object (embed, "notify::title",
 				 G_CALLBACK (sync_tab_title),
 				 window, 0);
 	g_signal_connect_object (view, "notify::address",
@@ -2656,7 +2657,7 @@ ephy_window_disconnect_active_embed (EphyWindow *window)
 	g_signal_handlers_disconnect_by_func (view,
 					      G_CALLBACK (sync_tab_navigation),
 					      window);
-	g_signal_handlers_disconnect_by_func (view,
+	g_signal_handlers_disconnect_by_func (embed,
 					      G_CALLBACK (sync_tab_title),
 					      window);
 	g_signal_handlers_disconnect_by_func (view,