aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-03-04 03:54:36 +0800
committerChristian Persch <chpe@src.gnome.org>2004-03-04 03:54:36 +0800
commita65777247b2c4a412ee1972cab884f462dc19276 (patch)
treeb0dce97cad625aaf16e0da55459d178a579b64de /src
parentade55d6a9658567dcefb18fc0d536a7e3eed0c8c (diff)
downloadgsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.tar
gsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.tar.gz
gsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.tar.bz2
gsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.tar.lz
gsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.tar.xz
gsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.tar.zst
gsoc2013-epiphany-a65777247b2c4a412ee1972cab884f462dc19276.zip
Copy and modify gnome_vfs_uri_list_parse() so that we get a list of string
2004-03-03 Christian Persch <chpe@cvs.gnome.org> * lib/widgets/ephy-node-view.c: (uri_list_parse), (drag_data_received_cb): Copy and modify gnome_vfs_uri_list_parse() so that we get a list of string uris instead of GnomeVFSURIs. Change signature of ::node-dropped accordingly. Fixes bug #120231. * src/bookmarks/ephy-bookmarks-editor.c: (node_dropped_cb): Adapt to the changed ::node-dropped signal signature.
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c6
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c7
2 files changed, 3 insertions, 10 deletions
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 8201a94f8..f9fac1413 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -242,13 +242,9 @@ title_entry_changed_cb (GtkWidget *entry, EphyBookmarkProperties *props)
static void
location_entry_changed_cb (GtkWidget *entry, EphyBookmarkProperties *props)
{
- char *text;
-
- text = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
ephy_bookmarks_set_address (props->priv->bookmarks,
props->priv->bookmark,
- text);
- g_free (text);
+ gtk_entry_get_text (GTK_ENTRY (entry)));
}
static void
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 42b671a04..732467a0a 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1259,15 +1259,12 @@ node_dropped_cb (EphyNodeView *view, EphyNode *node,
for (l = nodes; l != NULL; l = l->next)
{
- GnomeVFSURI *uri = l->data;
- char *url;
+ const char *url = (const char *) l->data;
EphyNode *bmk;
- url = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
bmk = ephy_bookmarks_find_bookmark (editor->priv->bookmarks, url);
- g_free (url);
- if (bmk)
+ if (bmk != NULL)
{
ephy_bookmarks_set_keyword (editor->priv->bookmarks, node, bmk);
}