GNOME.org
 

[evolution-data-server] Camel: Remove some unnecessary type casts.

commit 3c08defc43747d0e0cbf0f807dab9cec9091e922
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jul 5 09:36:13 2011 -0400

    Camel: Remove some unnecessary type casts.

 camel/providers/imap/camel-imap-command.c          |    6 ++--
 camel/providers/imap/camel-imap-folder.c           |   38 ++++++++++----------
 camel/providers/imap/camel-imap-message-cache.c    |    8 ++--
 camel/providers/imapx/camel-imapx-server.c         |    2 +-
 camel/providers/local/camel-local-folder.c         |    2 +-
 camel/providers/local/camel-maildir-folder.c       |    2 +-
 camel/providers/local/camel-mbox-summary.c         |    2 +-
 camel/providers/local/camel-mh-folder.c            |    4 +-
 camel/providers/pop3/camel-pop3-store.c            |    4 +-
 .../providers/sendmail/camel-sendmail-transport.c  |    4 +-
 camel/tests/lib/camel-test.h                       |    2 +-
 camel/tests/mime-filter/test-charset.c             |    4 +-
 camel/tests/smime/pgp-mime.c                       |    4 +-
 camel/tests/smime/pgp.c                            |    4 +-
 camel/tests/smime/pkcs7.c                          |    8 ++--
 15 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index 372d162..0bf5f9e 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -444,7 +444,7 @@ imap_read_response (CamelImapStore *store,
 	response = g_new0 (CamelImapResponse, 1);
 /*FIXME	if (store->current_folder && camel_disco_store_status (CAMEL_DISCO_STORE (store)) != CAMEL_DISCO_STORE_RESYNCING) {
 		response->folder = store->current_folder;
-		g_object_ref (CAMEL_OBJECT (response->folder));
+		g_object_ref (response->folder);
 	} */
 
 	response->untagged = g_ptr_array_new ();
@@ -705,7 +705,7 @@ camel_imap_response_free (CamelImapStore *store, CamelImapResponse *response)
 				g_array_free (expunged, TRUE);
 		}
 
-		g_object_unref (CAMEL_OBJECT (response->folder));
+		g_object_unref (response->folder);
 	}
 
 	g_free (response);
