rpms/evolution/devel evolution-2.8.1-kill-ethread.patch, 1.13, 1.14 evolution-2.9.1-kill-ememory.patch, 1.3, 1.4 evolution.spec, 1.284, 1.285 evolution-2.11.91-compilation-breakage.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30562

Modified Files:
	evolution-2.8.1-kill-ethread.patch 
	evolution-2.9.1-kill-ememory.patch evolution.spec 
Removed Files:
	evolution-2.11.91-compilation-breakage.patch 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92


evolution-2.8.1-kill-ethread.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 evolution-2.8.1-kill-ethread.patch
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- evolution-2.8.1-kill-ethread.patch	29 Aug 2007 22:40:09 -0000	1.13
+++ evolution-2.8.1-kill-ethread.patch	4 Sep 2007 04:39:01 -0000	1.14
@@ -1,4893 +1,4256 @@
-diff -up evolution-2.11.91/mail/mail-send-recv.c.kill-ethread evolution-2.11.91/mail/mail-send-recv.c
---- evolution-2.11.91/mail/mail-send-recv.c.kill-ethread	2007-07-28 17:08:12.000000000 -0400
-+++ evolution-2.11.91/mail/mail-send-recv.c	2007-08-29 17:39:34.000000000 -0400
-@@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d,
- /* ********************************************************************** */
+--- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
++++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-09-04 00:19:08.000000000 -0400
+@@ -44,32 +44,30 @@
  
- struct _refresh_folders_msg {
+ 
+ struct _folder_unsub_t {
 -	struct _mail_msg msg;
 +	MailMsg base;
- 
- 	struct _send_info *info;
- 	GPtrArray *folders;
- 	CamelStore *store;
+ 	
+ 	char *uri;
  };
  
 -static char *
--refresh_folders_desc (struct _mail_msg *mm, int done)
+-folder_unsubscribe__desc (struct _mail_msg *mm, int done)
 +static gchar *
-+refresh_folders_desc (struct _refresh_folders_msg *m)
- {
- 	return g_strdup_printf(_("Checking for new mail"));
- }
- 
- static void
--refresh_folders_get (struct _mail_msg *mm)
-+refresh_folders_exec (struct _refresh_folders_msg *m)
++folder_unsubscribe_desc (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
- 	int i;
- 	CamelFolder *folder;
- 	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-@@ -808,17 +807,14 @@ refresh_folders_get (struct _mail_msg *m
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-	
+-	return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri);
++	return g_strdup_printf (
++		_("Unsubscribing from folder \"%s\""), msg->uri);
  }
  
  static void
--refresh_folders_got (struct _mail_msg *mm)
-+refresh_folders_done (struct _refresh_folders_msg *m)
+-folder_unsubscribe__unsub (struct _mail_msg *mm)
++folder_unsubscribe_exec (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
--
- 	receive_done("", m->info);
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+ 	extern CamelSession *session;
+ 	const char *path = NULL;
+ 	CamelStore *store;
+ 	CamelURL *url;
+ 	
+-	if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex)))
++	if (!(store = camel_session_get_store (session, msg->uri, &mm->ex)))
+ 		return;
+ 	
+-	url = camel_url_new (unsub->uri, NULL);
++	url = camel_url_new (msg->uri, NULL);
+ 	if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
+ 		path = url->fragment;
+ 	else if (url->path && url->path[0])
+@@ -82,18 +80,17 @@
  }
  
  static void
