Attachment 149274 Details for Bug 231025 – patch that seems to make evo work again for me

[patch] patch that seems to make evo work again for me

evolution-2.9.92-nosegv.patch (text/plain), 1.41 KB, created by Peter Jones on 2007-03-05 17:40:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2007-03-05 17:40:57 UTC

Size: 1.41 KB

patch

obsolete

>--- evolution-2.9.92/mail/mail-mt.c.pjones	2007-03-05 11:53:47.000000000 -0500
>+++ evolution-2.9.92/mail/mail-mt.c	2007-03-05 12:27:35.000000000 -0500
>@@ -205,22 +205,23 @@
> 					      * to free it itself (yuck yuck) */
> 		MAIL_MT_UNLOCK(mail_msg_lock);
> 		return;
>+        } else if (m->priv->activity_state == 3) {
>+	        MAIL_MT_UNLOCK(mail_msg_lock);
>+
>+        	if (m->cancel) {
>+	 		camel_operation_mute(m->cancel);
>+			camel_operation_unref(m->cancel);
>+		}
>+
>+		camel_exception_clear(&m->ex);
>+		/*g_free(m->priv->what);*/
>+		g_free(m->priv);
>+		g_free(m);
> 	} else {
> 		activity_id = m->priv->activity_id;
> 	}
>-
> 	MAIL_MT_UNLOCK(mail_msg_lock);
> 
>-	if (m->cancel) {
>-		camel_operation_mute(m->cancel);
>-		camel_operation_unref(m->cancel);
>-	}
>-
>-	camel_exception_clear(&m->ex);
>-	/*g_free(m->priv->what);*/
>-	g_free(m->priv);
>-	g_free(m);
>-
> 	if (activity_id != 0)
> 		mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback,
> 				      NULL, GINT_TO_POINTER (activity_id), NULL);
>@@ -944,6 +945,7 @@
> 			g_free (what);
> 			
> 			MAIL_MT_LOCK (mail_msg_lock);
>+#if 0
> 			if (data->activity_state == 3) {
> 				MAIL_MT_UNLOCK (mail_msg_lock);
> 				if (msg->cancel)
>@@ -952,9 +954,12 @@
> 				g_free (msg->priv);
> 				g_free (msg);
> 			} else {
>+#endif
> 				data->activity_state = 2;
> 				MAIL_MT_UNLOCK (mail_msg_lock);
>+#if 0
> 			}
>+#endif
> 			return;
> 		}
> 	} else if (data->activity_id != 0) {

Actions: View | Diff

Attachments on bug 231025: 149273 | 149274