diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 18 |
2 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2006-02-24 Christian Persch <chpe@cvs.gnome.org> + + * src/bookmarks/ephy-bookmarks-editor.c: (add_bookmarks_source): + + Distinguish different firefox profiles when showing the list to + choose which one to import. + 2006-02-24 Peter Harvey <peter.a.harvey@gmail.com> * src/bookmarks/ephy-bookmark-action.c diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 3158953d1..badf962b8 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -628,7 +628,23 @@ add_bookmarks_source (const char *file, if (strcmp (p, "firefox") == 0) { - description = g_strdup (_("Firefox")); + const char *profile = NULL, *dot; + + if (path[i+1] != NULL) + { + dot = strchr (path[i+1], '.'); + profile = dot ? dot + 1 : path[i+1]; + } + + if (profile != NULL && strcmp (profile, "default") != 0) + { + /* FIXME: proper i18n after freeze */ + description = g_strdup_printf ("%s “%s”", _("Firefox"), profile); + } + else + { + description = g_strdup (_("Firefox")); + } } else if (strcmp (p, ".firefox") == 0) { |