diff options
author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-13 18:24:56 +0800 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2004-09-13 18:24:56 +0800 |
commit | 2606279995f614634062e0aeb9833c482db5d083 (patch) | |
tree | 625e6ae5d03052e753c3322397b41f4174ca3926 /src/ephy-main.c | |
parent | 79ec35d68d698710604fd4e9682188ae28ba1ae0 (diff) | |
download | gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.gz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.bz2 gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.lz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.xz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.zst gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.zip |
Merging pre-gnome-2-10 branch to HEAD.
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
Merging pre-gnome-2-10 branch to HEAD.
Splitting ChangeLog.
Diffstat (limited to 'src/ephy-main.c')
-rw-r--r-- | src/ephy-main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index ad5e3cb32..e0fedc816 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -44,7 +44,6 @@ static gboolean open_in_existing = FALSE; static gboolean open_in_new_tab = FALSE; static gboolean open_fullscreen = FALSE; static gboolean open_as_bookmarks_editor = FALSE; -static gboolean server_mode = FALSE; static const char *session_filename = NULL; static const char *bookmark_url = NULL; @@ -70,9 +69,6 @@ static struct poptOption popt_options[] = { "bookmarks-editor", 'b', POPT_ARG_NONE, &open_as_bookmarks_editor, 0, N_("Launch the bookmarks editor"), NULL }, - { "server", 's', POPT_ARG_NONE, &server_mode, 0, - N_("Used internally by the bonobo interface"), - NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL } }; @@ -154,10 +150,6 @@ main (int argc, char *argv[]) startup_flags |= EPHY_SHELL_STARTUP_ADD_BOOKMARK; string_arg = bookmark_url; } - else if (server_mode) - { - startup_flags |= EPHY_SHELL_STARTUP_SERVER; - } gnome_vfs_init (); glade_gnome_init (); |