--refresh_folders_free (struct _mail_msg *mm)
-+refresh_folders_free (struct _refresh_folders_msg *m)
+-folder_unsubscribe__free (struct _mail_msg *mm)
++folder_unsubscribe_free (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
- 	int i;
- 
- 	for (i=0;i<m->folders->len;i++)
-@@ -827,11 +823,12 @@ refresh_folders_free (struct _mail_msg *
- 	camel_object_unref(m->store);
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-	
+-	g_free (unsub->uri);
++	g_free (msg->uri);
  }
  
--static struct _mail_msg_op refresh_folders_op = {
--	refresh_folders_desc,
--	refresh_folders_get,
--	refresh_folders_got,
--	refresh_folders_free,
-+static MailMsgInfo refresh_folders_info = {
-+	sizeof (struct _refresh_folders_msg),
-+	(MailMsgDescFunc) refresh_folders_desc,
-+	(MailMsgExecFunc) refresh_folders_exec,
-+	(MailMsgDoneFunc) refresh_folders_done,
-+	(MailMsgFreeFunc) refresh_folders_free
+-static struct _mail_msg_op unsubscribe_op = {
+-	folder_unsubscribe__desc,
+-	folder_unsubscribe__unsub,
+-	NULL,
+-	folder_unsubscribe__free,
++static MailMsgInfo unsubscribe_info = {
++	sizeof (struct _folder_unsub_t),
++	(MailMsgDescFunc) folder_unsubscribe_desc,
++	(MailMsgExecFunc) folder_unsubscribe_exec,
++	(MailMsgDoneFunc) NULL,
++	(MailMsgFreeFunc) folder_unsubscribe_free
  };
  
- static void
-@@ -864,13 +861,13 @@ receive_update_got_folderinfo(CamelStore
  
- 		get_folders(store, folders, info);
+@@ -105,8 +102,8 @@
+ 	if (target->uri == NULL)
+ 		return;
+ 	
+-	unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
++	unsub = mail_msg_new (&unsubscribe_info);
+ 	unsub->uri = g_strdup (target->uri);
+ 	
+-	e_thread_put (mail_thread_new, (EMsg *) unsub);
++	mail_msg_unordered_push (unsub);
+ }
+--- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-09-02 14:56:39.000000000 -0400
++++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c	2007-09-04 00:19:08.000000000 -0400
+@@ -44,7 +44,7 @@
+ 		return;
+ 	}
+ 	
+-	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new);
++	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push);
+ }
  
--		m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m));
-+		m = mail_msg_new(&refresh_folders_info);
- 		m->store = store;
- 		camel_object_ref(store);
- 		m->folders = folders;
- 		m->info = sinfo;
+ static void
+--- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread	2007-09-02 14:56:45.000000000 -0400
++++ evolution-2.11.92/plugins/save-attachments/save-attachments.c	2007-09-04 00:19:08.000000000 -0400
+@@ -403,5 +403,5 @@
+ 	camel_object_ref(data->folder);
+ 	data->uid = g_strdup(target->uids->pdata[0]);
  
--		e_thread_put(mail_thread_new, (EMsg *)m);
-+		mail_msg_unordered_push (m);
- 	} else {
- 		receive_done ("", data);
- 	}
-diff -up evolution-2.11.91/mail/mail-component.c.kill-ethread evolution-2.11.91/mail/mail-component.c
---- evolution-2.11.91/mail/mail-component.c.kill-ethread	2007-08-24 02:49:43.000000000 -0400
-+++ evolution-2.11.91/mail/mail-component.c	2007-08-29 17:39:34.000000000 -0400
-@@ -1005,7 +1005,7 @@ impl_handleURI (PortableServer_Servant s
- 		if (camel_url_get_param(url, "uid") != NULL) {
- 			char *curi = em_uri_to_camel(uri);
+-	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
++	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
+ }
+--- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
++++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-04 00:19:08.000000000 -0400
+@@ -121,7 +121,7 @@
+ }
  
--			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new);
-+			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push);
- 			g_free(curi);
- 		} else {
- 			g_warning("email uri's must include a uid parameter");
-diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/mail-ops.c
---- evolution-2.11.91/mail/mail-ops.c.kill-ethread	2007-07-05 02:09:38.000000000 -0400
-+++ evolution-2.11.91/mail/mail-ops.c	2007-08-29 17:39:34.000000000 -0400
-@@ -75,7 +75,7 @@
- /* used for both just filtering a folder + uid's, and for filtering a whole folder */
- /* used both for fetching mail, and for filtering mail */
- struct _filter_mail_msg {
+ struct _EMCreateFolder {
 -	struct _mail_msg msg;
 +	MailMsg base;
  	
- 	CamelFolder *source_folder; /* where they come from */
[...12250 lines suppressed...]
  
- 	g_return_if_fail (alarm_queue_inited);
- 	g_return_if_fail (client != NULL);
-@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre
- 				  G_CALLBACK (cal_opened_cb),
- 				  ca);
- 	}	
-+
-+	g_slice_free (struct _alarm_client_msg, msg);
+ 	MAIL_MT_LOCK(status_lock);
+ 	busy_state++;
+ 	if (busy_state == 1) {
+-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
+-		e_msgport_put(mail_gui_port, (EMsg *)m);
++		m = mail_msg_new(&set_busy_info);
++		mail_msg_main_loop_push(m);
+ 	}
+ 	MAIL_MT_UNLOCK(status_lock);
  }
  
