diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 1 | ||||
| -rw-r--r-- | mail/mail-vfolder.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3addafc3e2..2bb3e4be10 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,13 @@ 2003-03-17 Jeffrey Stedfast <fejj@ximian.com> + Part of a fix for bug #39809 + + * mail-vfolder.c (vfolder_edit): Don't add the cancel button here. + + * mail-callbacks.c (filter_edit): Don't add the cancel button here. + +2003-03-17 Jeffrey Stedfast <fejj@ximian.com> + * mail-display.c (do_external_viewer): Lookup the handler for the type. If we don't have a registered handler or if the registered handler is not meant to be handled via a bonobo component, don't diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index a16f5527c3..6a961e5ef6 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -2778,7 +2778,6 @@ filter_edit (BonoboUIComponent *uih, void *user_data, const char *path) /* FIXME: maybe this needs destroy func? */ gtk_window_set_transient_for ((GtkWindow *) filter_editor, FB_WINDOW (fb)); gtk_window_set_title (GTK_WINDOW (filter_editor), _("Filters")); - gtk_dialog_add_button ((GtkDialog *) filter_editor, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GtkDestroyNotify) g_object_unref); g_signal_connect (filter_editor, "response", G_CALLBACK (filter_editor_response), fb); gtk_widget_show (GTK_WIDGET (filter_editor)); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index c4ad36c8ed..d8f30087d6 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -834,8 +834,7 @@ vfolder_edit (void) vfolder_editor = GTK_WIDGET (vfolder_editor_new (context)); gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("vFolders")); g_signal_connect(vfolder_editor, "response", G_CALLBACK(vfolder_editor_response), NULL); - gtk_dialog_add_button (GTK_DIALOG (vfolder_editor), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - + gtk_widget_show (vfolder_editor); } |