From d58a834b7f8497a3edb642cdcb4ca795cf68bc77 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Dec 01 2007 15:58:47 +0000 Subject: - Fix a corrupted patch that caused GNOME bug #499291. --- diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 5f27b0a..10f93f2 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -1,6 +1,6 @@ -diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail/message-list.c ---- evolution-2.21.1/mail/message-list.c.kill-ememory 2007-10-29 10:44:57.000000000 -0400 -+++ evolution-2.21.1/mail/message-list.c 2007-10-29 10:48:44.000000000 -0400 +diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail/message-list.c +--- evolution-2.21.2/mail/message-list.c.kill-ememory 2007-12-01 10:22:46.000000000 -0500 ++++ evolution-2.21.2/mail/message-list.c 2007-12-01 10:23:43.000000000 -0500 @@ -416,70 +416,28 @@ get_message_info (MessageList *message_l return info; } @@ -128,10 +128,16 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail case COL_SIZE: return GINT_TO_POINTER (camel_message_info_size(msg_info)); case COL_DELETED: -@@ -2070,9 +2040,11 @@ message_list_init (MessageList *message_ - g_str_hash, g_str_equal, - (GDestroyNotify) NULL, - (GDestroyNotify) e_poolv_destroy); +@@ -2066,13 +2036,13 @@ message_list_init (MessageList *message_ + gtk_scrolled_window_set_vadjustment ((GtkScrolledWindow *) message_list, adjustment); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + +- message_list->normalised_hash = g_hash_table_new_full ( +- g_str_hash, g_str_equal, +- (GDestroyNotify) NULL, +- (GDestroyNotify) e_poolv_destroy); ++ message_list->normalised_hash = ++ g_hash_table_new (g_str_hash, g_str_equal); + + message_list->string_chunk = g_string_chunk_new (1024); @@ -141,7 +147,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail message_list->hide_before = ML_HIDE_NONE_START; message_list->hide_after = ML_HIDE_NONE_END; -@@ -2166,15 +2138,16 @@ message_list_finalise (GObject *object) +@@ -2166,15 +2136,16 @@ message_list_finalise (GObject *object) struct _MessageListPrivate *p = message_list->priv; g_hash_table_destroy (message_list->normalised_hash); @@ -160,7 +166,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } g_free(message_list->search); -@@ -3124,6 +3097,9 @@ message_list_set_folder (MessageList *me +@@ -3124,6 +3095,9 @@ message_list_set_folder (MessageList *me /* reset the normalised sort performance hack */ g_hash_table_remove_all (message_list->normalised_hash); @@ -170,7 +176,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail mail_regen_cancel(message_list); -@@ -3574,14 +3550,14 @@ message_list_hide_uids (MessageList *ml, +@@ -3574,14 +3548,14 @@ message_list_hide_uids (MessageList *ml, MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden == NULL) { ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); @@ -188,7 +194,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail g_hash_table_insert (ml->hidden, uid, uid); } } -@@ -3602,9 +3578,9 @@ message_list_hide_clear (MessageList *ml +@@ -3602,9 +3576,9 @@ message_list_hide_clear (MessageList *ml MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden) { g_hash_table_destroy (ml->hidden); @@ -200,7 +206,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } ml->hide_before = ML_HIDE_NONE_START; ml->hide_after = ML_HIDE_NONE_END; -@@ -3640,9 +3616,9 @@ load_hide_state (MessageList *ml) +@@ -3640,9 +3614,9 @@ load_hide_state (MessageList *ml) MESSAGE_LIST_LOCK(ml, hide_lock); if (ml->hidden) { g_hash_table_destroy (ml->hidden); @@ -212,7 +218,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } ml->hide_before = ML_HIDE_NONE_START; ml->hide_after = ML_HIDE_NONE_END; -@@ -3653,7 +3629,7 @@ load_hide_state (MessageList *ml) +@@ -3653,7 +3627,7 @@ load_hide_state (MessageList *ml) camel_file_util_decode_fixed_int32 (in, &version); if (version == HIDE_STATE_VERSION) { ml->hidden = g_hash_table_new(g_str_hash, g_str_equal); @@ -221,7 +227,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail camel_file_util_decode_fixed_int32 (in, &lower); ml->hide_before = lower; camel_file_util_decode_fixed_int32 (in, &upper); -@@ -3662,7 +3638,7 @@ load_hide_state (MessageList *ml) +@@ -3662,7 +3636,7 @@ load_hide_state (MessageList *ml) char *olduid, *uid; if (camel_file_util_decode_string (in, &olduid) != -1) { @@ -230,7 +236,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail g_free (olduid); g_hash_table_insert(ml->hidden, uid, uid); } -@@ -3811,12 +3787,12 @@ regen_list_exec (struct _regen_list_msg +@@ -3811,12 +3785,12 @@ regen_list_exec (struct _regen_list_msg if (m->ml->hidden == NULL) { m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); @@ -245,9 +251,9 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail g_hash_table_insert (m->ml->hidden, uid, uid); } } -diff -up evolution-2.21.1/mail/message-list.h.kill-ememory evolution-2.21.1/mail/message-list.h ---- evolution-2.21.1/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/message-list.h 2007-10-29 10:44:57.000000000 -0400 +diff -up evolution-2.21.2/mail/message-list.h.kill-ememory evolution-2.21.2/mail/message-list.h +--- evolution-2.21.2/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.2/mail/message-list.h 2007-12-01 10:22:46.000000000 -0500 @@ -102,11 +102,12 @@ struct _MessageList { GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ diff --git a/evolution.spec b/evolution.spec index 205ea6a..7031709 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -680,6 +680,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Dec 01 2007 Matthew Barnes - 2.21.2-4.fc9 +- Fix a corrupted patch that caused GNOME bug #499291. + * Thu Nov 29 2007 Matthew Barnes - 2.21.2-3.fc9 - Add patch for GNOME bug #499920 (invalid #include).