From 10699f07ca0daf05c95879fce46b0ca20f45c276 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 Jun 2007 16:01:29 +0000 Subject: [PATCH] - Remove some debug messages that accidentally slipped in. --- evolution-2.8.1-kill-ethread.patch | 6 ++---- evolution.spec | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 1892023..53f01cc 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -5185,7 +5185,7 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,14 +118,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -122,14 +118,14 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -5201,7 +5201,6 @@ - msg->priv = g_malloc0(sizeof(*msg->priv)); + msg->priv = g_slice_new (MailMsgPrivate); -+ g_debug ("Inserting message %u", msg->seq); g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); d(printf("New message %p\n", msg)); @@ -5224,7 +5223,7 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +177,85 @@ checkmem(void *p) +@@ -177,58 +177,84 @@ checkmem(void *p) } #endif @@ -5287,7 +5286,6 @@ #endif - g_hash_table_remove(mail_msg_active_table, GINT_TO_POINTER(m->seq)); - pthread_cond_broadcast(&mail_msg_cond); -+ g_debug ("Removing message %u", mail_msg->seq); + g_hash_table_remove ( + mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); + pthread_cond_broadcast (&mail_msg_cond); diff --git a/evolution.spec b/evolution.spec index 2167cef..c400628 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jun 06 2007 Matthew Barnes - 2.11.3-3.fc8 +- Remove some debug messages that accidentally slipped in. + * Tue Jun 05 2007 Matthew Barnes - 2.11.3-2.fc8 - Fix an invalid g_free() that was causing lock-ups.