diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-12-20 14:05:51 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-12-20 14:05:51 +0800 |
| commit | a33720dba790586bddfeb9fa7d7a04adf79878d2 (patch) | |
| tree | d2f16139ad164e86365298d9e6993db8b50d79be /shell/e-shell-about-box.c | |
| parent | 6cfbc6f4d946ea0976373b099284d5b5d5cfb4da (diff) | |
| download | gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.tar gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.tar.gz gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.tar.bz2 gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.tar.lz gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.tar.xz gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.tar.zst gsoc2013-evolution-a33720dba790586bddfeb9fa7d7a04adf79878d2.zip | |
-- 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
Diffstat (limited to 'shell/e-shell-about-box.c')
| -rw-r--r-- | shell/e-shell-about-box.c | 1 |
1 files changed, 1 insertions, 0 deletions
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", |