- /**
-@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre
- void
- alarm_queue_add_client (ECal *client)
+ void mail_disable_stop(void)
  {
--	AlarmMsg *msg;
--	struct _alarm_client_msg *list;
-+	struct _alarm_client_msg *msg;
- 
--	/* These two structures will be freed by the msg destroy function*/
--	msg = malloc (sizeof (AlarmMsg));
--	msg->receive_msg = alarm_queue_add_async;
--
--	list = malloc (sizeof (struct _alarm_client_msg));
--	list->client = client;
--	g_object_ref (client);
--	msg->data = list;
-+	msg = g_slice_new (struct _alarm_client_msg);
-+	msg->header.func = (MessageFunc) alarm_queue_add_async;
-+	msg->client = g_object_ref (client);
+-	struct _mail_msg *m;
++	MailMsg *m;
  
--	d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__));
--	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-+	message_push ((Message *) msg);
+ 	MAIL_MT_LOCK(status_lock);
+ 	busy_state--;
+ 	if (busy_state == 0) {
+-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
+-		e_msgport_put(mail_gui_port, (EMsg *)m);
++		m = mail_msg_new(&set_busy_info);
++		mail_msg_main_loop_push(m);
+ 	}
+ 	MAIL_MT_UNLOCK(status_lock);
  }
+@@ -930,7 +911,7 @@
+ /* ******************************************************************************** */
  
- /* Removes a component an its alarms */
-@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca)
-  * Removes a calendar client from the alarm queueing system.
-  **/
- static void
--alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
-+alarm_queue_remove_async (struct _alarm_client_msg *msg)
- {
- 	ClientAlarms *ca;
--	struct _alarm_client_msg *list = msg->data;
--	ECal *client = list->client;
-+	ECal *client = msg->client;
+ struct _op_status_msg {
+-	struct _mail_msg msg;
++	MailMsg base;
  
- 	g_return_if_fail (alarm_queue_inited);
- 	g_return_if_fail (client != NULL);
-@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al
- 	g_free (ca);
+ 	struct _CamelOperation *op;
+ 	char *what;
+@@ -938,16 +919,16 @@
+ 	void *data;
+ };
  
- 	g_hash_table_remove (client_alarms_hash, client);
-+
-+	g_slice_free (struct _alarm_client_msg, msg);
+-static void do_op_status(struct _mail_msg *mm)
++static void
++op_status_exec (struct _op_status_msg *m)
+ {
+ 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
+-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
+-	struct _mail_msg *msg;
+-	struct _mail_msg_priv *data;
++	MailMsg *msg;
++	MailMsgPrivate *data;
+ 	char *out, *p, *o, c;
+ 	int pc;
+ 	
+-	g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ()));
++	g_return_if_fail (mail_in_main_thread ());
+ 	
+ 	MAIL_MT_LOCK (mail_msg_lock);
+ 	
+@@ -986,8 +967,8 @@
+ 				progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
+ 			
+ 			MAIL_MT_UNLOCK (mail_msg_lock);
+-			if (msg->ops->describe_msg)
+-				what = msg->ops->describe_msg (msg, FALSE);
++			if (msg->info->desc)
++				what = msg->info->desc (msg);
+ 			/* uncommenting because message is not very useful for a user, see bug 271734*/
+ 			else {
+ 				what = g_strdup("");
+@@ -1001,11 +982,7 @@
+ 			MAIL_MT_LOCK (mail_msg_lock);
+ 			if (data->activity_state == 3) {
+ 				MAIL_MT_UNLOCK (mail_msg_lock);
+-				if (msg->cancel)
+-					camel_operation_unref (msg->cancel);
+-				camel_exception_clear (&msg->ex);
+-				g_free (msg->priv);
+-				g_free (msg);
++				mail_msg_free (msg);
+ 			} else {
+ 				data->activity_state = 2;
+ 				MAIL_MT_UNLOCK (mail_msg_lock);
+@@ -1021,18 +998,17 @@
  }
  
- /** alarm_queue_remove_client
-@@ -2156,22 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al
- void
- alarm_queue_remove_client (ECal *client, gboolean immediately)
+ static void
+-do_op_status_free (struct _mail_msg *mm)
++op_status_free (struct _op_status_msg *m)
  {
--	AlarmMsg *msg;
--	struct _alarm_client_msg *list;
-+	struct _alarm_client_msg *msg;
- 
--	/* These two structures will be freed by the msg destroy function*/
--	msg = malloc (sizeof (AlarmMsg));
--	msg->receive_msg = alarm_queue_remove_async;
+-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
 -
--	list = malloc (sizeof (struct _alarm_client_msg));
--	list->client = client;
--	msg->data = list;
-+	msg = g_slice_new (struct _alarm_client_msg);
-+	msg->header.func = (MessageFunc) alarm_queue_remove_async;
-+	msg->client = client;
+ 	g_free (m->what);
+ }
  
