Fix callbacks for new signature of ge_location embed signal.

2003-06-29  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-nautilus-view.c: (gnv_embed_location_cb):
	* src/ephy-tab.c: (ephy_tab_address_cb):
	* embed/find-dialog.c: (sync_page_change):

	Fix callbacks for new signature of ge_location embed signal.

	* src/ephy-tab.c: (ephy_tab_icon_cache_changed_cb):

	Fix logic to update the site icon.

4 files changed, 24 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index be5b31337..5431e7f48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-29  Christian Persch  <chpe@cvs.gnome.org>
+
+	* src/ephy-nautilus-view.c: (gnv_embed_location_cb):
+	* src/ephy-tab.c: (ephy_tab_address_cb):
+	* embed/find-dialog.c: (sync_page_change):
+
+	Fix callbacks for new signature of ge_location embed signal.
+
+	* src/ephy-tab.c: (ephy_tab_icon_cache_changed_cb):
+
+	Fix logic to update the site icon.
+
 2003-06-29  Marco Pesenti Gritti  <marco@it.gnome.org>
 
 	* lib/egg/egg-action.c: (egg_action_init), (egg_action_finalize),
diff --git a/embed/find-dialog.c b/embed/find-dialog.c
index b46930e98..058197204 100755
--- a/embed/find-dialog.c
+++ b/embed/find-dialog.c
@@ -206,7 +206,7 @@ ensure_constructed (FindDialog *dialog)
 }
 
 static void
-sync_page_change (EphyEmbed *embed, FindDialog *dialog)
+sync_page_change (EphyEmbed *embed, const char *address, FindDialog *dialog)
 {
 	g_return_if_fail (IS_EPHY_EMBED (embed));
 
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index ee0e78cfe..b6dfa9d86 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2001, 2002 Ricardo Fernández Pascual
+ *  Copyright (C) 2001, 2002 Ricardo Fernández Pascual
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,7 +32,8 @@
 #include "ephy-zoom.h"
 #include "ephy-debug.h"
 
-static void		gnv_embed_location_cb 			(EphyEmbed *embed, 
+static void		gnv_embed_location_cb 			(EphyEmbed *embed,
+								 const char *new_uri,
 								 EphyNautilusView *view);
 static void		gnv_embed_title_cb 			(EphyEmbed *embed, 
 								 EphyNautilusView *view);
@@ -334,33 +335,25 @@ gnv_embed_link_message_cb (EphyEmbed *embed, const char *message, EphyNautilusVi
 }
 
 static void
-gnv_embed_location_cb (EphyEmbed *embed, EphyNautilusView *view)
+gnv_embed_location_cb (EphyEmbed *embed, const char *new_uri, EphyNautilusView *view)
 {
-	EphyNautilusViewPrivate *p;
-	const gchar *prefixes_to_ignore[] = 
+	const char *prefixes_to_ignore[] = 
 		{
 			"about:",
 			"javascript:",
 			NULL 
 		};
 	int i = 0;
-	gchar *new_uri;
 
  	g_return_if_fail (EPHY_IS_NAUTILUS_VIEW (view));
-	p = view->priv;
 	g_return_if_fail (view->priv->embed == embed);
-
-	ephy_embed_get_location (embed, TRUE, &new_uri);
-
  	g_return_if_fail (new_uri != NULL);
 
-
 	/* don't inform nautilus about uris that it can't understand */
 	while (prefixes_to_ignore[i] != NULL)
 	{
-		if (!strncmp (prefixes_to_ignore[i], new_uri, strlen (prefixes_to_ignore[i])))
+		if (strncmp (prefixes_to_ignore[i], new_uri, strlen (prefixes_to_ignore[i])) == 0)
 		{
-			g_free (new_uri);
 			return;
 		}
 		++i;
@@ -368,8 +361,8 @@ gnv_embed_location_cb (EphyEmbed *embed, EphyNautilusView *view)
 
 	nautilus_view_report_location_change (NAUTILUS_VIEW (view), new_uri, NULL, new_uri);
 
-	g_free (p->location);
-	p->location = new_uri;
+	g_free (view->priv->location);
+	view->priv->location = g_strdup (new_uri);
 }
 
 static void
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 2db9f5871..273f8440c 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -502,7 +502,7 @@ ephy_tab_icon_cache_changed_cb (EphyFaviconCache *cache,
 
 	/* is this for us? */
 	if (tab->priv->icon_address != NULL &&
-	    strcmp (tab->priv->icon_address, address) != 0)
+	    strcmp (tab->priv->icon_address, address) == 0)
 	{
 		/* notify */
 		g_object_notify (G_OBJECT (tab), "icon");
@@ -555,14 +555,14 @@ ephy_tab_favicon_cb (EphyEmbed *embed,
 
 static void
 ephy_tab_link_message_cb (EphyEmbed *embed,
-			  const gchar *message,
+			  const char *message,
 			  EphyTab *tab)
 {
 	ephy_tab_set_link_message (tab, message);
 }
 
 static void
-ephy_tab_address_cb (EphyEmbed *embed, char *address, EphyTab *tab)
+ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
 {
 	if (tab->priv->address_expire == TAB_ADDRESS_EXPIRE_NOW)
 	{