From 20255e43dfe6513e6c58807031ed74978759c70b Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 22 Oct 2000 17:04:12 +0000 Subject: Pull the fix to the "attach-twice-and-crash" problem up to HEAD. svn path=/trunk/; revision=6108 --- composer/ChangeLog | 6 ++++ composer/e-msg-composer-attachment-bar.c | 50 ++++++-------------------------- 2 files changed, 15 insertions(+), 41 deletions(-) diff --git a/composer/ChangeLog b/composer/ChangeLog index 7f9528e1d6..2933b52829 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2000-10-22 Ettore Perazzoli + + * e-msg-composer-attachment-bar.c (attach_cb): Removed. + (add_from_user): Use `e_msg_composer_select_file()' instead of + doing the file selector widget magic by yourself. + 2000-10-20 Jeffrey Stedfast * .cvsignore: Ignore Evolution-Addressbook-SelectNames* diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 0a7428b2ea..71ccf2a4f3 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -28,9 +28,12 @@ #include #include +#include "e-msg-composer.h" #include "e-msg-composer-attachment.h" #include "e-msg-composer-attachment-bar.h" + #include "e-icon-list.h" + #include "camel/camel-data-wrapper.h" #include "camel/camel-stream-fs.h" #include "camel/camel-stream-mem.h" @@ -381,54 +384,19 @@ edit_selected (EMsgComposerAttachmentBar *bar) /* "Attach" dialog. */ -static void -attach_cb (GtkWidget *widget, - gpointer data) -{ - EMsgComposerAttachmentBar *bar; - GtkWidget *file_selection; - const gchar *file_name; - - file_selection = gtk_widget_get_toplevel (widget); - bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data); - - file_name = gtk_file_selection_get_filename - (GTK_FILE_SELECTION (file_selection)); - add_from_file (bar, file_name); - - gtk_widget_hide (file_selection); -} - static void add_from_user (EMsgComposerAttachmentBar *bar) { - static GtkWidget *fs; + EMsgComposer *composer; + char *file_name; - if (!fs) { - GtkWidget *cancel_button; - GtkWidget *ok_button; + composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar))); - fs = gtk_file_selection_new (_("Add attachment")); + file_name = e_msg_composer_select_file (composer, _("Attach a file")); - ok_button = GTK_FILE_SELECTION (fs)->ok_button; - gtk_signal_connect (GTK_OBJECT (ok_button), - "clicked", GTK_SIGNAL_FUNC (attach_cb), - bar); - - cancel_button = GTK_FILE_SELECTION (fs)->cancel_button; - gtk_signal_connect_object (GTK_OBJECT (cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_hide), - GTK_OBJECT (fs)); - - gtk_signal_connect (GTK_OBJECT (fs), "delete_event", - GTK_SIGNAL_FUNC (gtk_widget_hide), NULL); - } else - gtk_file_selection_set_filename (GTK_FILE_SELECTION (fs), ""); - - gtk_window_set_position (GTK_WINDOW (fs), GTK_WIN_POS_MOUSE); + add_from_file (bar, file_name); - gtk_widget_show (GTK_WIDGET (fs)); + g_free (file_name); } -- cgit v1.2.3