Merge with camel-async.

svn path=/trunk/; revision=4687

4 files changed, 15 insertions, 13 deletions

diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index a0d7398c25..9883640e23 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -74,7 +74,7 @@ destroy (GtkObject *object)
 
 	attachment = E_MSG_COMPOSER_ATTACHMENT (object);
 
-	gtk_object_unref (GTK_OBJECT (attachment->body));
+	camel_object_unref (CAMEL_OBJECT (attachment->body));
 }
 
 
@@ -168,12 +168,12 @@ e_msg_composer_attachment_new (const gchar *file_name)
 		return NULL;
 	wrapper = camel_data_wrapper_new ();
 	camel_data_wrapper_construct_from_stream (wrapper, data);
-	gtk_object_unref (GTK_OBJECT (data));
+	camel_object_unref (CAMEL_OBJECT (data));
 	camel_data_wrapper_set_mime_type (wrapper, get_mime_type (file_name));
 
 	part = camel_mime_part_new ();
 	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	gtk_object_unref (GTK_OBJECT (wrapper));
+	camel_object_unref (CAMEL_OBJECT (wrapper));
 
 	camel_mime_part_set_disposition (part, "attachment");
 	if (strchr (file_name, '/'))
@@ -209,7 +209,7 @@ e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part)
 
 	new->editor_gui = NULL;
 	new->body = part;
-	gtk_object_ref (GTK_OBJECT (part));
+	camel_object_ref (CAMEL_OBJECT (part));
 	new->guessed_type = FALSE;
 	new->size = 0;
 
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index 0fd8a73418..e9f4e421a3 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -160,7 +160,9 @@ e_msg_composer_select_file (EMsgComposer *composer,
 	gtk_window_set_title (GTK_WINDOW (info->widget), title);
 	gtk_widget_show (info->widget);
 
+	GDK_THREADS_ENTER();
 	gtk_main ();
+	GDK_THREADS_LEAVE();
 
 	retval = info->selected_file;
 	info->selected_file = NULL;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 0c195a8327..ac22995e28 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -248,13 +248,13 @@ build_message (EMsgComposer *composer)
 		camel_mime_part_set_content (part, fmt, strlen (fmt), "text/plain");
 		g_free (fmt);
 		camel_multipart_add_part (body, part);
-		gtk_object_unref (GTK_OBJECT (part));
+		camel_object_unref (CAMEL_OBJECT (part));
 		
 		part = camel_mime_part_new ();
 		camel_mime_part_set_content (part, html, strlen (html), "text/html");
 		g_free (html);
 		camel_multipart_add_part (body, part);
-		gtk_object_unref (GTK_OBJECT (part));
+		camel_object_unref (CAMEL_OBJECT (part));
 	}
 
 	if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {
@@ -268,7 +268,7 @@ build_message (EMsgComposer *composer)
 		case MSG_FORMAT_ALTERNATIVE:
 			camel_medium_set_content_object (CAMEL_MEDIUM (part),
 							 CAMEL_DATA_WRAPPER (body));
-			gtk_object_unref (GTK_OBJECT (body));
+			camel_object_unref (CAMEL_OBJECT (body));
 			break;
 		case MSG_FORMAT_PLAIN:
 			camel_mime_part_set_content (part, fmt, strlen (fmt), "text/plain");
@@ -276,30 +276,30 @@ build_message (EMsgComposer *composer)
 			break;
 		}
 		camel_multipart_add_part (multipart, part);
-		gtk_object_unref (GTK_OBJECT (part));
+		camel_object_unref (CAMEL_OBJECT (part));
 
 		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart);
 
 		camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (multipart));
-		gtk_object_unref (GTK_OBJECT (multipart));
+		camel_object_unref (CAMEL_OBJECT (multipart));
 	} else {
 		CamelDataWrapper *cdw;
 		CamelStream *stream;
 		switch (type) {
 		case MSG_FORMAT_ALTERNATIVE:
 			camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (body));
-			gtk_object_unref (GTK_OBJECT (body));
+			camel_object_unref (CAMEL_OBJECT (body));
 			break;
 		case MSG_FORMAT_PLAIN:
 			stream = camel_stream_mem_new_with_buffer (fmt, strlen (fmt));
 			cdw = camel_data_wrapper_new ();
 			camel_data_wrapper_construct_from_stream (cdw, stream);
-			gtk_object_unref (GTK_OBJECT (stream));
+			camel_object_unref (CAMEL_OBJECT (stream));
 			
 			camel_data_wrapper_set_mime_type (cdw, "text/plain");
 
 			camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (cdw));
-			gtk_object_unref (GTK_OBJECT (cdw));
+			camel_object_unref (CAMEL_OBJECT (cdw));
 			g_free (fmt);
 			break;
 
diff --git a/composer/main.c b/composer/main.c
index 9a29e95666..383504d30d 100644
--- a/composer/main.c
+++ b/composer/main.c
@@ -28,7 +28,7 @@ send_cb (EMsgComposer *composer,
 					    stream);
 	camel_stream_close (stream);
 
-	gtk_object_unref (GTK_OBJECT (message));
+	camel_object_unref (CAMEL_OBJECT (message));
 
 #if 0
 	gtk_widget_destroy (GTK_WIDGET (composer));