rpms/evolution/devel evolution-2.8.1-kill-ethread.patch, 1.4, 1.5 evolution.spec, 1.260, 1.261
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Wed May 16 21:09:12 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21801
Modified Files:
evolution-2.8.1-kill-ethread.patch evolution.spec
Log Message:
* Wed May 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-17.fc7
- Revise patch for GNOME bug #362638 to fix RH bug #237206
(certificate prompt causes crash, again).
evolution-2.8.1-kill-ethread.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-2.8.1-kill-ethread.patch 11 Apr 2007 03:11:35 -0000 1.4
+++ evolution-2.8.1-kill-ethread.patch 16 May 2007 21:08:37 -0000 1.5
@@ -1,16 +1,89 @@
--- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-send-recv.c 2007-04-10 22:37:49.000000000 -0400
-@@ -819,7 +819,7 @@
++++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-16 16:17:38.000000000 -0400
+@@ -725,23 +725,22 @@
+ /* ********************************************************************** */
+
+ 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 *
++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)
+ {
+- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
+ int i;
+ CamelFolder *folder;
+
+@@ -757,17 +756,14 @@
+ }
+
+ static void
+-refresh_folders_got (struct _mail_msg *mm)
++refresh_folders_done (struct _refresh_folders_msg *m)
+ {
+- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
+-
+ 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++)
+@@ -776,11 +772,12 @@
+ camel_object_unref(m->store);
+ }
+
+-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 void
+@@ -813,13 +810,13 @@
+
+ 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 ((mail_msg_t *) m);
++ mail_msg_unordered_push (m);
} else {
receive_done ("", data);
}
--- evolution-2.10.1/mail/mail-component.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-component.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/mail/mail-component.c 2007-05-16 16:17:38.000000000 -0400
@@ -965,7 +965,7 @@
if (camel_url_get_param(url, "uid") != NULL) {
char *curi = em_uri_to_camel(uri);
@@ -21,407 +94,3617 @@
} else {
g_warning("email uri's must include a uid parameter");
--- evolution-2.10.1/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.1/mail/mail-ops.c 2007-04-10 22:37:49.000000000 -0400
-@@ -221,7 +221,7 @@
++++ evolution-2.10.1/mail/mail-ops.c 2007-05-16 16:19:33.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 _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 @@
+ void *data;
+ };
+
+-static char *
+-em_filter_folder_element_describe (struct _mail_msg *mm, int complete)
++static gchar *
++em_filter_folder_element_desc (struct _filter_mail_msg *m)
+ {
+ return g_strdup (_("Filtering Selected Messages"));
+ }
+@@ -108,9 +108,8 @@
+ /* filter a folder, or a subset thereof, uses source_folder/source_uids */
+ /* this is shared with fetch_mail */
+ static void
+-em_filter_folder_element_filter (struct _mail_msg *mm)
++em_filter_folder_element_exec (struct _filter_mail_msg *m)
+ {
+- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
+ CamelFolder *folder;
+ GPtrArray *uids, *folder_uids = NULL;
+
+@@ -137,15 +136,15 @@
+ 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 @@
+ }
+
+ 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 @@
+ 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,
+- em_filter_folder_element_filtered,
+- em_filter_folder_element_free,
++static MailMsgInfo em_filter_folder_element_info = {
++ sizeof (struct _filter_mail_msg),
++ (MailMsgDescFunc) em_filter_folder_element_desc, /* we do our own progress reporting? */
++ (MailMsgExecFunc) em_filter_folder_element_exec,
++ (MailMsgDoneFunc) em_filter_folder_element_done,
++ (MailMsgFreeFunc) em_filter_folder_element_free
+ };
+
+ void
+@@ -202,7 +200,7 @@
+ {
+ struct _filter_mail_msg *m;
+
+- m = mail_msg_new (&em_filter_folder_element_op, NULL, sizeof (*m));
[...5423 lines suppressed...]
+
+ static void
+-folder_unsubscribe__free (struct _mail_msg *mm)
++folder_unsubscribe_free (struct _folder_unsub_t *msg)
+ {
+- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-
+- g_free (unsub->uri);
++ g_free (msg->uri);
+ }
+
+-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
+ };
+
+
+@@ -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 ((mail_msg_t *) unsub);
++ mail_msg_unordered_push (unsub);
}
--- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400
-+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-05-16 16:17:38.000000000 -0400
@@ -44,7 +44,7 @@
return;
}
@@ -1926,7 +6094,7 @@
static void
--- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-04-09 09:09:13.000000000 -0400
-+++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-05-16 16:17:38.000000000 -0400
@@ -134,7 +134,7 @@
inbox_physical_uri = e_folder_get_physical_uri (inbox);
@@ -1937,7 +6105,7 @@
}
--- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-09 09:09:15.000000000 -0400
-+++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-05-16 16:17:38.000000000 -0400
@@ -407,5 +407,5 @@
camel_object_ref(data->folder);
data->uid = g_strdup(target->uids->pdata[0]);
@@ -1946,7 +6114,7 @@
+ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
}
--- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400
-+++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-16 16:17:38.000000000 -0400
@@ -89,7 +89,7 @@
data->uri = strdup (sel->uri);
@@ -1957,18 +6125,106 @@
void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
--- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-09 09:09:12.000000000 -0400
-+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-04-10 22:37:49.000000000 -0400
-@@ -239,7 +239,7 @@
++++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-05-16 16:17:38.000000000 -0400
+@@ -121,7 +121,7 @@
+ }
+
+ struct _EMCreateFolder {
+- struct _mail_msg msg;
++ MailMsg base;
+
+ /* input data */
+ CamelStore *store;
+@@ -137,31 +137,26 @@
+ void *user_data;
+ };
+
+-static char *
+-create_folder__desc (struct _mail_msg *mm, int done)
++static gchar *
++create_folder_desc (struct _EMCreateFolder *m)
+ {
+- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
+-
+ return g_strdup_printf (_("Creating folder `%s'"), m->full_name);
+ }
+
+ static void
+-create_folder__create (struct _mail_msg *mm)
++create_folder_exec (struct _EMCreateFolder *m)
+ {
+- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
+-
+ d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name));
+
+- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) {
++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) {
+ if (camel_store_supports_subscriptions (m->store))
+- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex);
++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex);
+ }
+ }
+
+ static void
+-create_folder__created (struct _mail_msg *mm)
++create_folder_done (struct _EMCreateFolder *m)
+ {
+- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
+ struct ShareInfo *ssi = (struct ShareInfo *) m->user_data;
+ CamelStore *store = CAMEL_STORE (m->store) ;
+ EGwConnection *ccnc;
+@@ -180,10 +175,8 @@
+ }
+
+ static void
+-create_folder__free (struct _mail_msg *mm)
++create_folder_free (struct _EMCreateFolder *m)
+ {
+- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
+-
+ camel_store_free_folder_info (m->store, m->fi);
+ camel_object_unref (m->store);
+ g_free (m->full_name);
+@@ -191,11 +184,12 @@
+ g_free (m->name);
+ }
+
+-static struct _mail_msg_op create_folder_op = {
+- create_folder__desc,
+- create_folder__create,
+- create_folder__created,
+- create_folder__free,
++static MailMsgInfo create_folder_info = {
++ sizeof (struct _EMCreateFolder),
++ (MailMsgDescFunc) create_folder_desc,
++ (MailMsgExecFunc) create_folder_exec,
++ (MailMsgDoneFunc) create_folder_done,
++ (MailMsgFreeFunc) create_folder_free
+ };
+
+ static void
+@@ -229,7 +223,7 @@
+ parent = namebuf;
+ }
+
+- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder));
++ m = mail_msg_new (&create_folder_info);
+ camel_object_ref (store);
+ m->store = store;
+ m->full_name = g_strdup (full_name);
+@@ -238,8 +232,8 @@
+ m->user_data = (struct ShareInfo *) user_data;
m->done = done;
g_free (namebuf);
- id = m->msg.seq;
+- id = m->msg.seq;
- e_thread_put (mail_thread_new, (EMsg *) m);
-+ mail_msg_unordered_push ((mail_msg_t *) m);
++ id = m->base.seq;
++ mail_msg_unordered_push (m);
return id;
}
--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-05-16 16:17:38.000000000 -0400
@@ -39,19 +39,6 @@
typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
@@ -1990,7 +6246,7 @@
BonoboObject object;
--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-05-16 16:17:38.000000000 -0400
@@ -45,10 +45,6 @@
GMutex *mutex;
};
@@ -2104,7 +6360,7 @@
static void
--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-10 22:37:49.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-05-16 16:17:38.000000000 -0400
@@ -115,9 +115,6 @@
static int tray_blink_state = FALSE;
static AlarmNotify *an;
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- evolution.spec 15 May 2007 19:18:49 -0000 1.260
+++ evolution.spec 16 May 2007 21:08:37 -0000 1.261
@@ -47,7 +47,7 @@
Name: evolution
Version: 2.10.1
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -759,6 +759,10 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed May 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-17.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #237206
+ (certificate prompt causes crash, again).
+
* Tue May 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-16.fc7
- Add patch for RH bug #240147 (Send/Receive dialog layout).
More information about the fedora-extras-commits
mailing list