diff options
| -rw-r--r-- | src/ephy-main.c | 10 | ||||
| -rw-r--r-- | src/ephy-session.c | 16 | ||||
| -rw-r--r-- | src/ephy-session.h | 1 | ||||
| -rw-r--r-- | src/ephy-shell.c | 6 | ||||
| -rw-r--r-- | src/ephy-shell.h | 1 |
5 files changed, 1 insertions, 33 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); diff --git a/src/ephy-session.c b/src/ephy-session.c index 8bbfad49a..a8a97d83e 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -24,7 +24,6 @@ #include "ephy-session.h" #include "ephy-about-handler.h" -#include "ephy-bookmarks-editor.h" #include "ephy-debug.h" #include "ephy-embed-container.h" #include "ephy-embed-utils.h" @@ -246,17 +245,6 @@ session_command_autoresume (EphySession *session, } static void -session_command_open_bookmarks_editor (EphySession *session, - guint32 user_time) -{ - GtkWidget *editor; - - editor = ephy_shell_get_bookmarks_editor (ephy_shell_get_default ()); - - gtk_window_present_with_time (GTK_WINDOW (editor), user_time); -} - -static void session_command_open_uris (EphySession *session, char **uris, const char *options, @@ -357,9 +345,6 @@ session_command_dispatch (EphySession *session) case EPHY_SESSION_CMD_LOAD_SESSION: ephy_session_load (session, cmd->arg, cmd->user_time); break; - case EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR: - session_command_open_bookmarks_editor (session, cmd->user_time); - break; case EPHY_SESSION_CMD_OPEN_URIS: session_command_open_uris (session, cmd->args, cmd->arg, cmd->user_time); break; @@ -1084,7 +1069,6 @@ ephy_session_queue_command (EphySession *session, if ((command == EPHY_SESSION_CMD_LOAD_SESSION && strcmp (cmd->arg, arg) == 0) || - command == EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR || command == EPHY_SESSION_CMD_RESUME_SESSION) { cmd->user_time = user_time; diff --git a/src/ephy-session.h b/src/ephy-session.h index 30363bfe9..89b7316d7 100644 --- a/src/ephy-session.h +++ b/src/ephy-session.h @@ -47,7 +47,6 @@ typedef enum { EPHY_SESSION_CMD_RESUME_SESSION, EPHY_SESSION_CMD_LOAD_SESSION, - EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR, EPHY_SESSION_CMD_OPEN_URIS, EPHY_SESSION_CMD_MAYBE_OPEN_WINDOW, EPHY_SESSION_CMD_MAYBE_OPEN_WINDOW_RESTORE, diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 07075ecbc..7fb19c985 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -130,11 +130,7 @@ queue_commands (EphyShell *shell) EPHY_SESSION_CMD_RESUME_SESSION, NULL, NULL, ctx->user_time, TRUE); - if (ctx->startup_flags & EPHY_STARTUP_BOOKMARKS_EDITOR) - ephy_session_queue_command (session, - EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR, - NULL, NULL, ctx->user_time, FALSE); - else if (ctx->session_filename != NULL) + if (ctx->session_filename != NULL) ephy_session_queue_command (session, EPHY_SESSION_CMD_LOAD_SESSION, (const char *)ctx->session_filename, NULL, diff --git a/src/ephy-shell.h b/src/ephy-shell.h index 4e42d001b..ca1d4e22f 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -110,7 +110,6 @@ typedef enum { typedef enum { EPHY_STARTUP_NEW_TAB = 1 << 0, EPHY_STARTUP_NEW_WINDOW = 1 << 1, - EPHY_STARTUP_BOOKMARKS_EDITOR = 1 << 2 } EphyStartupFlags; typedef struct { |