[evolution-patches] fix for the bug #273847 [calendar]



Hi,
  Have attached the fix for the bug. 

thanks, Chenthill.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2808
diff -u -p -r1.2808 ChangeLog
--- ChangeLog	29 Sep 2005 13:02:55 -0000	1.2808
+++ ChangeLog	29 Sep 2005 20:16:51 -0000
@@ -1,3 +1,12 @@
+2005-09-30  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #273847
+	* gui/dialogs/comp-editor.c: (comp_editor_get_mime_attach_list): set
+	the disposition from the attachment.
+	* gui/itip-utils.c: (append_cal_attachments): Send the right disposition
+	value.
+	* gui/itip-utils.h: Adding variable dipostion to CalMimeAttach structure.
+
 2005-08-29  Chenthill Palanisamy  <pchenthill novell com>
 
 	* gui/e-calendar-table.c (e_calendar_table_open_task): Set the 
Index: gui/itip-utils.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.h,v
retrieving revision 1.19
diff -u -p -r1.19 itip-utils.h
--- gui/itip-utils.h	11 Jul 2005 08:59:38 -0000	1.19
+++ gui/itip-utils.h	29 Sep 2005 20:16:51 -0000
@@ -25,6 +25,7 @@ struct CalMimeAttach {
 	char *content_type;
 	char *description;
 	char *encoded_data;
+	gboolean disposition;
 	guint length;
 };
 
Index: gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.105
diff -u -p -r1.105 itip-utils.c
--- gui/itip-utils.c	24 Aug 2005 03:07:49 -0000	1.105
+++ gui/itip-utils.c	29 Sep 2005 20:16:58 -0000
@@ -994,7 +994,7 @@ append_cal_attachments (GNOME_Evolution_
 
 		GNOME_Evolution_Composer_attachData (composer_server,
 						     content_type, filename, description,
-						     TRUE, attach_data,
+						     mime_attach->disposition, attach_data,
 						     &ev);
 		if (BONOBO_EX (&ev)) {
 			g_warning ("Unable to add attachments in composer");
Index: gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.150
diff -u -p -r1.150 comp-editor.c
--- gui/dialogs/comp-editor.c	24 Aug 2005 03:07:49 -0000	1.150
+++ gui/dialogs/comp-editor.c	29 Sep 2005 20:17:11 -0000
@@ -2422,7 +2422,7 @@ comp_editor_get_mime_attach_list (CompEd
 		CamelDataWrapper *wrapper;
 		CamelStreamMem *mstream;
 		unsigned char *buffer = NULL;
-		const char *desc;
+		const char *desc, *disp;
 
 		cal_mime_attach = g_malloc0 (sizeof (struct CalMimeAttach));
 		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (l->data));
@@ -2441,6 +2441,10 @@ comp_editor_get_mime_attach_list (CompEd
 		cal_mime_attach->description = g_strdup (desc);
 		cal_mime_attach->content_type = g_strdup (camel_data_wrapper_get_mime_type (wrapper));
 		
+		disp = camel_mime_part_get_disposition ((CamelMimePart *)l->data);
+		if (disp && *disp && !g_ascii_strcasecmp(disp, "inline"))	
+			cal_mime_attach->disposition = TRUE;
+			
 		attach_list = g_slist_append (attach_list, cal_mime_attach);
 
 		camel_object_unref (mstream);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]