diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 22 | ||||
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/e-shell-folder-creation-dialog.c | 12 | ||||
| -rw-r--r-- | shell/main.c | 11 |
4 files changed, 42 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index a51f6ec868..af4b61b4b2 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,10 +1,30 @@ +2003-05-19 Ettore Perazzoli <ettore@ximian.com> + + * 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). + + [#43216] + + * 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. + 2003-05-19 Anna Marie Dirks <anna@ximian.com> * e-corba-config-page.c: Remove some padding which I incorrectly added to the wrong vbox. This shoulda been fixed in widgets/misc/e-multi-config-dialog.c . (And it is, now.) - 2003-05-17 Ettore Perazzoli <ettore@ximian.com> * e-storage-set-view.c (e_storage_set_view_set_show_checkboxes): diff --git a/shell/Makefile.am b/shell/Makefile.am index 9ec1771914..fd608ef3cc 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -318,6 +318,9 @@ install-data-local: install-evolution: $(mkinstalldirs) $(DESTDIR)$(bindir) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) +if DEFAULT_BINARY + cd $(DESTDIR)$(bindir) && rm -f evolution && $(LN_S) evolution-$(BASE_VERSION) evolution +endif if HAVE_DTAPPINTEGRATE @@ -332,6 +335,7 @@ install-exec-local: install-evolution endif + # GLib marshalling cruft e-shell-marshal.h: e-shell-marshal.list diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index 4f2afc819e..1a4afb1403 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -51,6 +51,10 @@ #define GLADE_FILE_NAME EVOLUTION_GLADEDIR "/e-shell-folder-creation-dialog.glade" +/* Forward declarations for the weak references. */ +static void dialog_destroy_notify (void *data, GObject *where_the_dialog_was); +static void shell_destroy_notify (void *data, GObject *where_the_shell_was); + /* Data for the callbacks. */ struct _DialogData { GtkWidget *dialog; @@ -77,6 +81,12 @@ dialog_data_destroy (DialogData *dialog_data) e_free_string_list (dialog_data->folder_types); g_free (dialog_data->folder_path); + if (dialog_data->dialog != NULL) + g_object_weak_unref (G_OBJECT (dialog_data->dialog), dialog_destroy_notify, dialog_data); + + if (dialog_data->shell != NULL) + g_object_weak_unref (G_OBJECT (dialog_data->shell), shell_destroy_notify, dialog_data); + g_free (dialog_data); } @@ -217,12 +227,12 @@ dialog_destroy_notify (void *data, DialogData *dialog_data; dialog_data = (DialogData *) data; + dialog_data->dialog = NULL; if (dialog_data->creation_in_progress) { /* If the dialog has been closed before we are done creating the folder, the dialog_data will be freed after the creation is completed. */ - dialog_data->dialog = NULL; dialog_data->folder_name_entry = NULL; dialog_data->storage_set_view = NULL; dialog_data->folder_type_option_menu = NULL; 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 |