- Update to 2.21.2

This commit is contained in:
Matthew Barnes 2007-11-12 22:09:25 +00:00
parent c95264f58b
commit c5a13c2288
5 changed files with 16 additions and 13 deletions

View File

@ -1 +1 @@
evolution-2.21.1.tar.bz2 evolution-2.21.2.tar.bz2

View File

@ -3940,7 +3940,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma
-}; -};
- -
-#ifdef LOG_STREAM -#ifdef LOG_STREAM
-int dolog; -static int dolog;
-#endif -#endif
- -
-/* Should probably expose messages to outside world ... so subclasses can extend */ -/* Should probably expose messages to outside world ... so subclasses can extend */
@ -5927,18 +5927,18 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail
- mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2); - mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2);
- -
- mail_thread_queued = e_thread_new(E_THREAD_QUEUE); - 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_destroy(mail_thread_queued, mail_msg_destroy, NULL);
- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0); - e_thread_set_msg_received(mail_thread_queued, mail_msg_received, NULL);
- e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port); - e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port);
- -
- mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE); - 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_destroy(mail_thread_queued_slow, mail_msg_destroy, NULL);
- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0); - 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); - e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port);
- -
- mail_thread_new = e_thread_new(E_THREAD_NEW); - 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_destroy(mail_thread_new, mail_msg_destroy, NULL);
- e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0); - 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_reply_port(mail_thread_new, mail_gui_reply_port);
- e_thread_set_queue_limit(mail_thread_new, 10); - e_thread_set_queue_limit(mail_thread_new, 10);
+ static GOnce once = G_ONCE_INIT; + static GOnce once = G_ONCE_INIT;

View File

@ -239,7 +239,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail
} }
for (i = 0; i < uidnew->len; i++) { 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 = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]);
+ char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, 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); g_hash_table_insert (m->ml->hidden, uid, uid);

View File

@ -44,8 +44,8 @@
### Abstract ### ### Abstract ###
Name: evolution Name: evolution
Version: 2.21.1 Version: 2.21.2
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -676,7 +676,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Tue Oct 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.1-2.fc9 * Mon Nov 12 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-1.fc9
- Update to 2.21.2
* Tue Oct 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.1-2.fc9
- Attempt to split the gnome-pilot stuff into a separate - Attempt to split the gnome-pilot stuff into a separate
evolution-conduits subpackage (RH bug #178155). evolution-conduits subpackage (RH bug #178155).

View File

@ -1 +1 @@
53e5927ac3e8a0f1426b010c42ff49f3 evolution-2.21.1.tar.bz2 833cf5f76ec30170d22f04948fba9997 evolution-2.21.2.tar.bz2