aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/mail-send-recv.c10
2 files changed, 14 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d968cc2fa5..96fea5fa92 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,7 +1,13 @@
2001-02-16 Jeffrey Stedfast <fejj@ximian.com>
- * main.c:
- * component-factory.c: Reverse the changes I made yesterday.
+ * mail-send-recv.c (receive_get_folder): Not sure it makes any
+ difference, but lets ref the folder while the hash table is locked
+ rather than after we unlock it.
+
+2001-02-16 Jeffrey Stedfast <fejj@ximian.com>
+
+ * main.c: * component-factory.c: Reverse the changes I made
+ yesterday.
2001-02-15 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 09afe0d0d3..6eace378d3 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -69,7 +69,7 @@ struct _send_data {
GnomeDialog *gd;
int cancelled;
- CamelFolder *inbox; /* since w'ere never asked to uypdate this one, do it ourselves */
+ CamelFolder *inbox; /* since we're never asked to update this one, do it ourselves */
time_t inbox_update;
GMutex *lock;
@@ -320,7 +320,7 @@ static struct _send_data *build_dialogue(GSList *sources, CamelFolder *outbox, c
info->bar = bar;
info->stop = stop;
info->data = data;
-
+
gtk_signal_connect((GtkObject *)stop, "clicked", receive_cancel, info);
gtk_widget_show_all((GtkWidget *)table);
}
@@ -550,9 +550,11 @@ receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelExcep
oldinfo->uri = g_strdup(uri);
g_hash_table_insert(info->data->folders, oldinfo->uri, oldinfo);
}
+
+ camel_object_ref (CAMEL_OBJECT (folder));
+
g_mutex_unlock(info->data->lock);
-
- camel_object_ref((CamelObject *)folder);
+
return folder;
}