diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/ephy-dnd.c | 14 | ||||
| -rw-r--r-- | lib/ephy-dnd.h | 2 | ||||
| -rw-r--r-- | lib/widgets/ephy-tree-model-sort.c | 2 | ||||
| -rw-r--r-- | src/ephy-favicon-action.c | 8 |
5 files changed, 27 insertions, 11 deletions
@@ -1,3 +1,15 @@ +2003-12-15 Christian Persch <chpe@cvs.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. (Backported from HEAD.) + 2003-12-14 Christian Persch <chpe@cvs.gnome.org> * src/ephy-nautilus-view.c: (ephy_nautilus_view_finalize), 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 14096989b..7ba0934f4 100644 --- a/lib/widgets/ephy-tree-model-sort.c +++ b/lib/widgets/ephy-tree-model-sort.c @@ -190,7 +190,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 bf1d96d36..d1a4c597e 100644 --- a/src/ephy-favicon-action.c +++ b/src/ephy-favicon-action.c @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #include "ephy-favicon-action.h" @@ -87,7 +89,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); @@ -97,11 +98,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 (netscape_url, -1, -1, -1, -1, data); + iteratee (location, title, data); - g_free (netscape_url); g_free (location); } |