diff options
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/shell/main.c b/shell/main.c index 0775904fbf..766d6e6d7d 100644 --- a/shell/main.c +++ b/shell/main.c @@ -23,7 +23,6 @@ #include <config.h> #include <fcntl.h> #include <glib.h> -#include <stdio.h> #include <gtk/gtkframe.h> #include <gtk/gtklabel.h> @@ -61,11 +60,7 @@ static EShell *shell = NULL; static char *evolution_directory = NULL; - -/* Command-line options. */ static gboolean no_splash = FALSE; -static gboolean start_online = FALSE; -static gboolean start_offline = FALSE; extern char *evolution_debug_log; @@ -187,7 +182,6 @@ idle_cb (void *data) GNOME_Evolution_Shell corba_shell; CORBA_Environment ev; EShellConstructResult result; - EShellStartupLineMode startup_line_mode; GSList *p; gboolean have_evolution_uri; gboolean display_default; @@ -196,14 +190,7 @@ idle_cb (void *data) uri_list = (GSList *) data; - if (! start_online && ! start_offline) - startup_line_mode = E_SHELL_STARTUP_LINE_MODE_CONFIG; - else if (start_online) - startup_line_mode = E_SHELL_STARTUP_LINE_MODE_ONLINE; - else - startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE; - - shell = e_shell_new (evolution_directory, ! no_splash, startup_line_mode, &result); + shell = e_shell_new (evolution_directory, ! no_splash, &result); g_free (evolution_directory); switch (result) { @@ -300,8 +287,6 @@ main (int argc, char **argv) { struct poptOption options[] = { { "no-splash", '\0', POPT_ARG_NONE, &no_splash, 0, N_("Disable splash screen"), NULL }, - { "offline", '\0', POPT_ARG_NONE, &start_offline, 0, N_("Start in offline mode"), NULL }, - { "online", '\0', POPT_ARG_NONE, &start_online, 0, N_("Start in online mode"), NULL }, { "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, N_("Send the debugging output of all components to a file."), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL }, POPT_AUTOHELP @@ -319,12 +304,6 @@ main (int argc, char **argv) gnome_init_with_popt_table ("Evolution", VERSION " [" SUB_VERSION "]", argc, argv, options, 0, &popt_context); - if (start_online && start_offline) { - fprintf (stderr, _("%s: --online and --offline cannot be used together.\n Use %s --help for more information.\n"), - argv[0], argv[0]); - exit (1); - } - if (evolution_debug_log) { int fd; |