rpms/evolution/F-7 evolution-2.8.1-kill-ethread.patch,1.9,1.10
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Thu Aug 30 03:11:45 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv961
Modified Files:
evolution-2.8.1-kill-ethread.patch
Log Message:
* Wed Aug 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-4.fc7
- Revise patch for GNOME bug #362638 to fix GNOME bug #357175
(Evolution fails to close after IMAP alert has been displayed).
evolution-2.8.1-kill-ethread.patch:
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- evolution-2.8.1-kill-ethread.patch 30 Aug 2007 02:13:30 -0000 1.9
+++ evolution-2.8.1-kill-ethread.patch 30 Aug 2007 03:11:41 -0000 1.10
@@ -1,6 +1,6 @@
diff -up evolution-2.10.3/mail/mail-send-recv.c.kill-ethread evolution-2.10.3/mail/mail-send-recv.c
--- evolution-2.10.3/mail/mail-send-recv.c.kill-ethread 2007-06-30 15:22:35.000000000 -0400
-+++ evolution-2.10.3/mail/mail-send-recv.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-send-recv.c 2007-08-29 22:51:25.000000000 -0400
@@ -725,23 +725,22 @@ receive_get_folder(CamelFilterDriver *d,
/* ********************************************************************** */
@@ -85,7 +85,7 @@
}
diff -up evolution-2.10.3/mail/mail-component.c.kill-ethread evolution-2.10.3/mail/mail-component.c
--- evolution-2.10.3/mail/mail-component.c.kill-ethread 2007-05-27 15:55:12.000000000 -0400
-+++ evolution-2.10.3/mail/mail-component.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-component.c 2007-08-29 22:51:25.000000000 -0400
@@ -982,7 +982,7 @@ impl_handleURI (PortableServer_Servant s
if (camel_url_get_param(url, "uid") != NULL) {
char *curi = em_uri_to_camel(uri);
@@ -97,7 +97,7 @@
g_warning("email uri's must include a uid parameter");
diff -up evolution-2.10.3/mail/mail-ops.c.kill-ethread evolution-2.10.3/mail/mail-ops.c
--- evolution-2.10.3/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-ops.c 2007-08-29 18:17:08.000000000 -0400
++++ evolution-2.10.3/mail/mail-ops.c 2007-08-29 22:51:25.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 */
@@ -2147,7 +2147,7 @@
}
diff -up evolution-2.10.3/mail/em-folder-utils.c.kill-ethread evolution-2.10.3/mail/em-folder-utils.c
--- evolution-2.10.3/mail/em-folder-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-folder-utils.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-folder-utils.c 2007-08-29 22:51:25.000000000 -0400
@@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char
}
@@ -2377,7 +2377,7 @@
}
diff -up evolution-2.10.3/mail/importers/elm-importer.c.kill-ethread evolution-2.10.3/mail/importers/elm-importer.c
--- evolution-2.10.3/mail/importers/elm-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400
-+++ evolution-2.10.3/mail/importers/elm-importer.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/importers/elm-importer.c 2007-08-29 22:51:25.000000000 -0400
@@ -51,7 +51,7 @@
#define d(x) x
@@ -2478,7 +2478,7 @@
}
diff -up evolution-2.10.3/mail/importers/mail-importer.c.kill-ethread evolution-2.10.3/mail/importers/mail-importer.c
--- evolution-2.10.3/mail/importers/mail-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400
-+++ evolution-2.10.3/mail/importers/mail-importer.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/importers/mail-importer.c 2007-08-29 22:51:25.000000000 -0400
@@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact
}
@@ -2617,7 +2617,7 @@
struct _import_folders_data {
diff -up evolution-2.10.3/mail/importers/pine-importer.c.kill-ethread evolution-2.10.3/mail/importers/pine-importer.c
--- evolution-2.10.3/mail/importers/pine-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400
-+++ evolution-2.10.3/mail/importers/pine-importer.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/importers/pine-importer.c 2007-08-29 22:51:25.000000000 -0400
@@ -56,7 +56,7 @@
#define d(x) x
@@ -2718,8 +2718,8 @@
return id;
}
diff -up evolution-2.10.3/mail/em-utils.c.kill-ethread evolution-2.10.3/mail/em-utils.c
---- evolution-2.10.3/mail/em-utils.c.kill-ethread 2007-08-29 18:12:19.000000000 -0400
-+++ evolution-2.10.3/mail/em-utils.c 2007-08-29 18:13:23.000000000 -0400
+--- evolution-2.10.3/mail/em-utils.c.kill-ethread 2007-08-29 22:51:25.000000000 -0400
++++ evolution-2.10.3/mail/em-utils.c 2007-08-29 22:51:25.000000000 -0400
@@ -1915,7 +1915,7 @@ em_utils_in_addressbook(CamelInternetAdd
ESource *source = s->data;
GList *contacts;
@@ -2731,7 +2731,7 @@
diff -up evolution-2.10.3/mail/mail-vfolder.c.kill-ethread evolution-2.10.3/mail/mail-vfolder.c
--- evolution-2.10.3/mail/mail-vfolder.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-vfolder.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-vfolder.c 2007-08-29 22:51:25.000000000 -0400
@@ -21,7 +21,7 @@
*/
@@ -2968,7 +2968,7 @@
to = em_uri_from_camel(cto);
diff -up evolution-2.10.3/mail/em-format-html.c.kill-ethread evolution-2.10.3/mail/em-format-html.c
--- evolution-2.10.3/mail/em-format-html.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-format-html.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-format-html.c 2007-08-29 22:51:25.000000000 -0400
@@ -166,7 +166,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor
if (efh->priv->format_timeout_id != 0) {
g_source_remove(efh->priv->format_timeout_id);
@@ -3095,7 +3095,7 @@
m->format_source = emfsource;
diff -up evolution-2.10.3/mail/em-folder-properties.c.kill-ethread evolution-2.10.3/mail/em-folder-properties.c
--- evolution-2.10.3/mail/em-folder-properties.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-folder-properties.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-folder-properties.c 2007-08-29 22:51:25.000000000 -0400
@@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par
}
@@ -3107,7 +3107,7 @@
}
diff -up evolution-2.10.3/mail/em-folder-tree.c.kill-ethread evolution-2.10.3/mail/em-folder-tree.c
--- evolution-2.10.3/mail/em-folder-tree.c.kill-ethread 2007-05-28 09:06:42.000000000 -0400
-+++ evolution-2.10.3/mail/em-folder-tree.c 2007-08-29 18:15:11.000000000 -0400
++++ evolution-2.10.3/mail/em-folder-tree.c 2007-08-29 22:51:25.000000000 -0400
@@ -834,7 +834,7 @@ fail:
/* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */
/* Drop handling */
@@ -3344,7 +3344,7 @@
static gboolean
diff -up evolution-2.10.3/mail/em-folder-browser.c.kill-ethread evolution-2.10.3/mail/em-folder-browser.c
--- evolution-2.10.3/mail/em-folder-browser.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-folder-browser.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-folder-browser.c 2007-08-29 22:51:25.000000000 -0400
@@ -838,7 +838,7 @@ get_view_query (ESearchBar *esb)
@@ -3448,7 +3448,7 @@
}
diff -up evolution-2.10.3/mail/message-list.c.kill-ethread evolution-2.10.3/mail/message-list.c
--- evolution-2.10.3/mail/message-list.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/message-list.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/message-list.c 2007-08-29 22:51:25.000000000 -0400
@@ -1802,7 +1802,7 @@ ml_tree_drag_data_get (ETree *tree, int
/* TODO: merge this with the folder tree stuff via empopup targets */
/* Drop handling */
@@ -3727,7 +3727,7 @@
m->hideexpr = g_strdup (hideexpr);
diff -up evolution-2.10.3/mail/em-sync-stream.h.kill-ethread evolution-2.10.3/mail/em-sync-stream.h
--- evolution-2.10.3/mail/em-sync-stream.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-sync-stream.h 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-sync-stream.h 2007-08-29 22:51:25.000000000 -0400
@@ -29,41 +29,45 @@ requests are always handled in the main
#ifndef EM_SYNC_STREAM_H
#define EM_SYNC_STREAM_H
@@ -3806,7 +3806,7 @@
#endif /* EM_SYNC_STREAM_H */
diff -up evolution-2.10.3/mail/em-format-html-print.c.kill-ethread evolution-2.10.3/mail/em-format-html-print.c
--- evolution-2.10.3/mail/em-format-html-print.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-format-html-print.c 2007-08-29 18:15:39.000000000 -0400
++++ evolution-2.10.3/mail/em-format-html-print.c 2007-08-29 22:51:25.000000000 -0400
@@ -262,7 +262,7 @@ int em_format_html_print_message(EMForma
g_object_ref(source);
g_object_ref(efhp);
@@ -3818,7 +3818,7 @@
}
diff -up evolution-2.10.3/mail/em-sync-stream.c.kill-ethread evolution-2.10.3/mail/em-sync-stream.c
--- evolution-2.10.3/mail/em-sync-stream.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-sync-stream.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-sync-stream.c 2007-08-29 22:51:25.000000000 -0400
@@ -25,42 +25,17 @@
#include <config.h>
#endif
@@ -4246,7 +4246,7 @@
}
diff -up evolution-2.10.3/mail/em-subscribe-editor.c.kill-ethread evolution-2.10.3/mail/em-subscribe-editor.c
--- evolution-2.10.3/mail/em-subscribe-editor.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-subscribe-editor.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-subscribe-editor.c 2007-08-29 22:51:25.000000000 -0400
@@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub)
/* ** Subscribe folder operation **************************************** */
@@ -4464,7 +4464,7 @@
}
diff -up evolution-2.10.3/mail/mail-mt.h.kill-ethread evolution-2.10.3/mail/mail-mt.h
--- evolution-2.10.3/mail/mail-mt.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-mt.h 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-mt.h 2007-08-29 22:51:25.000000000 -0400
@@ -23,47 +23,64 @@
#ifndef _MAIL_MT
#define _MAIL_MT
@@ -4578,7 +4578,7 @@
extern MailAsyncEvent *mail_async_event;
diff -up evolution-2.10.3/mail/mail-ops.h.kill-ethread evolution-2.10.3/mail/mail-ops.h
--- evolution-2.10.3/mail/mail-ops.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-ops.h 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-ops.h 2007-08-29 22:51:25.000000000 -0400
@@ -30,13 +30,14 @@ extern "C" {
#pragma }
#endif /* __cplusplus */
@@ -4621,7 +4621,7 @@
int mail_get_store (const char *uri, CamelOperation *op,
diff -up evolution-2.10.3/mail/em-composer-utils.c.kill-ethread evolution-2.10.3/mail/em-composer-utils.c
--- evolution-2.10.3/mail/em-composer-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/em-composer-utils.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/em-composer-utils.c 2007-08-29 22:51:25.000000000 -0400
@@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom
strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
int id;
@@ -4667,7 +4667,7 @@
}
diff -up evolution-2.10.3/mail/mail-folder-cache.c.kill-ethread evolution-2.10.3/mail/mail-folder-cache.c
--- evolution-2.10.3/mail/mail-folder-cache.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-folder-cache.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-folder-cache.c 2007-08-29 22:51:25.000000000 -0400
@@ -843,15 +843,14 @@ update_folders(CamelStore *store, CamelF
@@ -4755,7 +4755,7 @@
diff -up evolution-2.10.3/mail/em-folder-view.c.kill-ethread evolution-2.10.3/mail/em-folder-view.c
--- evolution-2.10.3/mail/em-folder-view.c.kill-ethread 2007-06-17 23:30:46.000000000 -0400
-+++ evolution-2.10.3/mail/em-folder-view.c 2007-08-29 18:14:08.000000000 -0400
++++ evolution-2.10.3/mail/em-folder-view.c 2007-08-29 22:51:25.000000000 -0400
@@ -68,6 +68,7 @@
#include <gtkhtml/gtkhtml-stream.h>
@@ -4802,7 +4802,7 @@
g_free(emfv->priv->selected_uid);
diff -up evolution-2.10.3/mail/mail-session.c.kill-ethread evolution-2.10.3/mail/mail-session.c
--- evolution-2.10.3/mail/mail-session.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-session.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-session.c 2007-08-29 22:51:25.000000000 -0400
@@ -35,7 +35,7 @@
#include <libgnome/gnome-sound.h>
@@ -5101,7 +5101,7 @@
}
diff -up evolution-2.10.3/mail/mail-mt.c.kill-ethread evolution-2.10.3/mail/mail-mt.c
--- evolution-2.10.3/mail/mail-mt.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
-+++ evolution-2.10.3/mail/mail-mt.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/mail/mail-mt.c 2007-08-29 22:51:25.000000000 -0400
@@ -29,8 +29,8 @@
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
@@ -6183,7 +6183,7 @@
/* ******************** */
diff -up evolution-2.10.3/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.10.3/plugins/folder-unsubscribe/folder-unsubscribe.c
--- evolution-2.10.3/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-09 09:09:11.000000000 -0400
-+++ evolution-2.10.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-29 22:51:25.000000000 -0400
@@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe (
@@ -6265,7 +6265,7 @@
}
diff -up evolution-2.10.3/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.10.3/plugins/mark-all-read/mark-all-read.c
--- evolution-2.10.3/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-27 14:21:10.000000000 -0400
-+++ evolution-2.10.3/plugins/mark-all-read/mark-all-read.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/plugins/mark-all-read/mark-all-read.c 2007-08-29 22:51:25.000000000 -0400
@@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM
return;
}
@@ -6277,7 +6277,7 @@
static void
diff -up evolution-2.10.3/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.10.3/plugins/exchange-operations/exchange-folder.c
--- evolution-2.10.3/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-25 02:43:33.000000000 -0400
-+++ evolution-2.10.3/plugins/exchange-operations/exchange-folder.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/plugins/exchange-operations/exchange-folder.c 2007-08-29 22:51:25.000000000 -0400
@@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr
inbox_physical_uri = e_folder_get_physical_uri (inbox);
@@ -6289,7 +6289,7 @@
}
diff -up evolution-2.10.3/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.10.3/plugins/save-attachments/save-attachments.c
--- evolution-2.10.3/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-09 09:09:15.000000000 -0400
-+++ evolution-2.10.3/plugins/save-attachments/save-attachments.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/plugins/save-attachments/save-attachments.c 2007-08-29 22:51:25.000000000 -0400
@@ -407,5 +407,5 @@ org_gnome_save_attachments_save(EPlugin
camel_object_ref(data->folder);
data->uid = g_strdup(target->uids->pdata[0]);
@@ -6299,7 +6299,7 @@
}
diff -up evolution-2.10.3/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.10.3/plugins/mailing-list-actions/mailing-list-actions.c
--- evolution-2.10.3/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400
-+++ evolution-2.10.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-29 22:51:25.000000000 -0400
@@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM
data->uri = strdup (sel->uri);
@@ -6311,7 +6311,7 @@
void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
diff -up evolution-2.10.3/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.10.3/plugins/groupwise-features/share-folder-common.c
--- evolution-2.10.3/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-09 09:09:12.000000000 -0400
-+++ evolution-2.10.3/plugins/groupwise-features/share-folder-common.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/plugins/groupwise-features/share-folder-common.c 2007-08-29 22:51:25.000000000 -0400
@@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi
}
@@ -6411,7 +6411,7 @@
}
diff -up evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.h
--- evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.h 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.h 2007-08-29 22:51:25.000000000 -0400
@@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo
typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
@@ -6434,7 +6434,7 @@
diff -up evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.c
--- evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/calendar/gui/alarm-notify/alarm-notify.c 2007-08-29 22:51:25.000000000 -0400
@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate {
GMutex *mutex;
};
@@ -6549,7 +6549,7 @@
static void
diff -up evolution-2.10.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.10.3/calendar/gui/alarm-notify/alarm-queue.c
--- evolution-2.10.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/alarm-notify/alarm-queue.c 2007-08-29 18:13:23.000000000 -0400
++++ evolution-2.10.3/calendar/gui/alarm-notify/alarm-queue.c 2007-08-29 23:10:45.000000000 -0400
@@ -115,9 +115,6 @@ static int tray_blink_id = -1;
static int tray_blink_state = FALSE;
static AlarmNotify *an;
@@ -6763,8 +6763,7 @@
{
- AlarmMsg *msg;
- struct _query_msg *list;
-+ struct _query_msg *msg;
-
+-
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = query_objects_removed_async;
@@ -6774,7 +6773,8 @@
- list->objects = duplicate_ecal (objects);
- list->data = data;
- msg->data = list;
--
++ struct _query_msg *msg;
+
- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__));
- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ msg = g_slice_new (struct _query_msg);
@@ -6825,12 +6825,12 @@
{
- AlarmMsg *msg;
- struct _query_msg *list;
--
++ struct _query_msg *msg;
+
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = on_dialog_objs_removed_async;
-+ struct _query_msg *msg;
-
+-
- list = malloc (sizeof (struct _query_msg));
- list->client = client;
- list->objects = objects;
@@ -6878,11 +6878,12 @@
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = tray_list_remove_cqa_async;
-+ struct _tray_cqa_msg *msg;
-
+-
- list = malloc (sizeof (struct _tray_cqa_msg));
- list->cqa = cqa;
- msg->data = list;
++ struct _tray_cqa_msg *msg;
++
+ msg = g_slice_new (struct _tray_cqa_msg);
+ msg->header.func = (MessageFunc) tray_list_remove_cqa_async;
+ msg->cqa = cqa;
@@ -6957,11 +6958,12 @@
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = tray_list_remove_data_async;
-+ struct _tray_msg *msg;
-
+-
- list = malloc (sizeof (struct _tray_msg));
- list->data = data;
- msg->data = list;
++ struct _tray_msg *msg;
++
+ msg = g_slice_new (struct _tray_msg);
+ msg->header.func = (MessageFunc) tray_list_remove_data_async;
+ msg->data = data;
@@ -6998,16 +7000,17 @@
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = tray_list_add_async;
-+ msg = g_slice_new (struct _tray_msg);
-+ msg->header.func = (MessageFunc) tray_list_add_async;
-+ msg->data = data;
-
+-
- 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__));
- e_thread_put(alarm_operation_thread, (EMsg *)msg);
++ msg = g_slice_new (struct _tray_msg);
++ msg->header.func = (MessageFunc) tray_list_add_async;
++ msg->data = data;
++
+ message_push ((Message *) msg);
}
@@ -7022,17 +7025,17 @@
- /* 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 = malloc (sizeof (struct _midnight_refresh_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;
-- list->remove = FALSE;
-- /* We dont need it. So set it to NULL */
-- msg->data = list;
--
- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__));
- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ message_push ((Message *) msg);
@@ -7078,15 +7081,15 @@
- /* These two structures will be freed by the msg destroy function*/
- msg = malloc (sizeof (AlarmMsg));
- msg->receive_msg = alarm_queue_add_async;
-+ msg = g_slice_new (struct _alarm_client_msg);
-+ msg->header.func = (MessageFunc) alarm_queue_add_async;
-+ msg->client = g_object_ref (client);
-
+-
- list = malloc (sizeof (struct _alarm_client_msg));
- list->client = client;
- g_object_ref (client);
- msg->data = list;
--
++ 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);
@@ -7107,7 +7110,7 @@
g_return_if_fail (alarm_queue_inited);
g_return_if_fail (client != NULL);
-@@ -2148,6 +2132,8 @@ alarm_queue_remove_async (EThread *e, Al
+@@ -2148,24 +2132,20 @@ alarm_queue_remove_async (EThread *e, Al
g_free (ca);
g_hash_table_remove (client_alarms_hash, client);
@@ -7116,3 +7119,26 @@
}
void
+ alarm_queue_remove_client (ECal *client)
+ {
+- 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;
+-
+- list = malloc (sizeof (struct _alarm_client_msg));
+- list->client = client;
+- msg->data = list;
++ 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__));
+- 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
More information about the fedora-extras-commits
mailing list