@@ -728,7 +728,7 @@ camel_imap_response_free_without_processing (CamelImapStore *store,
 		return;
 
 	if (response->folder) {
-		g_object_unref (CAMEL_OBJECT (response->folder));
+		g_object_unref (response->folder);
 		response->folder = NULL;
 	}
 	camel_imap_response_free (store, response);
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index df5b7df..aac344b 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -385,7 +385,7 @@ camel_imap_folder_new (CamelStore *parent, const gchar *folder_name,
 	folder->summary = camel_imap_summary_new (folder, summary_file);
 	g_free (summary_file);
 	if (!folder->summary) {
-		g_object_unref (CAMEL_OBJECT (folder));
+		g_object_unref (folder);
 		g_set_error (
 			error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
 			_("Could not load summary for %s"), folder_name);
@@ -405,7 +405,7 @@ camel_imap_folder_new (CamelStore *parent, const gchar *folder_name,
 
 	imap_folder->cache = camel_imap_message_cache_new (folder_dir, folder->summary, error);
 	if (!imap_folder->cache) {
-		g_object_unref (CAMEL_OBJECT (folder));
+		g_object_unref (folder);
 		return NULL;
 	}
 
@@ -2541,7 +2541,7 @@ imap_transfer_offline (CamelFolder *source,
 		if (message) {
 			camel_imap_summary_add_offline (
 				dest->summary, destuid, message, mi);
-			g_object_unref (CAMEL_OBJECT (message));
+			g_object_unref (message);
 		} else
 			camel_imap_summary_add_offline_uncached (
 				dest->summary, destuid, mi);
@@ -2946,7 +2946,7 @@ camel_imap_transfer_resyncing (CamelFolder *source,
 				dest, message, info,
 				NULL, cancellable, &local_error);
 			camel_folder_free_message_info (source, info);
-			g_object_unref (CAMEL_OBJECT (message));
+			g_object_unref (message);
 			if (delete_originals && local_error == NULL)
 				camel_folder_delete_message (source, uid);
 			i++;
@@ -3179,7 +3179,7 @@ get_content (CamelImapFolder *imap_folder,
 		if (stream) {
 			success = camel_data_wrapper_construct_from_stream_sync (
 				CAMEL_DATA_WRAPPER (body_mp), stream, cancellable, error);
-			g_object_unref (CAMEL_OBJECT (stream));
+			g_object_unref (stream);
 			if (!success) {
 				g_object_unref ( body_mp);
 				return NULL;
@@ -3220,10 +3220,10 @@ get_content (CamelImapFolder *imap_folder,
 				part = camel_mime_part_new ();
 				success = camel_data_wrapper_construct_from_stream_sync (
 					CAMEL_DATA_WRAPPER (part), stream, cancellable, error);
-				g_object_unref (CAMEL_OBJECT (stream));
+				g_object_unref (stream);
 				if (!success) {
-					g_object_unref (CAMEL_OBJECT (part));
-					g_object_unref (CAMEL_OBJECT (body_mp));
+					g_object_unref (part);
+					g_object_unref (body_mp);
 					g_free (child_spec);
 					return NULL;
 				}
@@ -3232,7 +3232,7 @@ get_content (CamelImapFolder *imap_folder,
 			}
 
 			if (!stream || !content) {
-				g_object_unref (CAMEL_OBJECT (body_mp));
+				g_object_unref (body_mp);
 				g_free (child_spec);
 				return NULL;
 			}
@@ -3325,15 +3325,15 @@ get_message (CamelImapFolder *imap_folder,
 	msg = camel_mime_message_new ();
 	success = camel_data_wrapper_construct_from_stream_sync (
 		CAMEL_DATA_WRAPPER (msg), stream, cancellable, error);
-	g_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (stream);
 	if (!success) {
-		g_object_unref (CAMEL_OBJECT (msg));
+		g_object_unref (msg);
 		return NULL;
 	}
 
 	content = get_content (imap_folder, uid, CAMEL_MIME_PART (msg), ci, TRUE, cancellable, error);
 	if (!content) {
-		g_object_unref (CAMEL_OBJECT (msg));
+		g_object_unref (msg);
 		return NULL;
 	}
 
@@ -3348,7 +3348,7 @@ get_message (CamelImapFolder *imap_folder,
 
 	camel_data_wrapper_set_mime_type_field (content, camel_mime_part_get_content_type ((CamelMimePart *) msg));
 	camel_medium_set_content (CAMEL_MEDIUM (msg), content);
-	g_object_unref (CAMEL_OBJECT (content));
+	g_object_unref (content);
 
 	return msg;
 }
@@ -3375,10 +3375,10 @@ get_message_simple (CamelImapFolder *imap_folder,
 	msg = camel_mime_message_new ();
 	success = camel_data_wrapper_construct_from_stream_sync (
 		CAMEL_DATA_WRAPPER (msg), stream, cancellable, error);
-	g_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (stream);
 	if (!success) {
 		g_prefix_error (error, _("Unable to retrieve message: "));
-		g_object_unref (CAMEL_OBJECT (msg));
+		g_object_unref (msg);
 		return NULL;
 	}
 
@@ -3656,7 +3656,7 @@ imap_cache_message (CamelDiscoFolder *disco_folder, const gchar *uid,
 
 	stream = camel_imap_folder_fetch_data (imap_folder, uid, "", FALSE, ex);
 	if (stream)
-		g_object_unref (CAMEL_OBJECT (stream));
+		g_object_unref (stream);
 }
 */
 
@@ -3793,7 +3793,7 @@ add_message_from_data (CamelFolder *folder,
 	msg = camel_mime_message_new ();
 	if (!camel_data_wrapper_construct_from_stream_sync (
 		CAMEL_DATA_WRAPPER (msg), stream, cancellable, NULL)) {
-		g_object_unref (CAMEL_OBJECT (msg));
+		g_object_unref (msg);
 		return;
 	}
 
@@ -3802,7 +3802,7 @@ add_message_from_data (CamelFolder *folder,
 	mi = (CamelImapMessageInfo *)
 		camel_folder_summary_info_new_from_message (
 		folder->summary, msg, bodystructure);
-	g_object_unref (CAMEL_OBJECT (msg));
+	g_object_unref (msg);
 
 	if ((idate = g_datalist_get_data (&data, "INTERNALDATE")))
 		mi->info.date_received = decode_internaldate ((const guchar *) idate);
@@ -4430,7 +4430,7 @@ camel_imap_folder_fetch_data (CamelImapFolder *imap_folder,
 			CAMEL_SERVICE_ERROR_UNAVAILABLE,
 			_("Could not find message body in FETCH response."));
 	} else {
-		g_object_ref (CAMEL_OBJECT (stream));
+		g_object_ref (stream);
 		g_datalist_clear (&fetch_data);
 	}
 
diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index cc28672..3a2aed3 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -316,7 +316,7 @@ insert_setup (CamelImapMessageCache *cache, const gchar *uid, const gchar *part_
 	*key = strrchr (*path, '/') + 1;
 	stream = g_hash_table_lookup (cache->parts, *key);
 	if (stream)
-		g_object_unref (CAMEL_OBJECT (stream));
+		g_object_unref (stream);
 
 	fd = g_open (*path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0600);
 	if (fd == -1) {
@@ -337,7 +337,7 @@ insert_abort (gchar *path, CamelStream *stream)
 {
 	g_unlink (path);
 	g_free (path);
-	g_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (stream);
 	return NULL;
 }
 
@@ -421,7 +421,7 @@ camel_imap_message_cache_insert_stream (CamelImapMessageCache *cache,
 		insert_abort (path, stream);
 	} else {
 		insert_finish (cache, uid, path, key, stream);
-		g_object_unref (CAMEL_OBJECT (stream));
+		g_object_unref (stream);
 	}
 }
 
@@ -452,7 +452,7 @@ camel_imap_message_cache_insert_wrapper (CamelImapMessageCache *cache,
 		insert_abort (path, stream);
 	} else {
 		insert_finish (cache, uid, path, key, stream);
-		g_object_unref (CAMEL_OBJECT (stream));
+		g_object_unref (stream);
 	}
 }
 
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 52270bd..3ca39e6 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -5215,7 +5215,7 @@ imapx_disconnect (CamelIMAPXServer *is)
 		if (camel_stream_close (is->stream->source, NULL, NULL) == -1)
 			ret = FALSE;
 
-		g_object_unref (CAMEL_OBJECT (is->stream));
+		g_object_unref (is->stream);
 		is->stream = NULL;
 	}
 
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 08d9035..7a8dbbb 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -614,7 +614,7 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 		    camel_local_summary_check ((CamelLocalSummary *) folder->summary, lf->changes, cancellable, error) == 0) {
 			/* we sync here so that any hard work setting up the folder isn't lost */
 			if (camel_local_summary_sync ((CamelLocalSummary *) folder->summary, FALSE, lf->changes, cancellable, error) == -1) {
-				g_object_unref (CAMEL_OBJECT (folder));
+				g_object_unref (folder);
 				return NULL;
 			}
 		}
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index e17cf63..ef4a32c 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -224,7 +224,7 @@ maildir_folder_append_message_sync (CamelFolder *folder,
 		name);
 
 	if (output_stream) {
-		g_object_unref (CAMEL_OBJECT (output_stream));
+		g_object_unref (output_stream);
 		unlink (name);
 	}
 
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index d24da36..1c727cb 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -546,7 +546,7 @@ summary_update (CamelLocalSummary *cls,
 		g_assert (camel_mime_parser_step (mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM_END);
 	}
 
-	g_object_unref (CAMEL_OBJECT (mp));
+	g_object_unref (mp);
 
 	count = camel_folder_summary_count (s);
 	for (i=0;i<count;i++) {
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 2fb208f..757d6c4 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -96,7 +96,7 @@ mh_folder_append_message_sync (CamelFolder *folder,
 		goto fail_write;
 
 	/* close this? */
-	g_object_unref (CAMEL_OBJECT (output_stream));
+	g_object_unref (output_stream);
 
 	g_free (name);
 
@@ -115,7 +115,7 @@ mh_folder_append_message_sync (CamelFolder *folder,
 		error, _("Cannot append message to mh folder: %s: "), name);
 
 	if (output_stream) {
-		g_object_unref (CAMEL_OBJECT (output_stream));
+		g_object_unref (output_stream);
 		unlink (name);
 	}
 
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index ff3d314..bfb64df 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -259,8 +259,8 @@ connect_to_server (CamelService *service,
 		camel_pop3_engine_command_free (store->engine, pc);
 	}
 
-	g_object_unref (CAMEL_OBJECT (store->engine));
-	g_object_unref (CAMEL_OBJECT (tcp_stream));
+	g_object_unref (store->engine);
+	g_object_unref (tcp_stream);
 	store->engine = NULL;
 
 	return FALSE;
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index 2d39fe7..3a836fd 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -178,7 +178,7 @@ sendmail_send_to_sync (CamelTransport *transport,
 	if (camel_data_wrapper_write_to_stream_sync (
 		CAMEL_DATA_WRAPPER (message), out, cancellable, error) == -1
 	    || camel_stream_close (out, cancellable, error) == -1) {
-		g_object_unref (CAMEL_OBJECT (out));
+		g_object_unref (out);
 		g_prefix_error (error, _("Could not send message: "));
 
 		/* Wait for sendmail to exit. */
@@ -193,7 +193,7 @@ sendmail_send_to_sync (CamelTransport *transport,
 		return FALSE;
 	}
 
-	g_object_unref (CAMEL_OBJECT (out));
+	g_object_unref (out);
 
 	/* Wait for sendmail to exit. */
 	while (waitpid (pid, &wstat, 0) == -1 && errno == EINTR)
diff --git a/camel/tests/lib/camel-test.h b/camel/tests/lib/camel-test.h
index 49e83a1..9756764 100644
--- a/camel/tests/lib/camel-test.h
+++ b/camel/tests/lib/camel-test.h
@@ -35,7 +35,7 @@ static void check_msg (gint truth, gchar *fmt, ...)
 
 #define check_unref(object, expected) do { \
 	check_count (object, expected); \
-	g_object_unref (CAMEL_OBJECT (object)); \
+	g_object_unref (object); \
 	if (expected == 1) { \
 		object = NULL; \
 	} \
diff --git a/camel/tests/mime-filter/test-charset.c b/camel/tests/mime-filter/test-charset.c
index 6c13871..0ad1bdb 100644
--- a/camel/tests/mime-filter/test-charset.c
+++ b/camel/tests/mime-filter/test-charset.c
@@ -131,8 +131,8 @@ main (gint argc, gchar **argv)
 		/* inefficient */
 		camel_test_push ("Cleaning up");
 		g_object_unref (stream);
-		g_object_unref (CAMEL_OBJECT (correct));
-		g_object_unref (CAMEL_OBJECT (source));
+		g_object_unref (correct);
+		g_object_unref (source);
 		camel_test_pull ();
 
 		camel_test_end ();
diff --git a/camel/tests/smime/pgp-mime.c b/camel/tests/smime/pgp-mime.c
index f618f99..9576d12 100644
--- a/camel/tests/smime/pgp-mime.c
+++ b/camel/tests/smime/pgp-mime.c
@@ -192,8 +192,8 @@ gint main (gint argc, gchar **argv)
 	g_object_unref (mpe);
 	camel_test_pull ();
 
-	g_object_unref (CAMEL_OBJECT (ctx));
-	g_object_unref (CAMEL_OBJECT (session));
+	g_object_unref (ctx);
+	g_object_unref (session);
 
 	camel_test_end ();
 
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index 62ef64c..27563ba 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -227,8 +227,8 @@ gint main (gint argc, gchar **argv)
 
 	camel_test_pull ();
 
-	g_object_unref (CAMEL_OBJECT (ctx));
-	g_object_unref (CAMEL_OBJECT (session));
+	g_object_unref (ctx);
+	g_object_unref (session);
 
 	camel_test_end ();
 
diff --git a/camel/tests/smime/pkcs7.c b/camel/tests/smime/pkcs7.c
index 29c1bfe..783c3f5 100644
--- a/camel/tests/smime/pkcs7.c
+++ b/camel/tests/smime/pkcs7.c
@@ -124,8 +124,8 @@ gint main (gint argc, gchar **argv)
 	camel_cipher_validity_free (valid);
 	camel_test_pull ();
 
-	g_object_unref (CAMEL_OBJECT (stream1));
-	g_object_unref (CAMEL_OBJECT (stream2));
+	g_object_unref (stream1);
+	g_object_unref (stream2);
 
 	stream1 = camel_stream_mem_new ();
 	stream2 = camel_stream_mem_new ();
@@ -160,8 +160,8 @@ gint main (gint argc, gchar **argv)
 	g_free (after);
 	camel_test_pull ();
 
-	g_object_unref (CAMEL_OBJECT (ctx));
-	g_object_unref (CAMEL_OBJECT (session));
+	g_object_unref (ctx);
+	g_object_unref (session);
 
 	camel_test_end ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]