Add a title param to dnd iterator and remove unused screen location

2003-10-30  Marco Pesenti Gritti  <marco@gnome.org>

        * lib/ephy-dnd.c: (add_one_netscape_url), (add_one_uri),
        (add_one_topic):
        * lib/ephy-dnd.h:
        * lib/widgets/ephy-tree-model-sort.c:
        (each_property_get_data_binder):
        * src/ephy-favicon-action.c: (each_url_get_data_binder):

        Add a title param to dnd iterator and remove unused screen
        location params.

5 files changed, 25 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ed450c41..5345a0861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-30  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* lib/ephy-dnd.c: (add_one_netscape_url), (add_one_uri),
+	(add_one_topic):
+	* lib/ephy-dnd.h:
+	* lib/widgets/ephy-tree-model-sort.c:
+	(each_property_get_data_binder):
+	* src/ephy-favicon-action.c: (each_url_get_data_binder):
+
+	Add a title param to dnd iterator and remove unused screen
+	location params.
+
 2003-10-29  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/ephy-history.c: (ephy_history_add_host),
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index a9e4b0c33..857dd26df 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -31,18 +31,24 @@
  * GMC also fails to do this as well.
  */
 static void
-add_one_netscape_url (const char *url, int x, int y, int w, int h, gpointer data)
+add_one_netscape_url (const char *url, const char *title, gpointer data)
 {
         GString *result;
 
         result = (GString *) data;
-        if (result->len == 0) {
+        if (result->len == 0)
+	{
                 g_string_append (result, url);
+		if (title)
+		{
+			g_string_append (result, "\n");
+	                g_string_append (result, title);
+		}
         }
 }
 
 static void
-add_one_uri (const char *uri, int x, int y, int w, int h, gpointer data)
+add_one_uri (const char *uri, const char *title, gpointer data)
 {
         GString *result;
 
@@ -53,7 +59,7 @@ add_one_uri (const char *uri, int x, int y, int w, int h, gpointer data)
 }
 
 static void
-add_one_topic (const char *uri, int x, int y, int w, int h, gpointer data)
+add_one_topic (const char *uri, const char *title, gpointer data)
 {
         GString *result;
 
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index 8f6a16a51..d65d2fd3c 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 #define EPHY_DND_TOPIC_TYPE		"ephy_topic_node"
 
 typedef void (* EphyDragEachSelectedItemDataGet)    (const char *url,
-                                                     int x, int y, int w, int h,
+                                                     const char *title,
                                                      gpointer data);
 
 typedef void (* EphyDragEachSelectedItemIterator)   (EphyDragEachSelectedItemDataGet iteratee,
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index 40c519aa2..97e276150 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -188,7 +188,7 @@ each_property_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
 
 		LOG ("Data get %s", svalue)
 
-		iteratee (svalue, -1, -1, -1, -1, data);
+		iteratee (svalue, NULL, data);
 
 		gtk_tree_path_free (path);
 		g_value_unset (&value);
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index 9e68af1f3..e3c39ac0c 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -94,7 +94,6 @@ each_url_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
 {
 	const char *title;
 	char *location;
-	char *netscape_url;
 	EphyTab *tab;
 	EphyEmbed *embed;
 	EphyWindow *window = EPHY_WINDOW(iterator_context);
@@ -104,11 +103,8 @@ each_url_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
 	ephy_embed_get_location (embed, TRUE, &location);
 	title = ephy_tab_get_title (tab);
 
-	netscape_url = g_strconcat (location, "\n", title, NULL);
+	iteratee (location, title, data);
 
-	iteratee (netscape_url, -1, -1, -1, -1, data);
-
-	g_free (netscape_url);
 	g_free (location);
 }