diff options
author | Xan Lopez <xan@igalia.com> | 2012-12-10 19:06:14 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-12-10 19:06:14 +0800 |
commit | c6252fe89f3c12604f8e71c2cb748e03a5d458fc (patch) | |
tree | 0bb47b2df31d62447ac1215d921bc29d82c6d026 /src/ephy-main.c | |
parent | fe170e228b9d8198a78a19acf21dd9ac3cb8416a (diff) | |
download | gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.tar gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.tar.gz gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.tar.bz2 gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.tar.lz gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.tar.xz gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.tar.zst gsoc2013-epiphany-c6252fe89f3c12604f8e71c2cb748e03a5d458fc.zip |
Remove option to launch Web as the bookmarks editor
That thing is on its way out.
Diffstat (limited to 'src/ephy-main.c')
-rw-r--r-- | src/ephy-main.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index 28521d82b..1281b1db6 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -47,7 +47,6 @@ static GQuark startup_error_quark = 0; static gboolean open_in_new_tab = FALSE; static gboolean open_in_new_window = FALSE; -static gboolean open_as_bookmarks_editor = FALSE; static char *session_filename = NULL; static char *bookmark_url = NULL; @@ -79,8 +78,6 @@ static const GOptionEntry option_entries[] = N_("Open a new tab in an existing browser window"), NULL }, { "new-window", 0, 0, G_OPTION_ARG_NONE, &open_in_new_window, N_("Open a new browser window"), NULL }, - { "bookmarks-editor", 'b', 0, G_OPTION_ARG_NONE, &open_as_bookmarks_editor, - N_("Launch the bookmarks editor"), NULL }, { "import-bookmarks", '\0', 0, G_OPTION_ARG_FILENAME, &bookmarks_file, N_("Import bookmarks from the given file"), N_("FILE") }, { "load-session", 'l', 0, G_OPTION_ARG_FILENAME, &session_filename, @@ -222,8 +219,6 @@ get_startup_flags (void) flags |= EPHY_STARTUP_NEW_TAB; if (open_in_new_window) flags |= EPHY_STARTUP_NEW_WINDOW; - if (open_as_bookmarks_editor) - flags |= EPHY_STARTUP_BOOKMARKS_EDITOR; return flags; } @@ -352,11 +347,6 @@ main (int argc, exit (1); } - if (arguments != NULL && (session_filename != NULL || open_as_bookmarks_editor)) { - g_print ("Cannot use --bookmarks-editor or --load-session with URL arguments \n"); - exit (1); - } - if (private_instance == TRUE && application_mode == TRUE) { g_print ("Cannot use --private-instance and --application-mode at the same time\n"); exit (1); |