diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-04-23 22:28:53 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-24 23:05:27 +0800 |
commit | bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7 (patch) | |
tree | f5d0cc91fc1568431e0b457406a9b3ea21157e0e /plugins/pst-import | |
parent | f862e946b83d5f70001c3d81290ecc8a0d8ca2a0 (diff) | |
download | gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.gz gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.bz2 gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.lz gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.xz gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.zst gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.zip |
Camel is now GObject-based.
Diffstat (limited to 'plugins/pst-import')
-rw-r--r-- | plugins/pst-import/pst-importer.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 0af8fc43ef..84706b783e 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -668,7 +668,7 @@ pst_process_folder (PstImporter *m, pst_item *item) m->folder_uri = uri; if (m->folder) { - camel_object_unref (m->folder); + g_object_unref (m->folder); m->folder = NULL; } @@ -705,7 +705,7 @@ pst_create_folder (PstImporter *m) *pos = '\0'; folder = mail_tool_uri_to_folder (dest, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - camel_object_unref(folder); + g_object_unref (folder); *pos = '/'; } } @@ -713,7 +713,7 @@ pst_create_folder (PstImporter *m) g_free (dest); if (m->folder) { - camel_object_unref (m->folder); + g_object_unref (m->folder); } m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); @@ -805,7 +805,7 @@ pst_process_email (PstImporter *m, pst_item *item) } camel_mime_message_set_from (msg, addr); - camel_object_unref (addr); + g_object_unref (addr); if (item->email->sent_date != NULL) { camel_mime_message_set_date (msg, pst_fileTimeToUnixTime (item->email->sent_date), 0); @@ -833,7 +833,7 @@ pst_process_email (PstImporter *m, pst_item *item) if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0) camel_mime_message_set_recipients (msg, "To", addr); - camel_object_unref (addr); + g_object_unref (addr); } if (item->email->cc_address.str != NULL) { @@ -842,7 +842,7 @@ pst_process_email (PstImporter *m, pst_item *item) if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0) camel_mime_message_set_recipients (msg, "CC", addr); - camel_object_unref (addr); + g_object_unref (addr); } } @@ -873,7 +873,7 @@ pst_process_email (PstImporter *m, pst_item *item) part = camel_mime_part_new (); camel_mime_part_set_content (part, item->body.str, strlen (item->body.str), "text/plain"); camel_multipart_add_part (mp, part); - camel_object_unref (part); + g_object_unref (part); } if (item->email->htmlbody.str != NULL) { @@ -881,14 +881,14 @@ pst_process_email (PstImporter *m, pst_item *item) part = camel_mime_part_new (); camel_mime_part_set_content (part, item->email->htmlbody.str, strlen (item->email->htmlbody.str), "text/html"); camel_multipart_add_part (mp, part); - camel_object_unref (part); + g_object_unref (part); } for (attach = item->attach; attach; attach = attach->next) { if (attach->data.data || attach->i_id) { part = attachment_to_part(m, attach); camel_multipart_add_part (mp, part); - camel_object_unref (part); + g_object_unref (part); } } @@ -918,7 +918,7 @@ pst_process_email (PstImporter *m, pst_item *item) camel_folder_append_message (m->folder, msg, info, NULL, &m->ex); camel_message_info_free (info); - camel_object_unref (msg); + g_object_unref (msg); camel_folder_sync (m->folder, FALSE, NULL); camel_folder_thaw (m->folder); @@ -1244,18 +1244,18 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta || camel_stream_flush (stream) == -1) { g_warning ("Could not write attachment to %s: %s", path, g_strerror (errno)); - camel_object_unref (stream); + g_object_unref (stream); attach = attach->next; continue; } - camel_object_unref (stream); + g_object_unref (stream); uri = g_filename_to_uri (path, NULL, NULL); list = g_slist_append (list, g_strdup (uri)); g_free (uri); - camel_object_unref (part); + g_object_unref (part); g_free (path); attach = attach->next; |