diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-05-20 03:41:05 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-05-20 03:41:05 +0800 |
| commit | f68ef51327afc9c49b9cf0c71666fca8c3a806a9 (patch) | |
| tree | 8751a7367279adc3257f409483169ced80e7c402 /shell/main.c | |
| parent | b414561327ea8e54606437865f48faf2ffd031e2 (diff) | |
| download | gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.tar gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.tar.gz gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.tar.bz2 gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.tar.lz gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.tar.xz gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.tar.zst gsoc2013-evolution-f68ef51327afc9c49b9cf0c71666fca8c3a806a9.zip | |
Removed "forced_upgrade" unused variable. (show_development_warning): Put
* main.c: Removed "forced_upgrade" unused variable.
(show_development_warning): Put in a DEVELOPMENT_WARNING cpp
conditional.
(warning_dialog_response_callback): Likewise.
(view_map_callback): Likewise.
(new_view_created_callback): Likewise.
(idle_cb) [DEVELOPMENT_WARNING]: Do not connect
new_view_created_callback() to the "new_view" shell signal
anymore.
* Makefile.am (install-evolution) [DEFAULT_BINARY]: Make a
symbolic link from evolution to evolution-$(BASE_VERSION).
* e-shell-folder-creation-dialog.c (dialog_data_destroy):
g_object_weak_unref shell and dialog if they are not NULL.
(dialog_destroy_notify): Set ->dialog to NULL in all cases.
svn path=/trunk/; revision=21267
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/shell/main.c b/shell/main.c index 02bc4818d6..740eb091ca 100644 --- a/shell/main.c +++ b/shell/main.c @@ -86,7 +86,6 @@ static char *evolution_directory = NULL; static gboolean no_splash = FALSE; static gboolean start_online = FALSE; static gboolean start_offline = FALSE; -static gboolean force_upgrade = FALSE; static gboolean setup_only = FALSE; static gboolean killev = FALSE; @@ -224,6 +223,8 @@ kill_old_wombat (void) #endif +#ifdef DEVELOPMENT_WARNING + /* Warning dialog to scare people off a little bit. */ static void @@ -340,6 +341,8 @@ new_view_created_callback (EShell *shell, g_signal_connect (view, "map", G_CALLBACK (view_map_callback), NULL); } +#endif /* DEVELOPMENT_WARNING */ + /* This is for doing stuff that requires the GTK+ loop to be running already. */ @@ -381,9 +384,11 @@ idle_cb (void *data) g_signal_connect (shell, "no_views_left", G_CALLBACK (no_views_left_cb), NULL); g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, NULL); +#ifdef DEVELOPMENT_WARNING if (!getenv ("EVOLVE_ME_HARDER")) g_signal_connect (shell, "new_view_created", G_CALLBACK (new_view_created_callback), NULL); +#endif corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell)); corba_shell = CORBA_Object_duplicate (corba_shell, &ev); @@ -545,10 +550,6 @@ main (int argc, char **argv) #endif { "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, N_("Send the debugging output of all components to a file."), NULL }, -#if 0 - { "force-upgrade", '\0', POPT_ARG_NONE, &force_upgrade, 0, - N_("Force upgrading of configuration files from Evolution 1.0.x"), NULL }, -#endif { "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &setup_only, 0, NULL, NULL }, POPT_AUTOHELP |