--	d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
- 	if (immediately)
--		alarm_queue_remove_async (NULL, msg, NULL);
-+		alarm_queue_remove_async (msg);
- 	else
--		e_thread_put(alarm_operation_thread, (EMsg *)msg);
-+		message_push ((Message *) msg);
+-static struct _mail_msg_op op_status_op = {
+-	NULL,
+-	do_op_status,
+-	NULL,
+-	do_op_status_free,
++static MailMsgInfo op_status_info = {
++	sizeof (struct _op_status_msg),
++	(MailMsgDescFunc) NULL,
++	(MailMsgExecFunc) op_status_exec,
++	(MailMsgDoneFunc) NULL,
++	(MailMsgFreeFunc) op_status_free
+ };
+ 
+ static void
+@@ -1042,7 +1018,7 @@
+ 	
+ 	d(printf("got operation statys: %s %d%%\n", what, pc));
+ 
+-	m = mail_msg_new(&op_status_op, NULL, sizeof(*m));
++	m = mail_msg_new(&op_status_info);
+ 	m->op = op;
+ 	m->what = g_strdup(what);
+ 	switch (pc) {
+@@ -1055,7 +1031,7 @@
+ 	}
+ 	m->pc = pc;
+ 	m->data = data;
+-	e_msgport_put(mail_gui_port, (EMsg *)m);
++	mail_msg_main_loop_push(m);
  }
  
- /* Update non-time related variables for various structures on modification of an existing component 
+ /* ******************** */

evolution-2.9.1-kill-ememory.patch:

Index: evolution-2.9.1-kill-ememory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.9.1-kill-ememory.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.9.1-kill-ememory.patch	4 Jun 2007 20:07:28 -0000	1.3
+++ evolution-2.9.1-kill-ememory.patch	4 Sep 2007 04:39:01 -0000	1.4
@@ -30,7 +30,7 @@
 -	default:
 -		string = NULL;
 -		index = NORMALISED_LAST;
--		g_assert_not_reached ();
+-		g_warning ("Should not be reached\n");
 -	}
 -	
 -	/* slight optimisation */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- evolution.spec	4 Sep 2007 03:23:24 -0000	1.284
+++ evolution.spec	4 Sep 2007 04:39:01 -0000	1.285
@@ -121,9 +121,6 @@
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
-# The usual compilation breakage...
-Patch35: evolution-2.11.91-compilation-breakage.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -255,7 +252,6 @@
 %patch31 -p1 -b .meeting-list-view
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .compilation-breakage
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib


--- evolution-2.11.91-compilation-breakage.patch DELETED ---