rpms/evolution/devel .cvsignore, 1.81, 1.82 evolution-2.0.2-fix-145552.patch, 1.1, 1.2 evolution-2.7.3-replicated-cjk-input.patch, 1.1, 1.2 evolution-2.7.4-deleting-preedit-buffer.patch, 1.1, 1.2 evolution-2.8.1-kill-ethread.patch, 1.17, 1.18 evolution-2.9.1-kill-ememory.patch, 1.7, 1.8 evolution.spec, 1.307, 1.308 sources, 1.81, 1.82 evolution-2.21.2-invalid-include.patch, 1.1, NONE evolution-2.9.3-meeting-list-view.patch, 1.1, NONE
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Tue Dec 4 01:22:43 UTC 2007
- Previous message: rpms/jpoker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/libsvm/F-7 libsvm-2.84-7.patch, NONE, 1.1 libsvm.spec, 1.4, 1.5 libsvm-2.84-6.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6082
Modified Files:
.cvsignore evolution-2.0.2-fix-145552.patch
evolution-2.7.3-replicated-cjk-input.patch
evolution-2.7.4-deleting-preedit-buffer.patch
evolution-2.8.1-kill-ethread.patch
evolution-2.9.1-kill-ememory.patch evolution.spec sources
Removed Files:
evolution-2.21.2-invalid-include.patch
evolution-2.9.3-meeting-list-view.patch
Log Message:
* Mon Dec 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.3-1.fc9
- Update to 2.21.3
- Remove patch for RH bug #215467 (fixed upstream).
- Remove patch for GNOME bug #499920 (fixed upstream).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore 12 Nov 2007 22:09:25 -0000 1.81
+++ .cvsignore 4 Dec 2007 01:22:06 -0000 1.82
@@ -1 +1 @@
-evolution-2.21.2.tar.bz2
+evolution-2.21.3.tar.bz2
evolution-2.0.2-fix-145552.patch:
Index: evolution-2.0.2-fix-145552.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.0.2-fix-145552.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.0.2-fix-145552.patch 3 Aug 2005 02:50:06 -0000 1.1
+++ evolution-2.0.2-fix-145552.patch 4 Dec 2007 01:22:06 -0000 1.2
@@ -1,9 +1,9 @@
--- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400
+++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400
-@@ -1919,10 +1919,22 @@
+@@ -2176,10 +2176,22 @@
* try to do better with the filename check.
*/
-
+
+ /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal:
+ * So many file types come compressed by gzip
+ * that extensions are more reliable than magic
evolution-2.7.3-replicated-cjk-input.patch:
Index: evolution-2.7.3-replicated-cjk-input.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.7.3-replicated-cjk-input.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.3-replicated-cjk-input.patch 6 Jul 2006 16:01:59 -0000 1.1
+++ evolution-2.7.3-replicated-cjk-input.patch 4 Dec 2007 01:22:06 -0000 1.2
@@ -4,7 +4,7 @@
}
-- insert_preedit_text (text);
+- insert_preedit_text (text);
+ if (text->im_context_signals_registered)
+ insert_preedit_text (text);
evolution-2.7.4-deleting-preedit-buffer.patch:
Index: evolution-2.7.4-deleting-preedit-buffer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.7.4-deleting-preedit-buffer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.4-deleting-preedit-buffer.patch 31 Jul 2006 19:06:03 -0000 1.1
+++ evolution-2.7.4-deleting-preedit-buffer.patch 4 Dec 2007 01:22:06 -0000 1.2
@@ -7,12 +7,12 @@
- gint length = 0, cpos = 0, preedit_length = 0;
+ gint length = 0, cpos = 0;
gboolean new_attrs = FALSE;
-
+
if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context))
@@ -295,19 +295,15 @@
-
- g_string_prepend_len (tmp_string, text->text,length);
-
+
+ g_string_prepend_len (tmp_string, text->text,length);
+
- if (text->preedit_len)
- gtk_im_context_get_preedit_string (text->im_context,
- &preedit_string, &preedit_attrs,
@@ -20,39 +20,39 @@
+ /* we came into this function only when text->preedit_len was not 0
+ so we can saftely fetch the preedit string */
+ gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL);
-
+
if (preedit_string && g_utf8_validate (preedit_string, -1, NULL))
- text->preedit_len = preedit_length = strlen (preedit_string);
- else
- text->preedit_len = preedit_length = 0;
-
-- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
+- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
+ {
+ text->preedit_len = strlen (preedit_string);
+ cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
-
+
- if (preedit_length) {
g_string_insert (tmp_string, cpos, preedit_string);
-
+
reset_layout_attrs (text);
@@ -320,15 +316,17 @@
-
+
pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len);
-
+
- pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length);
+ pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len);
-
+
if (new_attrs) {
pango_layout_set_attributes (text->layout, attrs);
pango_attr_list_unref (attrs);
- }
+ }
-
+
update_im_cursor_position (text);
}
+ else
+ text->preedit_len = 0;
-
+
if (preedit_string)
g_free (preedit_string);
@@ -385,9 +383,12 @@
@@ -61,17 +61,17 @@
}
+
pango_layout_set_attributes (text->layout, attrs);
-+
++
if (attrs)
pango_attr_list_unref (attrs);
-+
++
calc_height (text);
}
-
+
@@ -1510,9 +1511,14 @@
}
}
-
+
-
- if (text->im_context_signals_registered)
- insert_preedit_text (text);
@@ -83,12 +83,12 @@
+ * when typing in CJK & using backspace on the preedit */
+ if(!text->preedit_len)
+ reset_layout (text);
-
+
if (!pango_layout_get_text (text->layout))
return;
@@ -2220,11 +2226,12 @@
*/
-
+
if (save_text && save_text->im_context) {
+ gtk_im_context_focus_out(save_text->im_context);
g_signal_handlers_disconnect_matched (save_text->im_context,
@@ -99,7 +99,7 @@
+ save_text->im_context_signals_registered = FALSE;
reset_layout (save_text);
}
-
+
@@ -2240,6 +2247,7 @@
G_CALLBACK (e_text_delete_surrounding_cb), text);
text->im_context_signals_registered = TRUE;
evolution-2.8.1-kill-ethread.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- evolution-2.8.1-kill-ethread.patch 12 Nov 2007 22:09:25 -0000 1.17
+++ evolution-2.8.1-kill-ethread.patch 4 Dec 2007 01:22:06 -0000 1.18
@@ -3,16 +3,16 @@
+++ evolution-2.21.1/mail/mail-send-recv.c 2007-10-29 14:47:20.000000000 -0400
@@ -775,23 +775,22 @@ receive_get_folder(CamelFilterDriver *d,
/* ********************************************************************** */
-
+
struct _refresh_folders_msg {
- struct _mail_msg msg;
+ MailMsg base;
-
+
struct _send_info *info;
GPtrArray *folders;
CamelStore *store;
};
-
+
-static char *
-refresh_folders_desc (struct _mail_msg *mm, int done)
+static gchar *
@@ -20,7 +20,7 @@
{
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)
@@ -31,7 +31,7 @@
CamelException ex = CAMEL_EXCEPTION_INITIALISER;
@@ -813,17 +812,14 @@ refresh_folders_get (struct _mail_msg *m
}
-
+
static void
-refresh_folders_got (struct _mail_msg *mm)
+refresh_folders_done (struct _refresh_folders_msg *m)
@@ -40,19 +40,19 @@
-
receive_done("", m->info);
}
-
+
static void
-refresh_folders_free (struct _mail_msg *mm)
+refresh_folders_free (struct _refresh_folders_msg *m)
{
- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
int i;
-
+
for (i=0;i<m->folders->len;i++)
@@ -832,11 +828,12 @@ refresh_folders_free (struct _mail_msg *
camel_object_unref(m->store);
}
-
+
-static struct _mail_msg_op refresh_folders_op = {
- refresh_folders_desc,
- refresh_folders_get,
@@ -65,19 +65,19 @@
+ (MailMsgDoneFunc) refresh_folders_done,
+ (MailMsgFreeFunc) refresh_folders_free
};
-
+
static void
@@ -869,13 +866,13 @@ receive_update_got_folderinfo(CamelStore
-
+
get_folders(store, folders, info);
-
+
- 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;
-
+
- e_thread_put(mail_thread_new, (EMsg *)m);
+ mail_msg_unordered_push (m);
} else {
@@ -89,7 +89,7 @@
@@ -1000,7 +1000,7 @@ impl_handleURI (PortableServer_Servant s
if (camel_url_get_param(url, "uid") != NULL) {
char *curi = em_uri_to_camel(uri);
-
+
- 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);
@@ -104,13 +104,13 @@
struct _filter_mail_msg {
- struct _mail_msg msg;
+ MailMsg base;
-
+
CamelFolder *source_folder; /* where they come from */
GPtrArray *source_uids; /* uids to copy, or NULL == copy all */
@@ -99,8 +99,8 @@ struct _fetch_mail_msg {
void *data;
};
-
+
-static char *
-em_filter_folder_element_describe (struct _mail_msg *mm, int complete)
+static gchar *
@@ -128,48 +128,48 @@
- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
CamelFolder *folder;
GPtrArray *uids, *folder_uids = NULL;
-
-@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct
+
+@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct
else
folder_uids = uids = camel_folder_get_uids (folder);
-
+
- camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex);
- camel_filter_driver_flush (m->driver, &mm->ex);
+ camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &m->base.ex);
+ camel_filter_driver_flush (m->driver, &m->base.ex);
-
+
if (folder_uids)
camel_folder_free_uids (folder, folder_uids);
-
+
/* sync our source folder */
if (!m->cache)
- camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex);
+ camel_folder_sync (folder, FALSE, camel_exception_is_set (&m->base.ex) ? NULL : &m->base.ex);
camel_folder_thaw (folder);
-
+
if (m->destination)
-@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct
+@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct
}
-
+
static void
-em_filter_folder_element_filtered (struct _mail_msg *mm)
+em_filter_folder_element_done (struct _filter_mail_msg *m)
{
}
-
+
static void
-em_filter_folder_element_free (struct _mail_msg *mm)
+em_filter_folder_element_free (struct _filter_mail_msg *m)
{
- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
--
+-
if (m->source_folder)
camel_object_unref (m->source_folder);
-
+
@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m
mail_session_flush_filter_log ();
}
-
+
-static struct _mail_msg_op em_filter_folder_element_op = {
- em_filter_folder_element_describe, /* we do our own progress reporting? */
- em_filter_folder_element_filter,
@@ -182,12 +182,12 @@
+ (MailMsgDoneFunc) em_filter_folder_element_done,
+ (MailMsgFreeFunc) em_filter_folder_element_free
};
-
+
void
@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_
{
struct _filter_mail_msg *m;
-
+
- m = mail_msg_new (&em_filter_folder_element_op, NULL, sizeof (*m));
+ m = mail_msg_new (&em_filter_folder_element_info);
m->source_folder = source_folder;
@@ -196,16 +196,16 @@
@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_
camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
}
-
+
[...6387 lines suppressed...]
@@ -7154,36 +7154,36 @@
+ msg = g_slice_new (struct _tray_msg);
+ msg->header.func = (MessageFunc) tray_list_remove_data_async;
+ msg->data = data;
-
+
- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__));
- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ message_push ((Message *) msg);
}
-
+
static void
@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data)
/* Add a new data to tray list */
-
+
static void
-tray_list_add_async (EThread *e, AlarmMsg *msg, void *data)
+tray_list_add_async (struct _tray_msg *msg)
{
- struct _tray_msg *list = msg->data;
-- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data));
+- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data));
- tray_icons_list = g_list_prepend (tray_icons_list, list->data);
-+ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data));
++ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data));
+ tray_icons_list = g_list_prepend (tray_icons_list, msg->data);
+
+ g_slice_free (struct _tray_msg, msg);
}
-
+
static void
tray_list_add_new (TrayIconData *data)
{
- AlarmMsg *msg;
- struct _tray_msg *list;
+ struct _tray_msg *msg;
-
+
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = tray_list_add_async;
@@ -7191,8 +7191,8 @@
- list = malloc (sizeof (struct _tray_msg));
- list->data = data;
- msg->data = list;
--
-- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__));
+-
+- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__));
- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ msg = g_slice_new (struct _tray_msg);
+ msg->header.func = (MessageFunc) tray_list_add_async;
@@ -7200,43 +7200,43 @@
+
+ message_push ((Message *) msg);
}
-
+
/* Performs notification of a display alarm */
@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da
new_midnight = time_day_end_with_zone (time (NULL), zone);
-
+
if (new_midnight > midnight) {
- AlarmMsg *msg;
- struct _midnight_refresh_msg *list;
--
+-
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = midnight_refresh_async;
-
- list = malloc (sizeof (struct _midnight_refresh_msg));
+ struct _midnight_refresh_msg *msg;
-
+
- list->remove = FALSE;
- /* We dont need it. So set it to NULL */
- msg->data = list;
+ msg = g_slice_new (struct _midnight_refresh_msg);
+ msg->header.func = (MessageFunc) midnight_refresh_async;
+ msg->remove = FALSE;
-
+
- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__));
-- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ message_push ((Message *) msg);
}
-
+
return TRUE;
@@ -1981,14 +1970,15 @@ hash_ids (gpointer a)
}
-
+
struct _alarm_client_msg {
+ Message header;
ECal *client;
};
-
+
-static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data)
+static void
+alarm_queue_add_async (struct _alarm_client_msg *msg)
@@ -7245,17 +7245,17 @@
- struct _alarm_client_msg *list = msg->data;
- ECal *client = list->client;
+ ECal *client = msg->client;
-
+
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);
}
-
+
/**
@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre
void
@@ -7264,7 +7264,7 @@
- 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;
@@ -7276,12 +7276,12 @@
+ msg = g_slice_new (struct _alarm_client_msg);
+ msg->header.func = (MessageFunc) alarm_queue_add_async;
+ msg->client = g_object_ref (client);
-
+
- 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);
}
-
+
/* Removes a component an its alarms */
@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca)
* Removes a calendar client from the alarm queueing system.
@@ -7294,17 +7294,17 @@
- struct _alarm_client_msg *list = msg->data;
- ECal *client = list->client;
+ ECal *client = msg->client;
-
+
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);
-
+
g_hash_table_remove (client_alarms_hash, client);
+
+ g_slice_free (struct _alarm_client_msg, msg);
}
-
+
/** alarm_queue_remove_client
@@ -2156,24 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al
void
@@ -7313,7 +7313,7 @@
- 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;
@@ -7324,7 +7324,7 @@
+ msg = g_slice_new (struct _alarm_client_msg);
+ msg->header.func = (MessageFunc) alarm_queue_remove_async;
+ msg->client = client;
-
+
- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
if (immediately) {
- alarm_queue_remove_async (NULL, msg, NULL);
@@ -7335,5 +7335,5 @@
- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ message_push ((Message *) msg);
}
-
- /* Update non-time related variables for various structures on modification of an existing component
+
+ /* 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- evolution-2.9.1-kill-ememory.patch 1 Dec 2007 15:58:47 -0000 1.7
+++ evolution-2.9.1-kill-ememory.patch 4 Dec 2007 01:22:06 -0000 1.8
@@ -4,7 +4,7 @@
@@ -416,70 +416,28 @@ get_message_info (MessageList *message_l
return info;
}
-
+
-static const char *
-get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col)
+static const gchar *
@@ -14,7 +14,7 @@
- char *normalised;
- EPoolv *poolv;
- int index;
--
+-
- switch (col) {
- case COL_SUBJECT_NORM:
- string = camel_message_info_subject (info);
@@ -33,7 +33,7 @@
- index = NORMALISED_LAST;
- g_warning ("Should not be reached\n");
- }
--
+-
- /* slight optimisation */
- if (string == NULL || string[0] == '\0')
+ GHashTable *hash_table = message_list->normalised_hash;
@@ -42,7 +42,7 @@
+
+ if (string == NULL || *string == '\0')
return "";
--
+-
- poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info));
- if (poolv == NULL) {
- poolv = e_poolv_new (NORMALISED_LAST);
@@ -52,29 +52,29 @@
- if (*str)
- return str;
- }
--
+-
- if (col == COL_SUBJECT_NORM) {
- const unsigned char *subject;
--
+-
- subject = (const unsigned char *) string;
- while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) {
- subject += 3;
--
+-
- /* jump over any spaces */
- while (*subject && isspace ((int) *subject))
- subject++;
- }
--
+-
- /* jump over any spaces */
- while (*subject && isspace ((int) *subject))
- subject++;
--
+-
- string = (const char *) subject;
- }
--
+-
- normalised = g_utf8_collate_key (string, -1);
- e_poolv_set (poolv, index, normalised, TRUE);
--
+-
- return e_poolv_get (poolv, index);
+
+ collation_key = g_hash_table_lookup (hash_table, string);
@@ -90,7 +90,7 @@
+
+ return collation_key;
}
-
+
static void
@@ -1287,12 +1245,23 @@ ml_tree_value_at (ETreeModel *etm, ETree
str = camel_message_info_from (msg_info);
@@ -117,7 +117,7 @@
+ return (void *) get_normalised_string (message_list, str);
case COL_SENT: {
ETreePath child;
-
+
@@ -1316,7 +1285,8 @@ ml_tree_value_at (ETreeModel *etm, ETree
str = camel_message_info_to (msg_info);
return (void *)(str ? str : "");
@@ -131,7 +131,7 @@
@@ -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,
@@ -140,22 +140,22 @@
+ g_hash_table_new (g_str_hash, g_str_equal);
+
+ message_list->string_chunk = g_string_chunk_new (1024);
-
+
message_list->hidden = NULL;
- message_list->hidden_pool = NULL;
+ message_list->hidden_string_chunk = NULL;
message_list->hide_before = ML_HIDE_NONE_START;
message_list->hide_after = ML_HIDE_NONE_END;
-
+
@@ -2166,15 +2136,16 @@ message_list_finalise (GObject *object)
struct _MessageListPrivate *p = message_list->priv;
-
+
g_hash_table_destroy (message_list->normalised_hash);
+ g_string_chunk_free (message_list->string_chunk);
-
+
if (message_list->thread_tree)
camel_folder_thread_messages_unref(message_list->thread_tree);
-
+
if (message_list->hidden) {
g_hash_table_destroy(message_list->hidden);
- e_mempool_destroy(message_list->hidden_pool);
@@ -164,18 +164,18 @@
- message_list->hidden_pool = NULL;
+ message_list->hidden_string_chunk = NULL;
}
-
+
g_free(message_list->search);
@@ -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);
+
+ g_string_chunk_free (message_list->string_chunk);
+ message_list->string_chunk = g_string_chunk_new (1024);
-
+
mail_regen_cancel(message_list);
-
+
@@ -3574,14 +3548,14 @@ message_list_hide_uids (MessageList *ml,
MESSAGE_LIST_LOCK (ml, hide_lock);
if (ml->hidden == NULL) {
@@ -183,7 +183,7 @@
- ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE);
+ ml->hidden_string_chunk = g_string_chunk_new (512);
}
-
+
- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
+ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]);
g_hash_table_insert (ml->hidden, uid, uid);
@@ -229,21 +229,21 @@
camel_file_util_decode_fixed_int32 (in, &upper);
@@ -3662,7 +3636,7 @@ load_hide_state (MessageList *ml)
char *olduid, *uid;
-
+
if (camel_file_util_decode_string (in, &olduid) != -1) {
- uid = e_mempool_strdup(ml->hidden_pool, olduid);
+ uid = g_string_chunk_insert(ml->hidden_string_chunk, olduid);
g_free (olduid);
g_hash_table_insert(ml->hidden, uid, uid);
}
-@@ -3811,12 +3785,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);
- m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE);
+ m->ml->hidden_string_chunk = g_string_chunk_new (512);
}
-
+
for (i = 0; i < uidnew->len; i++) {
if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) {
- char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]);
@@ -256,10 +256,10 @@
+++ 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 */
-
+
GHashTable *normalised_hash;
+ GStringChunk *string_chunk;
-
+
/* UID's to hide. Keys in the mempool */
/* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */
GHashTable *hidden;
@@ -267,4 +267,4 @@
+ GStringChunk *hidden_string_chunk;
int hide_unhidden; /* total length, before hiding */
int hide_before, hide_after; /* hide ranges of messages */
-
+
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- evolution.spec 1 Dec 2007 15:58:47 -0000 1.307
+++ evolution.spec 4 Dec 2007 01:22:06 -0000 1.308
@@ -44,8 +44,8 @@
### Abstract ###
Name: evolution
-Version: 2.21.2
-Release: 4%{?dist}
+Version: 2.21.3
+Release: 1%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -110,16 +110,10 @@
# RH bug #215478 / GNOME bug #383842
Patch30: evolution-2.9.3-source-path-entry.patch
-# RH bug #215467 / GNOME bug #380644
-Patch31: evolution-2.9.3-meeting-list-view.patch
-
# GNOME bug #376991
# XXX Disabled due to outstanding issues.
#Patch33: evolution-2.10.0-e-passwords.patch
-# GNOME bug #499920
-Patch34: evolution-2.21.2-invalid-include.patch
-
## Dependencies ###
Requires(post): GConf2
@@ -252,9 +246,7 @@
%patch27 -p1 -b .im-context-reset
#%patch29 -p1 -b .view-attachment-uri
%patch30 -p1 -b .source-path-entry
-%patch31 -p1 -b .meeting-list-view
#%patch33 -p1 -b .e-passwords
-%patch34 -p1 -b .invalid-include
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -680,6 +672,11 @@
%endif
%changelog
+* Mon Dec 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.3-1.fc9
+- Update to 2.21.3
+- Remove patch for RH bug #215467 (fixed upstream).
+- Remove patch for GNOME bug #499920 (fixed upstream).
+
* Sat Dec 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.2-4.fc9
- Fix a corrupted patch that caused GNOME bug #499291.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources 12 Nov 2007 22:09:25 -0000 1.81
+++ sources 4 Dec 2007 01:22:06 -0000 1.82
@@ -1 +1 @@
-833cf5f76ec30170d22f04948fba9997 evolution-2.21.2.tar.bz2
+c8e4b72d503cc37ae9936dff06ae1d26 evolution-2.21.3.tar.bz2
--- evolution-2.21.2-invalid-include.patch DELETED ---
--- evolution-2.9.3-meeting-list-view.patch DELETED ---
- Previous message: rpms/jpoker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/libsvm/F-7 libsvm-2.84-7.patch, NONE, 1.1 libsvm.spec, 1.4, 1.5 libsvm-2.84-6.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list