From 5c52e5cb627ba9ac59a87ec5093e986fe4b6531b Mon Sep 17 00:00:00 2001 From: Daniel Carl Date: Fri, 27 Sep 2013 01:54:23 +0200 Subject: [PATCH] Removed announcement about changed history file format. --- src/config.def.h | 35 ----------------------------------- src/main.c | 4 ---- 2 files changed, 39 deletions(-) diff --git a/src/config.def.h b/src/config.def.h index ccfaa68..0719fa7 100644 --- a/src/config.def.h +++ b/src/config.def.h @@ -44,39 +44,4 @@ /* template to run shell command for vimb command :shellcmd */ #define SHELL_CMD "/bin/sh -c '%s'" -/* remove next line if the bookmark file fits to the new format "URLtitle of pagetag1 tag2" */ -#define SHOW_ANNOUNCEMENT - -#define ANNOUNCEMENT "\ - \ -Bookmark file format changed \ - \ - \ - \ -

Bookmark file format changed

\ -

The history file and bookmarks file will now holds also the page titles to serve them in the completion list. This will break previous bookmark files.

\ -

The parts of the history and bookmark file are now separated by \\t char like the cookie file.

\ -

 \
-// old format
 \
-http://very-long.uri/path.html tag1 tag2
 \
-http://very-long.uri/path-no-tags.html
 \
-

\ -

 \
-// new format
 \
-http://very-long.uri/path.html\\ttitle of the page\\ttag1 tag2
 \
-http://very-long.uri/path-no-title.html\\t\\ttag1 tag2
 \
-http://very-long.uri/path-no-title-and-no-tags.html
 \
-

\ -

What to do?

\ -

\ -If you have no entries in you bookmark you must edit them to fit the new format. This can be done with following 'sed' command.

\ -

Don't forget to backup the bookmark file before running the command.

\ -

 \
-// replace the first space in earch line of file to \\t\\t if the line haven't already a \t in it.
 \
-sed -i -e '/\\t/!{s/ /\\t\\t/}' bookmark
 \
-

\ -

If you had no entries in the bookmark file or you changed it successfully, you should remove the '#define SHOW_ANNOUNCEMENT' from config.h file and recompile vimb.

\ - \ -" - #endif /* end of include guard: _CONFIG_H */ diff --git a/src/main.c b/src/main.c index b245eaa..ec7cbc4 100644 --- a/src/main.c +++ b/src/main.c @@ -1035,12 +1035,8 @@ int main(int argc, char *argv[]) init_core(); -#if defined(ANNOUNCEMENT) && defined(SHOW_ANNOUNCEMENT) - webkit_web_view_load_string(vb.gui.webview, ANNOUNCEMENT, "text/html", NULL, NULL); -#else /* command line argument: URL */ vb_load_uri(&(Arg){VB_TARGET_CURRENT, argc > 1 ? argv[argc - 1] : vb.config.home_page}); -#endif /* Run the main GTK+ event loop */ gtk_main(); -- 2.20.1