aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-04-24 20:39:12 +0800
committerChristian Persch <chpe@src.gnome.org>2005-04-24 20:39:12 +0800
commitdbf352aded24013b511267d19c82fa017846ea73 (patch)
tree1d0ddd37a115736d90541a1a8cffb90838a0024d
parent0321e0c109de8225a82868cb1dc8cfb5455a544f (diff)
downloadgsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.tar
gsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.tar.gz
gsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.tar.bz2
gsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.tar.lz
gsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.tar.xz
gsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.tar.zst
gsoc2013-epiphany-dbf352aded24013b511267d19c82fa017846ea73.zip
Replaces all %s in smartbookmarks. Fixes bug #167319, patch by Raphael
2005-04-24 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_solve_smart_url): Replaces all %s in smartbookmarks. Fixes bug #167319, patch by Raphael Slinckx.
-rw-r--r--ChangeLog7
-rw-r--r--src/bookmarks/ephy-bookmarks.c12
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 60fc692ad..4b6f7567b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-24 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_solve_smart_url):
+
+ Replaces all %s in smartbookmarks. Fixes bug #167319, patch by
+ Raphael Slinckx.
+
2005-04-19 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/egg-editable-toolbar.c: (create_dock):
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 9129181e2..25045438d 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -1238,11 +1238,13 @@ ephy_bookmarks_solve_smart_url (EphyBookmarks *eb,
escaped_arg = gnome_vfs_escape_string (arg);
t1 = smarturl_only;
- t2 = strstr (t1, "%s");
- g_return_val_if_fail (t2 != NULL, NULL);
- g_string_append_len (s, t1, t2 - t1);
- g_string_append (s, escaped_arg);
- t1 = t2 + 2;
+ while ((t2 = strstr (t1, "%s")) != NULL)
+ {
+ g_string_append_len (s, t1, t2 - t1);
+ g_string_append (s, escaped_arg);
+ t1 = t2 + 2;
+ }
+
g_string_append (s, t1);
ret = g_string_free (s, FALSE);