aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/e-setup.c4
-rw-r--r--shell/e-shell-view-menu.c5
3 files changed, 17 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index c839488302..2939947631 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2000-12-23 Jason Leach <jasonleach@usa.net>
+
+ * e-shell-view-menu.c (command_run_bugbuddy): Fix a crash when the
+ user tries to "Submit bug report" but doesn't have bug-buddy
+ installed. Bug #633.
+
+2000-12-23 Jason Leach <jasonleach@usa.net>
+
+ * e-setup.c (copy_default_stuff): Make the "Evolution
+ installation" dialog resizable. Bug #742.
+ (check_evolution_directory): Here too.
+
2000-12-14 Iain Holmes <iain@helixcode.com>
* e-shell-folder-selection-dialog.c (dbl_click_cb): Modify to suit the
diff --git a/shell/e-setup.c b/shell/e-setup.c
index d9fc75f1dd..b1255906fb 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -122,6 +122,8 @@ check_evolution_directory (const char *evolution_directory)
gtk_widget_show (label1);
gtk_widget_show (label2);
+ gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
+
result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
if (result != 0) {
@@ -196,6 +198,8 @@ copy_default_stuff (const char *evolution_directory)
gtk_widget_show (label2);
gtk_widget_show (label3);
+ gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
+
result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
if (result != 0)
return FALSE;
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 0c3deb41a2..9dd6deb468 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -108,15 +108,12 @@ command_run_bugbuddy (BonoboUIComponent *uih,
};
args[0] = gnome_is_program_in_path ("bug-buddy");
if (!args[0]) {
- /* you might have to call gnome_dialog_run() on the
- * dialog returned here, I don't remember...
- */
gnome_error_dialog (_("Bug buddy was not found in your $PATH."));
+ return;
}
pid = gnome_execute_async (NULL, 4, args);
g_free (args[0]);
if (pid == -1) {
- /* same as above */
gnome_error_dialog (_("Bug buddy could not be run."));
}
}