From bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 23 Apr 2010 10:28:53 -0400 Subject: Camel is now GObject-based. --- mail/mail-ops.c | 140 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 70 insertions(+), 70 deletions(-) (limited to 'mail/mail-ops.c') diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 3aa310b2f0..22edd9a6a1 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -131,7 +131,7 @@ em_filter_folder_element_exec (struct _filter_mail_msg *m) /* this may thaw/unref source folders, do it here so we dont do it in the main thread see also fetch_mail_fetch() below */ - camel_object_unref(m->driver); + g_object_unref (m->driver); m->driver = NULL; if (m->cancel) @@ -147,7 +147,7 @@ static void em_filter_folder_element_free (struct _filter_mail_msg *m) { if (m->source_folder) - camel_object_unref (m->source_folder); + g_object_unref (m->source_folder); if (m->source_uids) em_utils_uids_free (m->source_uids); @@ -156,10 +156,10 @@ em_filter_folder_element_free (struct _filter_mail_msg *m) camel_operation_unref (m->cancel); if (m->destination) - camel_object_unref (m->destination); + g_object_unref (m->destination); if (m->driver) - camel_object_unref (m->driver); + g_object_unref (m->driver); mail_session_flush_filter_log (); } @@ -181,7 +181,7 @@ mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, m = mail_msg_new (&em_filter_folder_element_info); m->source_folder = source_folder; - camel_object_ref (source_folder); + g_object_ref (source_folder); m->source_uids = uids; m->cache = NULL; m->delete = FALSE; @@ -255,7 +255,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m) fm->destination = e_mail_local_get_folder (E_MAIL_FOLDER_LOCAL_INBOX); if (fm->destination == NULL) goto fail; - camel_object_ref (fm->destination); + g_object_ref (fm->destination); /* 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. */ @@ -331,7 +331,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m) /* we unref the source folder here since we may now block in finalize (we try to disconnect cleanly) */ - camel_object_unref (fm->source_folder); + g_object_unref (fm->source_folder); fm->source_folder = NULL; } } @@ -343,7 +343,7 @@ fail: folders and whatnot) before we are really done */ /* should this be cancellable too? (i.e. above unregister above) */ if (fm->driver) { - camel_object_unref (fm->driver); + g_object_unref (fm->driver); fm->driver = NULL; } } @@ -553,7 +553,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u folder = mail_tool_uri_to_folder(uri, 0, NULL); if (folder) { camel_folder_append_message(folder, message, info, NULL, NULL); - camel_object_unref(folder); + g_object_unref (folder); folder = NULL; } g_free(uri); @@ -592,7 +592,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u if (!folder) { folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT); - camel_object_ref(folder); + g_object_ref (folder); } camel_folder_append_message (folder, message, info, NULL, ex); @@ -613,8 +613,8 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u g_string_append_printf (err, _("Failed to append to %s: %s\n" "Appending to local 'Sent' folder instead."), name, camel_exception_get_description (ex)); - camel_object_ref (sent_folder); - camel_object_unref (folder); + g_object_ref (sent_folder); + g_object_unref (folder); folder = sent_folder; camel_exception_clear (ex); @@ -646,19 +646,19 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u exit: if (folder) { camel_folder_sync(folder, FALSE, NULL); - camel_object_unref(folder); + g_object_unref (folder); } if (info) camel_message_info_free(info); - camel_object_unref(recipients); - camel_object_unref(from); + g_object_unref (recipients); + g_object_unref (from); if (xport) - camel_object_unref(xport); + g_object_unref (xport); g_free(sent_folder_uri); g_free(transport_url); camel_header_raw_clear(&xev); g_string_free(err, TRUE); - camel_object_unref(message); + g_object_unref (message); return; } @@ -782,7 +782,7 @@ send_queue_exec (struct _send_queue_msg *m) report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); if (m->driver) { - camel_object_unref (m->driver); + g_object_unref (m->driver); m->driver = NULL; } @@ -826,8 +826,8 @@ static void send_queue_free (struct _send_queue_msg *m) { if (m->driver) - camel_object_unref(m->driver); - camel_object_unref(m->queue); + g_object_unref (m->driver); + g_object_unref (m->queue); g_free(m->destination); if (m->cancel) camel_operation_unref(m->cancel); @@ -853,7 +853,7 @@ mail_send_queue(CamelFolder *queue, const gchar *destination, m = mail_msg_new(&send_queue_info); m->queue = queue; - camel_object_ref(queue); + g_object_ref (queue); m->destination = g_strdup(destination); if (cancel) { m->cancel = cancel; @@ -911,8 +911,8 @@ append_mail_done (struct _append_msg *m) static void append_mail_free (struct _append_msg *m) { - camel_object_unref(m->message); - camel_object_unref(m->folder); + g_object_unref (m->message); + g_object_unref (m->folder); g_free (m->appended_uid); } @@ -939,9 +939,9 @@ mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageIn m = mail_msg_new (&append_mail_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->message = message; - camel_object_ref(message); + g_object_ref (message); m->info = info; m->done = done; @@ -983,7 +983,7 @@ transfer_messages_exec (struct _transfer_msg *m) return; if (dest == m->source) { - camel_object_unref(dest); + g_object_unref (dest); /* no-op */ return; } @@ -1006,7 +1006,7 @@ transfer_messages_exec (struct _transfer_msg *m) camel_folder_thaw (m->source); camel_folder_thaw (dest); camel_folder_sync (dest, FALSE, NULL); - camel_object_unref (dest); + g_object_unref (dest); } static void @@ -1019,7 +1019,7 @@ transfer_messages_done (struct _transfer_msg *m) static void transfer_messages_free (struct _transfer_msg *m) { - camel_object_unref (m->source); + g_object_unref (m->source); g_free (m->dest_uri); em_utils_uids_free (m->uids); } @@ -1048,7 +1048,7 @@ mail_transfer_messages (CamelFolder *source, GPtrArray *uids, m = mail_msg_new(&transfer_messages_info); m->source = source; - camel_object_ref (source); + g_object_ref (source); m->uids = uids; m->delete = delete_from_source; m->dest_uri = g_strdup (dest_uri); @@ -1113,7 +1113,7 @@ get_folderinfo_free (struct _get_folderinfo_msg *m) { if (m->info && m->can_clear) camel_store_free_folder_info(m->store, m->info); - camel_object_unref(m->store); + g_object_unref (m->store); } static MailMsgInfo get_folderinfo_info = { @@ -1137,7 +1137,7 @@ mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(Cam camel_operation_ref(op); } m->store = store; - camel_object_ref(store); + g_object_ref (store); m->done = done; m->data = data; id = m->base.seq; @@ -1179,11 +1179,11 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, for (i=0;ilen;i++) { part = mail_tool_make_message_attachment(messages->pdata[i]); camel_multipart_add_part(multipart, part); - camel_object_unref(part); + g_object_unref (part); } part = camel_mime_part_new(); camel_medium_set_content (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER(multipart)); - camel_object_unref(multipart); + g_object_unref (multipart); camel_mime_part_set_description(part, _("Forwarded messages")); } @@ -1191,7 +1191,7 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, subject = mail_tool_generate_forward_subject(messages->pdata[0]); d->done(folder, messages, part, subject, d->data); g_free(subject); - camel_object_unref(part); + g_object_unref (part); g_free(d); } @@ -1247,7 +1247,7 @@ get_folder_free (struct _get_folder_msg *m) { g_free (m->uri); if (m->folder) - camel_object_unref (m->folder); + g_object_unref (m->folder); } static MailMsgInfo get_folder_info = { @@ -1312,7 +1312,7 @@ static void get_quota_free (struct _get_quota_msg *m) { if (m->folder) - camel_object_unref (m->folder); + g_object_unref (m->folder); if (m->quota) camel_folder_quota_info_free (m->quota); g_free (m->folder_uri); @@ -1343,7 +1343,7 @@ mail_get_folder_quota (CamelFolder *folder, m->data = data; m->done = done; - camel_object_ref (m->folder); + g_object_ref (m->folder); id = m->base.seq; dispatch (m); @@ -1389,7 +1389,7 @@ get_store_free (struct _get_store_msg *m) { g_free (m->uri); if (m->store) - camel_object_unref (m->store); + g_object_unref (m->store); } static MailMsgInfo get_store_info = { @@ -1513,7 +1513,7 @@ remove_folder_done (struct _remove_folder_msg *m) static void remove_folder_free (struct _remove_folder_msg *m) { - camel_object_unref (m->folder); + g_object_unref (m->folder); } static MailMsgInfo remove_folder_info = { @@ -1533,7 +1533,7 @@ mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboo m = mail_msg_new (&remove_folder_info); m->folder = folder; - camel_object_ref (folder); + g_object_ref (folder); m->data = data; m->done = done; @@ -1573,7 +1573,7 @@ sync_folder_done (struct _sync_folder_msg *m) static void sync_folder_free (struct _sync_folder_msg *m) { - camel_object_unref((CamelObject *)m->folder); + g_object_unref ((CamelObject *)m->folder); } static MailMsgInfo sync_folder_info = { @@ -1591,7 +1591,7 @@ mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpointe m = mail_msg_new(&sync_folder_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->data = data; m->done = done; @@ -1640,7 +1640,7 @@ sync_store_done (struct _sync_store_msg *m) static void sync_store_free (struct _sync_store_msg *m) { - camel_object_unref(m->store); + g_object_unref (m->store); } static MailMsgInfo sync_store_info = { @@ -1659,7 +1659,7 @@ mail_sync_store(CamelStore *store, gint expunge, void (*done) (CamelStore *store m = mail_msg_new(&sync_store_info); m->store = store; m->expunge = expunge; - camel_object_ref(store); + g_object_ref (store); m->data = data; m->done = done; @@ -1699,7 +1699,7 @@ mail_refresh_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpoi m = mail_msg_new(&refresh_folder_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->data = data; m->done = done; @@ -1736,7 +1736,7 @@ mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpoi m = mail_msg_new(&expunge_folder_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->data = data; m->done = done; @@ -1778,7 +1778,7 @@ empty_trash_exec (struct _empty_trash_msg *m) if (trash) { camel_folder_expunge (trash, &m->base.ex); - camel_object_unref (trash); + g_object_unref (trash); } } @@ -1858,11 +1858,11 @@ static void get_message_free (struct _get_message_msg *m) { g_free (m->uid); - camel_object_unref (m->folder); + g_object_unref (m->folder); camel_operation_unref (m->cancel); if (m->message) - camel_object_unref (m->message); + g_object_unref (m->message); } static MailMsgInfo get_message_info = { @@ -1883,7 +1883,7 @@ mail_get_message(CamelFolder *folder, const gchar *uid, void (*done) (CamelFolde m = mail_msg_new(&get_message_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->uid = g_strdup(uid); m->data = data; m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done; @@ -1925,7 +1925,7 @@ mail_get_messagex(CamelFolder *folder, const gchar *uid, void (*done) (CamelFold m = mail_msg_new(&get_messagex_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->uid = g_strdup(uid); m->data = data; m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done; @@ -1991,10 +1991,10 @@ get_messages_free (struct _get_messages_msg *m) em_utils_uids_free (m->uids); for (i=0;imessages->len;i++) { if (m->messages->pdata[i]) - camel_object_unref(m->messages->pdata[i]); + g_object_unref (m->messages->pdata[i]); } g_ptr_array_free(m->messages, TRUE); - camel_object_unref(m->folder); + g_object_unref (m->folder); } static MailMsgInfo get_messages_info = { @@ -2015,7 +2015,7 @@ mail_get_messages(CamelFolder *folder, GPtrArray *uids, m = mail_msg_new(&get_messages_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->uids = uids; m->messages = g_ptr_array_new(); m->data = data; @@ -2098,7 +2098,7 @@ save_messages_exec (struct _save_messages_msg *m) filtered_stream = camel_stream_filter_new (stream); camel_stream_filter_add ( CAMEL_STREAM_FILTER (filtered_stream), from_filter); - camel_object_unref(from_filter); + g_object_unref (from_filter); if (path != m->path) g_free (path); @@ -2125,15 +2125,15 @@ save_messages_exec (struct _save_messages_msg *m) camel_exception_setv(&m->base.ex, CAMEL_EXCEPTION_SYSTEM, _("Error saving messages to: %s:\n %s"), m->path, g_strerror(errno)); g_free(from); - camel_object_unref((CamelObject *)message); + g_object_unref ((CamelObject *)message); break; } g_free(from); - camel_object_unref(message); + g_object_unref (message); } - camel_object_unref(filtered_stream); - camel_object_unref(stream); + g_object_unref (filtered_stream); + g_object_unref (stream); } static void @@ -2147,7 +2147,7 @@ static void save_messages_free (struct _save_messages_msg *m) { em_utils_uids_free (m->uids); - camel_object_unref(m->folder); + g_object_unref (m->folder); g_free(m->path); } @@ -2168,7 +2168,7 @@ mail_save_messages(CamelFolder *folder, GPtrArray *uids, const gchar *path, m = mail_msg_new(&save_messages_info); m->folder = folder; - camel_object_ref(folder); + g_object_ref (folder); m->uids = uids; m->path = g_strdup(path); m->data = data; @@ -2239,7 +2239,7 @@ save_part_exec (struct _save_part_msg *m) _("Could not write data: %s"), g_strerror (errno)); - camel_object_unref (stream); + g_object_unref (stream); } static void @@ -2252,7 +2252,7 @@ save_part_done (struct _save_part_msg *m) static void save_part_free (struct _save_part_msg *m) { - camel_object_unref (m->part); + g_object_unref (m->part); g_free (m->path); } @@ -2272,7 +2272,7 @@ mail_save_part (CamelMimePart *part, const gchar *path, gint id; m = mail_msg_new (&save_part_info); m->part = part; - camel_object_ref (part); + g_object_ref (part); m->path = g_strdup (path); m->data = data; m->done = done; @@ -2315,7 +2315,7 @@ prep_offline_exec (struct _prep_offline_msg *m) /* prepare_for_offline should do this? */ /* of course it should all be atomic, but ... */ camel_folder_sync(folder, FALSE, NULL); - camel_object_unref(folder); + g_object_unref (folder); } if (m->cancel) @@ -2431,7 +2431,7 @@ set_offline_done (struct _set_offline_msg *m) static void set_offline_free (struct _set_offline_msg *m) { - camel_object_unref(m->store); + g_object_unref (m->store); } static MailMsgInfo set_offline_info = { @@ -2458,7 +2458,7 @@ mail_store_set_offline (CamelStore *store, gboolean offline, m = mail_msg_new(&set_offline_info); m->store = store; - camel_object_ref(store); + g_object_ref (store); m->offline = offline; m->data = data; m->done = done; @@ -2505,7 +2505,7 @@ prepare_offline_done (struct _set_offline_msg *m) static void prepare_offline_free (struct _set_offline_msg *m) { - camel_object_unref (m->store); + g_object_unref (m->store); } static MailMsgInfo prepare_offline_info = { @@ -2528,7 +2528,7 @@ mail_store_prepare_offline (CamelStore *store) m = mail_msg_new(&prepare_offline_info); m->store = store; - camel_object_ref(store); + g_object_ref (store); m->data = NULL; m->done = NULL; @@ -2578,7 +2578,7 @@ check_service_exec (struct _check_msg *m) } m->authtypes = camel_service_query_auth_types(service, &m->base.ex); - camel_object_unref(service); + g_object_unref (service); } static void -- cgit v1.2.3