diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 12 |
2 files changed, 14 insertions, 5 deletions
@@ -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); |