From a33720dba790586bddfeb9fa7d7a04adf79878d2 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 20 Dec 2001 06:05:51 +0000 Subject: -- Merging patches from evolution-1-0-branch. * e-shell-about-box.c: Add Michael MacDonald. [Fixes #17377, Evolution doesn't work on multi-depth displays.] * main.c (main): Push GdkRGB visual and colormap. [Fix #16693. What happens there is that the user closed the dialog before the async operation was completed, so when the notification was received the shell crashed.] * e-shell-folder-creation-dialog.c: New member `creation_in_progress' in `DialogData'. (e_shell_show_folder_creation_dialog): Init to %FALSE. (async_create_cb): Set to %FALSE. Also, if the dialog_data->dialog is %NULL, free the dialog_data before returning. (dialog_clicked_cb): Set to %TRUE. (dialog_destroy_cb): If a creation is in progress, just set the widget pointers in the DialogData struct to %NULL instead of freeing the whole struct. (async_create_cb): Make the OK and Cancel buttons sensitive. (dialog_clicked_cb): Make them insensitive here. svn path=/trunk/; revision=15192 --- shell/e-shell-about-box.c | 1 + 1 file changed, 1 insertion(+) (limited to 'shell/e-shell-about-box.c') diff --git a/shell/e-shell-about-box.c b/shell/e-shell-about-box.c index 26e324bb8b..491434669b 100644 --- a/shell/e-shell-about-box.c +++ b/shell/e-shell-about-box.c @@ -64,6 +64,7 @@ static const char *text[] = { "Miles Lane", "Jason Leach", "Matthew Loper", + "Michael MacDonald", "Kjartan Maraas", "Michael Meeks", "Federico Mena", -- cgit v1.2.3