aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer-attachment.c29
2 files changed, 7 insertions, 29 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8874defcea..aea54e5c94 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-15 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
+ Don't connect to the focus-out-event in order to update the
+ mime-type. Simply don't update the mime-type ever. Fixes bug
+ #42798.
+
2003-04-28 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (autosave_manager_query_load_orphans): Change
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index 405f0f57d6..3d790eb2f2 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -302,21 +302,6 @@ destroy_dialog_data (DialogData *data)
*/
static void
-update_mime_type (DialogData *data)
-{
- const char *filename, *mime_type;
-
- if (!data->attachment->guessed_type)
- return;
-
- filename = gtk_entry_get_text (data->file_name_entry);
- if (filename) {
- if ((mime_type = gnome_vfs_mime_type_from_name (filename)))
- gtk_entry_set_text (data->mime_type_entry, mime_type);
- }
-}
-
-static void
set_entry (GladeXML *xml, const char *widget_name, const char *value)
{
GtkEntry *entry;
@@ -393,17 +378,6 @@ ok_cb (GtkWidget *widget, gpointer data)
close_cb (widget, data);
}
-static gboolean
-file_name_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
- DialogData *dialog_data;
-
- dialog_data = (DialogData *) data;
- update_mime_type (dialog_data);
-
- return FALSE;
-}
-
void
e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *parent)
@@ -468,9 +442,6 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *p
connect_widget (editor_gui, "ok_button", "clicked", (GCallback)ok_cb, dialog_data);
connect_widget (editor_gui, "close_button", "clicked", (GCallback)close_cb, dialog_data);
- connect_widget (editor_gui, "file_name_entry", "focus-out-event",
- (GCallback)file_name_focus_out_cb, dialog_data);
-
#warning "signal connect while alive"
/* make sure that when the composer gets hidden/closed that our windows also close */
parent = gtk_widget_get_toplevel (parent);