[evolution-patches] fix for bug #42798

[Jeffrey Stedfast <fejj ximian com>]

http://bugzilla.ximian.com/show_bug.cgi?id=42798

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 42798.patch
? composer.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.535
diff -u -r1.535 ChangeLog
--- ChangeLog	29 Apr 2003 16:55:52 -0000	1.535
+++ ChangeLog	15 May 2003 17:48:50 -0000
@@ -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
Index: e-msg-composer-attachment.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-attachment.c,v
retrieving revision 1.45
diff -u -r1.45 e-msg-composer-attachment.c
--- e-msg-composer-attachment.c	15 Apr 2003 17:33:36 -0000	1.45
+++ e-msg-composer-attachment.c	15 May 2003 17:48:50 -0000
@@ -302,21 +302,6 @@
  */
 
 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 @@
 	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)
@@ -467,9 +441,6 @@
 	
 	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 */