rpms/evolution/F-7 evolution-2.8.1-kill-ethread.patch, 1.5, 1.6 evolution.spec, 1.262, 1.263
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Wed Jun 6 17:32:20 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21674
Modified Files:
evolution-2.8.1-kill-ethread.patch evolution.spec
Log Message:
* Wed Jun 06 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.2-2.fc7
- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit).
evolution-2.8.1-kill-ethread.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-2.8.1-kill-ethread.patch 16 May 2007 21:08:37 -0000 1.5
+++ evolution-2.8.1-kill-ethread.patch 6 Jun 2007 17:32:14 -0000 1.6
@@ -1,6 +1,6 @@
---- 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-05-16 16:17:38.000000000 -0400
-@@ -725,23 +725,22 @@
+--- evolution-2.10.2/mail/mail-send-recv.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.2/mail/mail-send-recv.c 2007-06-06 13:02:25.000000000 -0400
+@@ -725,23 +725,22 @@ receive_get_folder(CamelFilterDriver *d,
/* ********************************************************************** */
struct _refresh_folders_msg {
@@ -28,7 +28,7 @@
int i;
CamelFolder *folder;
-@@ -757,17 +756,14 @@
+@@ -757,17 +756,14 @@ refresh_folders_get (struct _mail_msg *m
}
static void
@@ -48,7 +48,7 @@
int i;
for (i=0;i<m->folders->len;i++)
-@@ -776,11 +772,12 @@
+@@ -776,11 +772,12 @@ refresh_folders_free (struct _mail_msg *
camel_object_unref(m->store);
}
@@ -66,7 +66,7 @@
};
static void
-@@ -813,13 +810,13 @@
+@@ -813,13 +810,13 @@ receive_update_got_folderinfo(CamelStore
get_folders(store, folders, info);
@@ -82,9 +82,9 @@
} 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-05-16 16:17:38.000000000 -0400
-@@ -965,7 +965,7 @@
+--- evolution-2.10.2/mail/mail-component.c.kill-ethread 2007-05-27 15:55:12.000000000 -0400
++++ evolution-2.10.2/mail/mail-component.c 2007-06-06 13:02: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);
@@ -93,8 +93,8 @@
g_free(curi);
} 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-05-16 16:19:33.000000000 -0400
+--- evolution-2.10.2/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.2/mail/mail-ops.c 2007-06-06 13:05:53.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 */
@@ -104,7 +104,7 @@
CamelFolder *source_folder; /* where they come from */
GPtrArray *source_uids; /* uids to copy, or NULL == copy all */
-@@ -99,8 +99,8 @@
+@@ -99,8 +99,8 @@ struct _fetch_mail_msg {
void *data;
};
@@ -115,7 +115,7 @@
{
return g_strdup (_("Filtering Selected Messages"));
}
-@@ -108,9 +108,8 @@
+@@ -108,9 +108,8 @@ em_filter_folder_element_describe (struc
/* filter a folder, or a subset thereof, uses source_folder/source_uids */
/* this is shared with fetch_mail */
static void
@@ -126,7 +126,7 @@
CamelFolder *folder;
GPtrArray *uids, *folder_uids = NULL;
-@@ -137,15 +136,15 @@
+@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct
else
folder_uids = uids = camel_folder_get_uids (folder);
@@ -145,7 +145,7 @@
camel_folder_thaw (folder);
if (m->destination)
-@@ -161,15 +160,13 @@
+@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct
}
static void
@@ -163,7 +163,7 @@
if (m->source_folder)
camel_object_unref (m->source_folder);
-@@ -188,11 +185,12 @@
+@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m
mail_session_flush_filter_log ();
}
@@ -181,7 +181,7 @@
};
void
-@@ -202,7 +200,7 @@
+@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_
{
struct _filter_mail_msg *m;
@@ -190,7 +190,7 @@
m->source_folder = source_folder;
camel_object_ref (source_folder);
m->source_uids = uids;
-@@ -221,7 +219,7 @@
+@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_
camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
}
@@ -199,7 +199,7 @@
}
/* convenience functions for it */
-@@ -260,17 +258,16 @@
+@@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store)
return filename;
}
@@ -221,7 +221,7 @@
int i;
if (m->cancel)
-@@ -283,20 +280,20 @@
+@@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm)
/* FIXME: this should support keep_on_server too, which would then perform a spool
access thingy, right? problem is matching raw messages to uid's etc. */
if (!strncmp (m->source_uri, "mbox:", 5)) {
@@ -247,7 +247,7 @@
if (folder) {
/* this handles 'keep on server' stuff, if we have any new uid's to copy
-@@ -322,17 +319,17 @@
+@@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm)
camel_uid_cache_free_uids (cache_uids);
fm->cache = cache;
@@ -268,7 +268,7 @@
/* not keep on server - just delete all the actual messages on the server */
for (i=0;i<folder_uids->len;i++) {
d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i]));
-@@ -348,7 +345,7 @@
+@@ -348,7 +345,7 @@ fetch_mail_fetch (struct _mail_msg *mm)
camel_uid_cache_destroy (cache);
camel_folder_free_uids (folder, folder_uids);
} else {
@@ -277,7 +277,7 @@
}
/* we unref the source folder here since we
-@@ -372,31 +369,28 @@
+@@ -372,31 +369,28 @@ fail:
}
static void
@@ -318,7 +318,7 @@
};
/* ouch, a 'do everything' interface ... */
-@@ -409,7 +403,7 @@
+@@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int
struct _fetch_mail_msg *m;
struct _filter_mail_msg *fm;
@@ -327,7 +327,7 @@
fm = (struct _filter_mail_msg *)m;
m->source_uri = g_strdup (source);
fm->delete = !keep;
-@@ -426,7 +420,7 @@
+@@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int
if (status)
camel_filter_driver_set_status_func (fm->driver, status, status_data);
@@ -336,7 +336,7 @@
}
/* ********************************************************************** */
-@@ -657,7 +651,7 @@
[...3029 lines suppressed...]
-@@ -45,10 +45,6 @@
+--- evolution-2.10.2/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.2/calendar/gui/alarm-notify/alarm-notify.c 2007-06-06 13:02:25.000000000 -0400
+@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate {
GMutex *mutex;
};
@@ -6258,7 +6368,7 @@
#define d(x) x
-@@ -286,72 +282,12 @@
+@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object)
g_mutex_free (priv->mutex);
g_free (priv);
@@ -6331,7 +6441,7 @@
/**
* alarm_notify_new:
*
-@@ -363,23 +299,10 @@
+@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg
AlarmNotify *
alarm_notify_new (void)
{
@@ -6359,9 +6469,9 @@
}
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-05-16 16:17:38.000000000 -0400
-@@ -115,9 +115,6 @@
+--- evolution-2.10.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.2/calendar/gui/alarm-notify/alarm-queue.c 2007-06-06 13:02:25.000000000 -0400
+@@ -115,9 +115,6 @@ static int tray_blink_id = -1;
static int tray_blink_state = FALSE;
static AlarmNotify *an;
@@ -6371,7 +6481,7 @@
/* Structure that stores a client we are monitoring */
typedef struct {
/* Monitored client */
-@@ -199,6 +196,40 @@
+@@ -199,6 +196,40 @@ static void on_dialog_objs_removed_cb (E
static void load_alarms_for_today (ClientAlarms *ca);
static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data);
@@ -6412,7 +6522,7 @@
/* Queues an alarm trigger for midnight so that we can load the next day's worth
* of alarms.
*/
-@@ -237,47 +268,41 @@
+@@ -237,47 +268,41 @@ add_client_alarms_cb (gpointer key, gpoi
}
struct _midnight_refresh_msg {
@@ -6470,7 +6580,7 @@
}
/* Looks up a client in the client alarms hash table */
-@@ -636,6 +661,7 @@
+@@ -636,6 +661,7 @@ remove_comp (ClientAlarms *ca, ECalCompo
* alarms.
*/
struct _query_msg {
@@ -6478,7 +6588,7 @@
ECal *client;
GList *objects;
gpointer data;
-@@ -669,7 +695,7 @@
+@@ -669,7 +695,7 @@ duplicate_ecal (GList *in_list)
}
static void
@@ -6487,7 +6597,7 @@
{
ClientAlarms *ca;
time_t from, day_end;
-@@ -678,13 +704,12 @@
+@@ -678,13 +704,12 @@ query_objects_changed_async (EThread *e,
icaltimezone *zone;
CompQueuedAlarms *cqa;
GList *l;
@@ -6504,7 +6614,7 @@
from = config_data_get_last_notification_time ();
if (from == -1)
-@@ -773,43 +798,38 @@
+@@ -773,43 +798,38 @@ query_objects_changed_async (EThread *e,
comp = NULL;
}
g_list_free (objects);
@@ -6561,7 +6671,7 @@
d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects)));
-@@ -822,27 +842,22 @@
+@@ -822,27 +842,22 @@ query_objects_removed_async (EThread *e,
}
g_list_free (objects);
@@ -6598,7 +6708,7 @@
}
-@@ -989,20 +1004,19 @@
+@@ -989,20 +1004,19 @@ free_tray_icon_data (TrayIconData *tray_
}
static void
@@ -6623,7 +6733,7 @@
e_cal_component_get_uid (tray_data->comp, &our_uid);
g_return_if_fail (our_uid && *our_uid);
-@@ -1020,37 +1034,33 @@
+@@ -1020,37 +1034,33 @@ on_dialog_objs_removed_async (EThread *e
tray_data = NULL;
}
}
@@ -6673,7 +6783,7 @@
GList *list = tray_icons_list;
d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa));
-@@ -1087,28 +1097,25 @@
+@@ -1087,28 +1097,25 @@ tray_list_remove_cqa_async(EThread *e, A
gtk_tree_selection_select_iter (sel, &iter);
}
}
@@ -6711,7 +6821,7 @@
{
GList *list = tray_icons_list;
-@@ -1138,55 +1145,50 @@
+@@ -1138,55 +1145,50 @@ tray_list_remove_async(EThread *e, Alarm
} else
list = list->next;
}
@@ -6785,7 +6895,7 @@
}
static void
-@@ -1394,29 +1396,24 @@
+@@ -1394,29 +1396,24 @@ tray_icon_blink_cb (gpointer data)
/* Add a new data to tray list */
static void
@@ -6826,7 +6936,7 @@
}
/* Performs notification of a display alarm */
-@@ -1840,21 +1837,13 @@
+@@ -1840,21 +1837,13 @@ check_midnight_refresh (gpointer user_da
new_midnight = time_day_end_with_zone (time (NULL), zone);
if (new_midnight > midnight) {
@@ -6853,7 +6963,7 @@
}
return TRUE;
-@@ -1985,14 +1974,15 @@
+@@ -1985,14 +1974,15 @@ hash_ids (gpointer a)
}
struct _alarm_client_msg {
@@ -6872,7 +6982,7 @@
g_return_if_fail (alarm_queue_inited);
g_return_if_fail (client != NULL);
-@@ -2023,6 +2013,8 @@
+@@ -2023,6 +2013,8 @@ static void alarm_queue_add_async (EThre
G_CALLBACK (cal_opened_cb),
ca);
}
@@ -6881,7 +6991,7 @@
}
/**
-@@ -2042,20 +2034,13 @@
+@@ -2042,20 +2034,13 @@ static void alarm_queue_add_async (EThre
void
alarm_queue_add_client (ECal *client)
{
@@ -6907,7 +7017,7 @@
}
/* Removes a component an its alarms */
-@@ -2107,11 +2092,10 @@
+@@ -2107,11 +2092,10 @@ remove_client_alarms (ClientAlarms *ca)
* Removes a calendar client from the alarm queueing system.
**/
static void
@@ -6921,7 +7031,7 @@
g_return_if_fail (alarm_queue_inited);
g_return_if_fail (client != NULL);
-@@ -2148,24 +2132,20 @@
+@@ -2148,24 +2132,20 @@ alarm_queue_remove_async (EThread *e, Al
g_free (ca);
g_hash_table_remove (client_alarms_hash, client);
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- evolution.spec 29 May 2007 04:09:29 -0000 1.262
+++ evolution.spec 6 Jun 2007 17:32:14 -0000 1.263
@@ -47,7 +47,7 @@
Name: evolution
Version: 2.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -747,6 +747,9 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed Jun 06 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.2-2.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit).
+
* Mon May 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.2-1.fc7
- Update to 2.10.2
- Remove patch for RH bug #202289 (fixed upstream).
More information about the fedora-extras-commits
mailing list