rpms/evolution/devel .cvsignore, 1.80, 1.81 evolution-2.8.1-kill-ethread.patch, 1.16, 1.17 evolution-2.9.1-kill-ememory.patch, 1.5, 1.6 evolution.spec, 1.303, 1.304 sources, 1.80, 1.81

[Matthew Barnes (mbarnes)]

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-2.8.1-kill-ethread.patch 
	evolution-2.9.1-kill-ememory.patch evolution.spec sources 
Log Message:

* Mon Nov 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.2-1.fc9
- Update to 2.21.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	29 Oct 2007 19:26:25 -0000	1.80
+++ .cvsignore	12 Nov 2007 22:09:25 -0000	1.81
@@ -1 +1 @@
-evolution-2.21.1.tar.bz2
+evolution-2.21.2.tar.bz2

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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- evolution-2.8.1-kill-ethread.patch	29 Oct 2007 19:26:25 -0000	1.16
+++ evolution-2.8.1-kill-ethread.patch	12 Nov 2007 22:09:25 -0000	1.17
@@ -3940,7 +3940,7 @@
 -};
 -
 -#ifdef LOG_STREAM
--int dolog;
+-static int dolog;
 -#endif
 -
 -/* Should probably expose messages to outside world ... so subclasses can extend */
@@ -5927,18 +5927,18 @@
 -	mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2);
 -
 -	mail_thread_queued = e_thread_new(E_THREAD_QUEUE);
--	e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0);
--	e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0);
+-	e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, NULL);
+-	e_thread_set_msg_received(mail_thread_queued, mail_msg_received, NULL);
 -	e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port);
 -
 -	mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE);
--	e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, 0);
--	e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0);
+-	e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, NULL);
+-	e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, NULL);
 -	e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port);
 -
 -	mail_thread_new = e_thread_new(E_THREAD_NEW);
--	e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0);
--	e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0);
+-	e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, NULL);
+-	e_thread_set_msg_received(mail_thread_new, mail_msg_received, NULL);
 -	e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port);
 -	e_thread_set_queue_limit(mail_thread_new, 10);
 +	static GOnce once = G_ONCE_INIT;

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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-2.9.1-kill-ememory.patch	29 Oct 2007 19:26:25 -0000	1.5
+++ evolution-2.9.1-kill-ememory.patch	12 Nov 2007 22:09:25 -0000	1.6
@@ -239,7 +239,7 @@
  			}
  			
  			for (i = 0; i < uidnew->len; i++) {
- 				if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == 0) {
+ 				if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) {
 -					char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]);
 +					char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, uidnew->pdata[i]);
  					g_hash_table_insert (m->ml->hidden, uid, uid);


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- evolution.spec	30 Oct 2007 16:43:27 -0000	1.303
+++ evolution.spec	12 Nov 2007 22:09:25 -0000	1.304
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.21.1
-Release: 2%{?dist}
+Version: 2.21.2
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -676,7 +676,10 @@
 %endif
 
 %changelog
-* Tue Oct 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc9
+* Mon Nov 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.2-1.fc9
+- Update to 2.21.2
+
+* Tue Oct 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.1-2.fc9
 - Attempt to split the gnome-pilot stuff into a separate
   evolution-conduits subpackage (RH bug #178155).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	29 Oct 2007 19:26:25 -0000	1.80
+++ sources	12 Nov 2007 22:09:25 -0000	1.81
@@ -1 +1 @@
-53e5927ac3e8a0f1426b010c42ff49f3  evolution-2.21.1.tar.bz2
+833cf5f76ec30170d22f04948fba9997  evolution-2.21.2.tar.bz2