[balsa] Do not cast argument to g_object_unref()
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Do not cast argument to g_object_unref()
- Date: Sun, 11 Aug 2019 00:09:33 +0000 (UTC)
commit 287c5191d30034072ba1e8822ddeec2df238e6c3
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sat Aug 10 20:04:46 2019 -0400
Do not cast argument to g_object_unref()
In calls to g_object_unref(), do not cast object using
G_OBJECT(object).
The argument is a gpointer, so the cast is redundant.
* libbalsa/autocrypt.c (autocrypt_db_dialog_run):
* libbalsa/body.c (libbalsa_message_body_free):
* libbalsa/gmime-multipart-crypt.c (g_mime_gpgme_mpe_decrypt):
* libbalsa/html.c (html2text):
* libbalsa/libbalsa-gpgme-cb.c (lb_gpgme_select_key):
* libbalsa/libbalsa.c (ask_cert_real):
* libbalsa/mailbox_imap.c (imap_exists_idle), (libbalsa_mailbox_imap_get_message):
(libbalsa_encrypt_mime_object), (libbalsa_sign_encrypt_mime_object),
(libbalsa_body_check_signature), (libbalsa_body_decrypt), (libbalsa_rfc2440_verify),
(libbalsa_rfc2440_decrypt):
* libbalsa/send.c (msg_queue_item_destroy), (send_message_info_destroy),
(add_mime_body_plain), (balsa_send_message_real),
(libbalsa_message_create_mime_message), (libbalsa_fill_msg_queue_item_from_queu):
* libnetclient/net-client-pop.c (net_client_pop_new):
* libnetclient/net-client-siobuf.c (net_client_siobuf_new):
* libnetclient/net-client-smtp.c (net_client_smtp_new):
* libnetclient/net-client.c (net_client_new), (net_client_shutdown),
(net_client_set_cert_from_pem), (net_client_set_cert_from_file),
(net_client_start_tls), (net_client_finalise):
* src/ab-window.c (balsa_ab_window_get_recipients), (balsa_ab_window_swap_real),
(balsa_ab_window_activate_address):
* src/balsa-message.c (balsa_message_init), (balsa_message_set_embedded_hdr),
(display_part), (handle_mdn_request), (mdn_dialog_response), (message_recheck_crypto_cb):
* src/balsa-mime-widget-crypto.c (balsa_mime_widget_new_pgpkey):
* src/balsa-mime-widget-message.c (extbody_send_mail):
* src/balsa-mime-widget-vcalendar.c (vevent_reply):
* src/balsa-print-object-decor.c (bpo_decor_print_frame_begin):
* src/balsa-print-object-default.c (balsa_print_object_default_full):
* src/balsa-print-object-header.c (balsa_print_object_header_new_real),
(balsa_print_object_header_crypto), (balsa_print_object_header_draw):
* src/balsa-print-object-text.c (balsa_print_object_text_plain),
(balsa_print_object_text), (balsa_print_object_text_draw):
* src/mailbox-conf.c (mailbox_conf_add):
ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++
libbalsa/autocrypt.c | 2 +-
libbalsa/body.c | 2 +-
libbalsa/gmime-multipart-crypt.c | 6 ++--
libbalsa/html.c | 4 +--
libbalsa/libbalsa-gpgme-cb.c | 2 +-
libbalsa/libbalsa.c | 2 +-
libbalsa/mailbox_imap.c | 4 +--
libbalsa/mailbox_pop3.c | 10 +++----
libbalsa/rfc3156.c | 16 +++++------
libbalsa/send.c | 44 ++++++++++++++---------------
libnetclient/net-client-pop.c | 2 +-
libnetclient/net-client-siobuf.c | 2 +-
libnetclient/net-client-smtp.c | 2 +-
libnetclient/net-client.c | 28 +++++++++----------
src/ab-window.c | 6 ++--
src/balsa-message.c | 16 +++++------
src/balsa-mime-widget-crypto.c | 2 +-
src/balsa-mime-widget-message.c | 2 +-
src/balsa-mime-widget-vcalendar.c | 2 +-
src/balsa-print-object-decor.c | 2 +-
src/balsa-print-object-default.c | 2 +-
src/balsa-print-object-header.c | 6 ++--
src/balsa-print-object-text.c | 6 ++--
src/mailbox-conf.c | 2 +-
src/print-gtk.c | 12 ++++----
src/save-restore.c | 2 +-
src/sendmsg-window.c | 14 +++++-----
28 files changed, 159 insertions(+), 100 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 22de82972..db0bd5903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+2019-08-10 Peter Bloomfield <pbloomfield bellsouth net>
+
+ In calls to g_object_unref(), do not cast object using
+ G_OBJECT(object).
+
+ The argument is a gpointer, so the cast is redundant.
+
+ * libbalsa/autocrypt.c (autocrypt_db_dialog_run):
+ * libbalsa/body.c (libbalsa_message_body_free):
+ * libbalsa/gmime-multipart-crypt.c (g_mime_gpgme_mpe_decrypt):
+ * libbalsa/html.c (html2text):
+ * libbalsa/libbalsa-gpgme-cb.c (lb_gpgme_select_key):
+ * libbalsa/libbalsa.c (ask_cert_real):
+ * libbalsa/mailbox_imap.c (imap_exists_idle),
+ (libbalsa_mailbox_imap_get_message):
+ * libbalsa/mailbox_pop3.c (pop_handler_close),
+ (libbalsa_mailbox_pop3_startup), (libbalsa_mailbox_pop3_check):
+ * libbalsa/rfc3156.c (libbalsa_sign_mime_object),
+ (libbalsa_encrypt_mime_object),
+ (libbalsa_sign_encrypt_mime_object),
+ (libbalsa_body_check_signature), (libbalsa_body_decrypt),
+ (libbalsa_rfc2440_verify), (libbalsa_rfc2440_decrypt):
+ * libbalsa/send.c (msg_queue_item_destroy),
+ (send_message_info_destroy), (add_mime_body_plain),
+ (balsa_send_message_real), (libbalsa_message_create_mime_message),
+ (libbalsa_fill_msg_queue_item_from_queu):
+ * libnetclient/net-client-pop.c (net_client_pop_new):
+ * libnetclient/net-client-siobuf.c (net_client_siobuf_new):
+ * libnetclient/net-client-smtp.c (net_client_smtp_new):
+ * libnetclient/net-client.c (net_client_new),
+ (net_client_shutdown), (net_client_set_cert_from_pem),
+ (net_client_set_cert_from_file), (net_client_start_tls),
+ (net_client_finalise):
+ * src/ab-window.c (balsa_ab_window_get_recipients),
+ (balsa_ab_window_swap_real), (balsa_ab_window_activate_address):
+ * src/balsa-message.c (balsa_message_init),
+ (balsa_message_set_embedded_hdr), (display_part),
+ (handle_mdn_request), (mdn_dialog_response),
+ (message_recheck_crypto_cb):
+ * src/balsa-mime-widget-crypto.c (balsa_mime_widget_new_pgpkey):
+ * src/balsa-mime-widget-message.c (extbody_send_mail):
+ * src/balsa-mime-widget-vcalendar.c (vevent_reply):
+ * src/balsa-print-object-decor.c (bpo_decor_print_frame_begin):
+ * src/balsa-print-object-default.c
+ (balsa_print_object_default_full):
+ * src/balsa-print-object-header.c
+ (balsa_print_object_header_new_real),
+ (balsa_print_object_header_crypto),
+ (balsa_print_object_header_draw):
+ * src/balsa-print-object-text.c (balsa_print_object_text_plain),
+ (balsa_print_object_text), (balsa_print_object_text_draw):
+ * src/mailbox-conf.c (mailbox_conf_add):
+ * src/print-gtk.c (print_header_footer), (begin_print),
+ (message_print_page_setup), (message_print):
+ * src/save-restore.c (config_global_load):
+ * src/sendmsg-window.c (balsa_attach_info_finalize),
+ (balsa_sendmsg_destroy_handler), (collect_for_quote),
+ (sw_save_draft), (send_message_handler), (message_postpone):
+
2019-08-10 Peter Bloomfield <pbloomfield bellsouth net>
In calls to g_object_ref(), do not cast object using
diff --git a/libbalsa/autocrypt.c b/libbalsa/autocrypt.c
index 368f9c492..793ecc4e8 100644
--- a/libbalsa/autocrypt.c
+++ b/libbalsa/autocrypt.c
@@ -494,7 +494,7 @@ autocrypt_db_dialog_run(const gchar *date_string, GtkWindow *parent)
sqlite3_reset(query[5]);
/* set up the tree view */
- g_object_unref(G_OBJECT(model));
+ g_object_unref(model);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Mailbox"), renderer, "text", 0, NULL);
diff --git a/libbalsa/body.c b/libbalsa/body.c
index 65be001bd..996f61be6 100644
--- a/libbalsa/body.c
+++ b/libbalsa/body.c
@@ -85,7 +85,7 @@ libbalsa_message_body_free(LibBalsaMessageBody * body)
g_free(body->charset);
if (body->sig_info)
- g_object_unref(G_OBJECT(body->sig_info));
+ g_object_unref(body->sig_info);
libbalsa_message_body_free(body->next);
libbalsa_message_body_free(body->parts);
diff --git a/libbalsa/gmime-multipart-crypt.c b/libbalsa/gmime-multipart-crypt.c
index 922cc87f9..af7301484 100644
--- a/libbalsa/gmime-multipart-crypt.c
+++ b/libbalsa/gmime-multipart-crypt.c
@@ -444,7 +444,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
g_return_val_if_fail(GMIME_IS_MULTIPART_ENCRYPTED(mpe), NULL);
if (signature && *signature) {
- g_object_unref(G_OBJECT(*signature));
+ g_object_unref(*signature);
*signature = NULL;
}
@@ -530,7 +530,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
g_set_error(err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR, "%s",
_
("Cannot decrypt multipart/encrypted part: failed to parse decrypted content"));
- g_object_unref(G_OBJECT(sigstat));
+ g_object_unref(sigstat);
return NULL;
}
@@ -540,7 +540,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
if (g_mime_gpgme_sigstat_status(sigstat) != GPG_ERR_NOT_SIGNED)
*signature = sigstat;
else
- g_object_unref(G_OBJECT(sigstat));
+ g_object_unref(sigstat);
}
return decrypted;
diff --git a/libbalsa/html.c b/libbalsa/html.c
index a627ac300..6692b771f 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -122,9 +122,9 @@ html2text(gchar ** text, gsize len)
g_free(html2text[pathidx]);
}
g_output_stream_close(ostream, NULL, NULL);
- g_object_unref(G_OBJECT(stream));
+ g_object_unref(stream);
g_file_delete(html_data, NULL, NULL);
- g_object_unref(G_OBJECT(html_data));
+ g_object_unref(html_data);
}
if (err != NULL) {
libbalsa_information(LIBBALSA_INFORMATION_ERROR,
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index e05a6c803..8a3ea003a 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -279,7 +279,7 @@ lb_gpgme_select_key(const gchar * user_name, lb_key_sel_md_t mode, GList * keys,
keys = g_list_next(keys);
}
- g_object_unref(G_OBJECT(model));
+ g_object_unref(model);
renderer = gtk_cell_renderer_text_new();
column =
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index 3fdae6d51..5dca8eda7 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -433,7 +433,7 @@ ask_cert_real(void *data)
gcr_cert = gcr_simple_certificate_new(cert_der->data, cert_der->len);
g_byte_array_unref(cert_der);
cert_widget = GTK_WIDGET(gcr_certificate_widget_new(gcr_cert));
- g_object_unref(G_OBJECT(gcr_cert));
+ g_object_unref(gcr_cert);
str = g_string_new("");
g_string_printf(str, _("<big><b>Authenticity of this certificate "
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index 933dcef70..0fe1a6a6e 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -864,7 +864,7 @@ imap_exists_idle(gpointer data)
}
libbalsa_unlock_mailbox(mailbox);
- g_object_unref(G_OBJECT(mailbox));
+ g_object_unref(mailbox);
return FALSE;
}
@@ -2060,7 +2060,7 @@ libbalsa_mailbox_imap_get_message(LibBalsaMailbox * mailbox, guint msgno)
g_free(id);
}
} else
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
}
if (msg_info->message)
g_object_ref(msg_info->message); /* we want to keep one copy */
diff --git a/libbalsa/mailbox_pop3.c b/libbalsa/mailbox_pop3.c
index 525c6a016..b646826eb 100644
--- a/libbalsa/mailbox_pop3.c
+++ b/libbalsa/mailbox_pop3.c
@@ -324,7 +324,7 @@ pop_handler_close(pop_handler_t *handler,
result = FALSE;
}
} else {
- g_object_unref(G_OBJECT(handler->mbx_stream));
+ g_object_unref(handler->mbx_stream);
}
g_free(handler->path);
g_free(handler);
@@ -492,7 +492,7 @@ libbalsa_mailbox_pop3_startup(LibBalsaServer *server,
libbalsa_server_set_password(server, NULL, TRUE);
}
g_error_free(error);
- g_object_unref(G_OBJECT(pop));
+ g_object_unref(pop);
return NULL;
}
}
@@ -512,7 +512,7 @@ libbalsa_mailbox_pop3_startup(LibBalsaServer *server,
}
g_error_free(error);
net_client_shutdown(NET_CLIENT(pop));
- g_object_unref(G_OBJECT(pop));
+ g_object_unref(pop);
return NULL;
}
@@ -522,7 +522,7 @@ libbalsa_mailbox_pop3_startup(LibBalsaServer *server,
libbalsa_information(LIBBALSA_INFORMATION_ERROR, _("POP3 mailbox %s error: %s"), name,
error->message);
g_error_free(error);
net_client_shutdown(NET_CLIENT(pop));
- g_object_unref(G_OBJECT(pop));
+ g_object_unref(pop);
pop = NULL;
}
@@ -700,7 +700,7 @@ libbalsa_mailbox_pop3_check(LibBalsaMailbox * mailbox)
}
/* done - clean up */
- g_object_unref(G_OBJECT(pop));
+ g_object_unref(pop);
}
libbalsa_mailbox_progress_notify(mailbox, LIBBALSA_NTFY_FINISHED, 1.0, _("Finished"));
diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
index 41cd9b43b..54715d771 100644
--- a/libbalsa/rfc3156.c
+++ b/libbalsa/rfc3156.c
@@ -218,7 +218,7 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for,
return FALSE;
}
- g_object_unref(G_OBJECT(*content));
+ g_object_unref(*content);
*content = GMIME_OBJECT(mps);
return TRUE;
}
@@ -272,7 +272,7 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
if (!result) {
g_object_unref(encrypted_obj);
} else {
- g_object_unref(G_OBJECT(*content));
+ g_object_unref(*content);
*content = GMIME_OBJECT(encrypted_obj);
}
return result;
@@ -314,10 +314,10 @@ libbalsa_sign_encrypt_mime_object(GMimeObject ** content,
if (!libbalsa_encrypt_mime_object(&signed_object, rfc822_for, protocol,
always_trust, parent, error)) {
- g_object_unref(G_OBJECT(signed_object));
+ g_object_unref(signed_object);
return FALSE;
}
- g_object_unref(G_OBJECT(*content));
+ g_object_unref(*content);
*content = signed_object;
return TRUE;
@@ -356,7 +356,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
(GMIME_MULTIPART(body->mime_part)) < 2))
return FALSE;
if (body->parts->next->sig_info)
- g_object_unref(G_OBJECT(body->parts->next->sig_info));
+ g_object_unref(body->parts->next->sig_info);
/* verify the signature */
mailbox = libbalsa_message_get_mailbox(body->message);
@@ -464,7 +464,7 @@ libbalsa_body_decrypt(LibBalsaMessageBody *body, gpgme_protocol_t protocol, GtkW
if (g_mime_gpgme_sigstat_status(sig_state) != GPG_ERR_NOT_SIGNED)
body->sig_info = sig_state;
else
- g_object_unref(G_OBJECT(sig_state));
+ g_object_unref(sig_state);
}
return body;
@@ -555,7 +555,7 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
if (sig_info)
*sig_info = result;
else
- g_object_unref(G_OBJECT(result));
+ g_object_unref(result);
}
return retval;
}
@@ -613,7 +613,7 @@ libbalsa_rfc2440_decrypt(GMimePart * part, GMimeGpgmeSigstat ** sig_info,
if (sig_info && g_mime_gpgme_sigstat_status(result) != GPG_ERR_NOT_SIGNED)
*sig_info = result;
else
- g_object_unref(G_OBJECT(result));
+ g_object_unref(result);
}
return retval;
diff --git a/libbalsa/send.c b/libbalsa/send.c
index cb8550f84..dd008b512 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -184,10 +184,10 @@ msg_queue_item_destroy(MessageQueueItem *mqi)
net_client_smtp_msg_free(mqi->smtp_msg);
}
if (mqi->stream != NULL) {
- g_object_unref(G_OBJECT(mqi->stream));
+ g_object_unref(mqi->stream);
}
if (mqi->orig != NULL) {
- g_object_unref(G_OBJECT(mqi->orig));
+ g_object_unref(mqi->orig);
}
g_free(mqi);
}
@@ -215,10 +215,10 @@ static void
send_message_info_destroy(SendMessageInfo *smi)
{
if (smi->outbox != NULL) {
- g_object_unref(G_OBJECT(smi->outbox));
+ g_object_unref(smi->outbox);
}
if (smi->session != NULL) {
- g_object_unref(G_OBJECT(smi->session));
+ g_object_unref(smi->session);
}
if (smi->items != NULL) {
g_list_free_full(smi->items, (GDestroyNotify) msg_queue_item_destroy);
@@ -331,7 +331,7 @@ add_mime_body_plain(LibBalsaMessageBody *body,
filter_stream = g_mime_stream_filter_new(stream);
filter = g_mime_filter_charset_new("UTF-8", charset);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter);
- g_object_unref(G_OBJECT(filter));
+ g_object_unref(filter);
g_mime_stream_write(filter_stream, body->buffer, strlen(body->buffer));
g_object_unref(filter_stream);
@@ -342,7 +342,7 @@ add_mime_body_plain(LibBalsaMessageBody *body,
g_object_unref(stream);
g_mime_part_set_content_object(mime_part, wrapper);
- g_object_unref(G_OBJECT(wrapper));
+ g_object_unref(wrapper);
} else {
lbs_set_content(mime_part, body->buffer);
}
@@ -355,7 +355,7 @@ add_mime_body_plain(LibBalsaMessageBody *body,
parent, error);
if (*crypt_res != LIBBALSA_MESSAGE_CREATE_OK) {
- g_object_unref(G_OBJECT(mime_part));
+ g_object_unref(mime_part);
return NULL;
}
}
@@ -365,11 +365,11 @@ add_mime_body_plain(LibBalsaMessageBody *body,
GMimeMultipart *mpa = g_mime_multipart_new_with_subtype("alternative");
g_mime_multipart_add(mpa, GMIME_OBJECT(mime_part));
- g_object_unref(G_OBJECT(mime_part));
+ g_object_unref(mime_part);
mime_part = g_mime_part_new_with_type("text", "html");
g_mime_multipart_add(mpa, GMIME_OBJECT(mime_part));
- g_object_unref(G_OBJECT(mime_part));
+ g_object_unref(mime_part);
g_mime_object_set_disposition(GMIME_OBJECT(mime_part), GMIME_DISPOSITION_INLINE);
g_mime_part_set_content_encoding(mime_part, GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE);
g_mime_object_set_content_type_parameter(GMIME_OBJECT(mime_part),
@@ -384,7 +384,7 @@ add_mime_body_plain(LibBalsaMessageBody *body,
parent, error);
if (*crypt_res != LIBBALSA_MESSAGE_CREATE_OK) {
- g_object_unref(G_OBJECT(mpa));
+ g_object_unref(mpa);
return NULL;
}
}
@@ -1127,7 +1127,7 @@ balsa_send_message_real(SendMessageInfo *info)
g_idle_add((GSourceFunc) balsa_send_message_real_idle_cb, g_object_ref(info->outbox));
/* finalise the SMTP session (which may be slow) */
- g_object_unref(G_OBJECT(info->session));
+ g_object_unref(info->session);
info->session = NULL;
/* clean up */
@@ -1393,7 +1393,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
g_clear_error(&err);
g_free(msg);
}
- g_object_unref(G_OBJECT(mime_part));
+ g_object_unref(mime_part);
g_strfreev(mime_type);
return LIBBALSA_MESSAGE_CREATE_ERROR;
}
@@ -1423,7 +1423,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
&crypt_res, error);
if (!mime_part) {
if (mime_root != NULL) {
- g_object_unref(G_OBJECT(mime_root));
+ g_object_unref(mime_root);
}
return crypt_res;
}
@@ -1432,7 +1432,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
if (mime_root != NULL) {
g_mime_multipart_add(GMIME_MULTIPART(mime_root),
GMIME_OBJECT(mime_part));
- g_object_unref(G_OBJECT(mime_part));
+ g_object_unref(mime_part);
} else {
mime_root = mime_part;
}
@@ -1446,13 +1446,13 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
pubkey_part = lb_create_pubkey_part(message, parent, error);
if (pubkey_part == NULL) {
if (mime_root != NULL) {
- g_object_unref(G_OBJECT(mime_root));
+ g_object_unref(mime_root);
}
return LIBBALSA_MESSAGE_CREATE_ERROR;
}
if (mime_root != NULL) {
g_mime_multipart_add(GMIME_MULTIPART(mime_root), GMIME_OBJECT(pubkey_part));
- g_object_unref(G_OBJECT(pubkey_part));
+ g_object_unref(pubkey_part);
} else {
mime_root = GMIME_OBJECT(pubkey_part);
}
@@ -1478,7 +1478,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
param = param->next;
}
g_mime_message_set_mime_part(mime_message, mime_root);
- g_object_unref(G_OBJECT(mime_root));
+ g_object_unref(mime_root);
}
message_add_references(message, mime_message);
@@ -1555,7 +1555,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
!autocrypt_ignore(g_mime_object_get_content_type(mime_root))) {
tmp = autocrypt_header(identity, error);
if (tmp == NULL) {
- g_object_unref(G_OBJECT(mime_message));
+ g_object_unref(mime_message);
return LIBBALSA_MESSAGE_CREATE_ERROR;
}
g_mime_object_append_header(GMIME_OBJECT(mime_message), "Autocrypt", tmp);
@@ -1740,19 +1740,19 @@ libbalsa_fill_msg_queue_item_from_queu(LibBalsaMessage *message,
/* filter out unwanted headers */
filter = g_mime_filter_header_new();
g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter);
- g_object_unref(G_OBJECT(filter));
+ g_object_unref(filter);
/* add CRLF, encode dot */
filter = g_mime_filter_crlf_new(TRUE, TRUE);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter);
- g_object_unref(G_OBJECT(filter));
+ g_object_unref(filter);
/* write to a new stream */
mqi->stream = g_mime_stream_mem_new();
g_mime_stream_write_to_stream(filter_stream, mqi->stream);
- g_object_unref(G_OBJECT(filter_stream));
+ g_object_unref(filter_stream);
g_mime_stream_reset(mqi->stream);
- g_object_unref(G_OBJECT(msg_stream));
+ g_object_unref(msg_stream);
g_object_ref(mqi->orig);
result = LIBBALSA_MESSAGE_CREATE_OK;
diff --git a/libnetclient/net-client-pop.c b/libnetclient/net-client-pop.c
index 2c92e5dfc..0240ff96d 100644
--- a/libnetclient/net-client-pop.c
+++ b/libnetclient/net-client-pop.c
@@ -83,7 +83,7 @@ net_client_pop_new(const gchar *host, guint16 port, NetClientCryptMode crypt_mod
client = NET_CLIENT_POP(g_object_new(NET_CLIENT_POP_TYPE, NULL));
if (client != NULL) {
if (!net_client_configure(NET_CLIENT(client), host, port, MAX_POP_LINE_LEN, NULL)) {
- g_object_unref(G_OBJECT(client));
+ g_object_unref(client);
client = NULL;
} else {
client->crypt_mode = crypt_mode;
diff --git a/libnetclient/net-client-siobuf.c b/libnetclient/net-client-siobuf.c
index af2c0c823..6c6731ecd 100644
--- a/libnetclient/net-client-siobuf.c
+++ b/libnetclient/net-client-siobuf.c
@@ -47,7 +47,7 @@ net_client_siobuf_new(const gchar *host, guint16 port)
client = NET_CLIENT_SIOBUF(g_object_new(NET_CLIENT_SIOBUF_TYPE, NULL));
if (client != NULL) {
if (!net_client_configure(NET_CLIENT(client), host, port, 0, NULL)) {
- g_object_unref(G_OBJECT(client));
+ g_object_unref(client);
client = NULL;
} else {
client->buffer = g_string_sized_new(1024U);
diff --git a/libnetclient/net-client-smtp.c b/libnetclient/net-client-smtp.c
index 0c81dcc47..744f53665 100644
--- a/libnetclient/net-client-smtp.c
+++ b/libnetclient/net-client-smtp.c
@@ -85,7 +85,7 @@ net_client_smtp_new(const gchar *host, guint16 port, NetClientCryptMode crypt_mo
client = NET_CLIENT_SMTP(g_object_new(NET_CLIENT_SMTP_TYPE, NULL));
if (client != NULL) {
if (!net_client_configure(NET_CLIENT(client), host, port, MAX_SMTP_LINE_LEN, NULL)) {
- g_object_unref(G_OBJECT(client));
+ g_object_unref(client);
client = NULL;
} else {
client->crypt_mode = crypt_mode;
diff --git a/libnetclient/net-client.c b/libnetclient/net-client.c
index f3f1b3d12..cb7b39d84 100644
--- a/libnetclient/net-client.c
+++ b/libnetclient/net-client.c
@@ -78,7 +78,7 @@ net_client_new(const gchar *host_and_port, guint16 default_port, gsize max_line_
priv = net_client_get_instance_private(client);
if (priv->sock == NULL) {
- g_object_unref(G_OBJECT(client));
+ g_object_unref(client);
client = NULL;
} else {
priv->host_and_port = g_strdup(host_and_port);
@@ -175,28 +175,28 @@ net_client_shutdown(NetClient *client)
* throws a critical error for TLS. Observed with gio 2.48.2 and 2.50.3, no idea how
it can be fixed.
* See also https://bugzilla.gnome.org/show_bug.cgi?id=795985. */
if (priv->ostream != NULL) {
- g_object_unref(G_OBJECT(priv->ostream));
+ g_object_unref(priv->ostream);
}
- g_object_unref(G_OBJECT(priv->comp));
+ g_object_unref(priv->comp);
}
if (priv->decomp != NULL) {
- g_object_unref(G_OBJECT(priv->decomp));
+ g_object_unref(priv->decomp);
priv->decomp = NULL;
}
if (priv->comp_istream!= NULL) {
- g_object_unref(G_OBJECT(priv->comp_istream));
+ g_object_unref(priv->comp_istream);
priv->comp_istream = NULL;
}
if (priv->istream != NULL) {
- g_object_unref(G_OBJECT(priv->istream));
+ g_object_unref(priv->istream);
priv->istream = NULL;
}
if (priv->tls_conn != NULL) {
- g_object_unref(G_OBJECT(priv->tls_conn));
+ g_object_unref(priv->tls_conn);
priv->tls_conn = NULL;
}
if (priv->plain_conn != NULL) {
- g_object_unref(G_OBJECT(priv->plain_conn));
+ g_object_unref(priv->plain_conn);
priv->plain_conn = NULL;
}
}
@@ -394,7 +394,7 @@ net_client_set_cert_from_pem(NetClient *client, const gchar *pem_data, GError **
/* always free any existing certificate */
if (priv->certificate != NULL) {
- g_object_unref(G_OBJECT(priv->certificate));
+ g_object_unref(priv->certificate);
priv->certificate = NULL;
}
@@ -506,7 +506,7 @@ net_client_set_cert_from_file(NetClient *client, const gchar *pem_path, GError *
result = net_client_set_cert_from_pem(client, pem_buf, error);
g_free(pem_buf);
}
- g_object_unref(G_OBJECT(pem_file));
+ g_object_unref(pem_file);
return result;
}
@@ -534,13 +534,13 @@ net_client_start_tls(NetClient *client, GError **error)
result = g_tls_connection_handshake(G_TLS_CONNECTION(priv->tls_conn), NULL, error);
if (result) {
g_filter_input_stream_set_close_base_stream(G_FILTER_INPUT_STREAM(priv->istream), FALSE);
- g_object_unref(G_OBJECT(priv->istream)); /* unref the plain
connection's stream */
+ g_object_unref(priv->istream); /* unref the plain connection's
stream */
priv->istream =
g_data_input_stream_new(g_io_stream_get_input_stream(G_IO_STREAM(priv->tls_conn)));
g_data_input_stream_set_newline_type(priv->istream,
G_DATA_STREAM_NEWLINE_TYPE_CR_LF);
priv->ostream = g_io_stream_get_output_stream(G_IO_STREAM(priv->tls_conn));
g_debug("connection is encrypted");
} else {
- g_object_unref(G_OBJECT(priv->tls_conn));
+ g_object_unref(priv->tls_conn);
priv->tls_conn = NULL;
}
}
@@ -668,11 +668,11 @@ net_client_finalise(GObject *object)
net_client_shutdown(client);
if (priv->sock != NULL) {
- g_object_unref(G_OBJECT(priv->sock));
+ g_object_unref(priv->sock);
priv->sock = NULL;
}
if (priv->certificate != NULL) {
- g_object_unref(G_OBJECT(priv->certificate));
+ g_object_unref(priv->certificate);
priv->certificate = NULL;
}
g_debug("finalised connection to %s", priv->host_and_port);
diff --git a/src/ab-window.c b/src/ab-window.c
index ecd0da121..8743dbfcd 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -464,7 +464,7 @@ balsa_ab_window_get_recipients(BalsaAbWindow * ab)
LIST_COLUMN_ADDRESS, &address,
LIST_COLUMN_WHICH, &which_multiple, -1);
text = libbalsa_address_to_gchar(address, which_multiple);
- g_object_unref(G_OBJECT(address));
+ g_object_unref(address);
if (text) {
if (str->len > 0)
g_string_append(str, ", ");
@@ -533,7 +533,7 @@ balsa_ab_window_swap_real(GtkTreeModel * model, GtkTreePath * path,
* already reffed it, so it won't be finalized, even if there
* were no other outstanding refs. */
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
- g_object_unref(G_OBJECT(address));
+ g_object_unref(address);
g_free(name);
g_free(address_string);
}
@@ -611,7 +611,7 @@ balsa_ab_window_activate_address(GtkTreeView * view,
LIST_COLUMN_ADDRESS, &address,
LIST_COLUMN_WHICH, &which_multiple, -1);
addr = libbalsa_address_to_gchar(address, which_multiple);
- g_object_unref(G_OBJECT(address));
+ g_object_unref(address);
snd = sendmsg_window_compose_with_address(addr);
g_free(addr);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index b3b364626..180e6cfb6 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -747,7 +747,7 @@ balsa_message_init(BalsaMessage * bm)
G_CALLBACK(tree_button_press_cb), bm);
g_signal_connect(bm->treeview, "popup-menu",
G_CALLBACK(tree_menu_popup_key_cb), bm);
- g_object_unref (G_OBJECT (model));
+ g_object_unref(model);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (bm->treeview), FALSE);
@@ -1266,7 +1266,7 @@ balsa_message_set_embedded_hdr(GtkTreeModel * model, GtkTreePath * path,
info->body->embhdrs,
info->body->parts,
info->body->embhdrs->subject);
- g_object_unref(G_OBJECT(info));
+ g_object_unref(info);
}
return FALSE;
@@ -1531,7 +1531,7 @@ display_part(BalsaMessage * bm, LibBalsaMessageBody * body,
}
if (content_icon)
- g_object_unref(G_OBJECT(content_icon));
+ g_object_unref(content_icon);
g_free(content_desc);
g_free(content_type);
}
@@ -2496,7 +2496,7 @@ handle_mdn_request(GtkWindow *parent,
_("Sending the disposition notification failed: %s"),
error ? error->message : "?");
g_error_free(error);
- g_object_unref(G_OBJECT(mdn));
+ g_object_unref(mdn);
}
}
@@ -2643,8 +2643,8 @@ mdn_dialog_response(GtkWidget * dialog, gint response, gpointer user_data)
if (error)
g_error_free(error);
}
- g_object_unref(G_OBJECT(send_msg));
- g_object_unref(G_OBJECT(mdn_ident));
+ g_object_unref(send_msg);
+ g_object_unref(mdn_ident);
gtk_widget_destroy(dialog);
}
@@ -3274,7 +3274,7 @@ message_recheck_crypto_cb(GtkWidget * button, BalsaMessage * bm)
if (!gtk_tree_model_get_iter_first (gtk_tree_view_get_model(GTK_TREE_VIEW(bm->treeview)),
&iter)) {
libbalsa_message_body_unref(message);
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
return;
}
@@ -3290,7 +3290,7 @@ message_recheck_crypto_cb(GtkWidget * button, BalsaMessage * bm)
balsa_message_grab_focus(bm);
libbalsa_message_body_unref(message);
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
}
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index e01ccdf33..ad5239044 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -82,7 +82,7 @@ balsa_mime_widget_new_pgpkey(BalsaMessage *bm,
balsa_information(LIBBALSA_INFORMATION_ERROR, _("Could not process GnuPG keys: %s"),
err ? err->message : "Unknown error");
g_clear_error(&err);
- g_object_unref(G_OBJECT(mw));
+ g_object_unref(mw);
mw = NULL;
}
g_free(body_buf);
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 082273aac..93863dd96 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -388,7 +388,7 @@ extbody_send_mail(GtkWidget * button, LibBalsaMessageBody * mime_body)
_("Sending the external body request failed: %s"),
err ? err->message : "?");
g_error_free(err);
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
}
diff --git a/src/balsa-mime-widget-vcalendar.c b/src/balsa-mime-widget-vcalendar.c
index e98e775b3..99b8a56d4 100644
--- a/src/balsa-mime-widget-vcalendar.c
+++ b/src/balsa-mime-widget-vcalendar.c
@@ -349,5 +349,5 @@ vevent_reply(GObject * button, GtkWidget * box)
error ? error->message : "?");
if (error)
g_error_free(error);
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
}
diff --git a/src/balsa-print-object-decor.c b/src/balsa-print-object-decor.c
index 82fb0cfe3..8e8e73418 100644
--- a/src/balsa-print-object-decor.c
+++ b/src/balsa-print-object-decor.c
@@ -216,7 +216,7 @@ bpo_decor_print_frame_begin(cairo_t *cairo_ctx,
cairo_line_to(cairo_ctx, rect->c_at_x + C_LABEL_SEP, c_y_hor_line);
cairo_move_to(cairo_ctx, rect->c_at_x + 1.5 * C_LABEL_SEP, c_y_hor_line - 0.5 *
P_TO_C(p_label_height));
pango_cairo_show_layout(cairo_ctx, layout);
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
cairo_move_to(cairo_ctx, rect->c_at_x + 2.0 * C_LABEL_SEP + P_TO_C(p_label_width),
c_y_hor_line);
cairo_line_to(cairo_ctx, rect->c_at_x + rect->c_width, c_y_hor_line);
} else {
diff --git a/src/balsa-print-object-default.c b/src/balsa-print-object-default.c
index b2ccad69a..d0eacfe5e 100644
--- a/src/balsa-print-object-default.c
+++ b/src/balsa-print-object-default.c
@@ -238,7 +238,7 @@ balsa_print_object_default_full(GList *list,
list = g_list_append(list, new_pod);
}
g_list_free(par_parts);
- g_object_unref(G_OBJECT(test_layout));
+ g_object_unref(test_layout);
return list;
}
diff --git a/src/balsa-print-object-header.c b/src/balsa-print-object-header.c
index 68c055322..955647266 100644
--- a/src/balsa-print-object-header.c
+++ b/src/balsa-print-object-header.c
@@ -284,7 +284,7 @@ balsa_print_object_header_new_real(GList * list,
list = g_list_append(list, po);
}
g_list_free(chunks);
- g_object_unref(G_OBJECT(test_layout));
+ g_object_unref(test_layout);
return list;
}
@@ -363,7 +363,7 @@ balsa_print_object_header_crypto(GList *list,
/* split the headers into a list fitting on one or more pages */
chunks = split_for_layout(test_layout, textbuf, NULL, psetup, FALSE, NULL);
- g_object_unref(G_OBJECT(test_layout));
+ g_object_unref(test_layout);
g_free(textbuf);
/* create a list of objects */
@@ -428,7 +428,7 @@ balsa_print_object_header_draw(BalsaPrintObject * self,
c_height = P_TO_C(p_height); /* needed to properly print borders */
cairo_move_to(cairo_ctx, rect->c_at_x, rect->c_at_y);
pango_cairo_show_layout(cairo_ctx, layout);
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
/* print a face image */
if (po->face != NULL) {
diff --git a/src/balsa-print-object-text.c b/src/balsa-print-object-text.c
index 955c0f62d..71e504139 100644
--- a/src/balsa-print-object-text.c
+++ b/src/balsa-print-object-text.c
@@ -247,7 +247,7 @@ balsa_print_object_text_plain(GList *list, GtkPrintContext * context,
if (pango_attr_list != NULL) {
pango_attr_list_unref(pango_attr_list);
}
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
g_string_free(level_buf, TRUE);
/* each part is a new text object */
@@ -334,7 +334,7 @@ balsa_print_object_text(GList *list, GtkPrintContext * context,
first_page = psetup->page_count - 1;
c_at_y = psetup->c_y_pos;
par_parts = split_for_layout(layout, textbuf, NULL, psetup, FALSE, NULL);
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
pango_font_description_free(font);
g_free(textbuf);
@@ -633,7 +633,7 @@ balsa_print_object_text_draw(BalsaPrintObject * self,
}
cairo_move_to(cairo_ctx, rect->c_at_x + po->cite_level * C_LABEL_SEP, rect->c_at_y);
pango_cairo_show_layout(cairo_ctx, layout);
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
if (po->cite_level > 0) {
guint n;
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 5307cb90c..58149a41f 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -616,7 +616,7 @@ mailbox_conf_add(MailboxConfWindow * mcw)
if (libbalsa_mailbox_local_set_path(ml, path, TRUE) != 0) {
g_free(path);
- g_object_unref(G_OBJECT(mcw->mailbox));
+ g_object_unref(mcw->mailbox);
mcw->mailbox = NULL;
return;
}
diff --git a/src/print-gtk.c b/src/print-gtk.c
index 533e46604..bd9e47b16 100644
--- a/src/print-gtk.c
+++ b/src/print-gtk.c
@@ -96,7 +96,7 @@ print_header_footer(GtkPrintContext * context, cairo_t * cairo_ctx,
g_free(pagebuf);
cairo_move_to(cairo_ctx, pdata->setup.c_x0, pdata->c_header_y);
pango_cairo_show_layout(cairo_ctx, layout);
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
/* footer (if available) */
if (pdata->footer) {
@@ -111,7 +111,7 @@ print_header_footer(GtkPrintContext * context, cairo_t * cairo_ctx,
pango_layout_set_text(layout, pdata->footer, -1);
cairo_move_to(cairo_ctx, pdata->setup.c_x0, pdata->c_footer_y);
pango_cairo_show_layout(cairo_ctx, layout);
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
}
}
@@ -377,7 +377,7 @@ begin_print(GtkPrintOperation * operation, GtkPrintContext * context,
/* remember in the context */
pdata->footer = g_string_free(footer_string, FALSE);
}
- g_object_unref(G_OBJECT(layout));
+ g_object_unref(layout);
/* add the message headers */
pdata->setup.c_y_pos = 0.0; /* to simplify calculating the layout... */
@@ -724,7 +724,7 @@ message_print_page_setup(GtkWindow * parent)
balsa_app.print_settings);
if (balsa_app.page_setup)
- g_object_unref(G_OBJECT(balsa_app.page_setup));
+ g_object_unref(balsa_app.page_setup);
balsa_app.page_setup = new_page_setup;
}
@@ -789,6 +789,6 @@ message_print(LibBalsaMessage * msg, GtkWindow * parent)
g_list_free_full(print_data->print_parts, g_object_unref);
g_free(print_data->footer);
g_free(print_data);
- g_object_unref(G_OBJECT(print));
- g_object_unref(G_OBJECT(msg));
+ g_object_unref(print);
+ g_object_unref(msg);
}
diff --git a/src/save-restore.c b/src/save-restore.c
index 9775f2244..1cf0b7a95 100644
--- a/src/save-restore.c
+++ b/src/save-restore.c
@@ -912,7 +912,7 @@ config_global_load(void)
/* ... Printing */
if (balsa_app.page_setup)
- g_object_unref(G_OBJECT(balsa_app.page_setup));
+ g_object_unref(balsa_app.page_setup);
balsa_app.page_setup = restore_gtk_page_setup();
balsa_app.margin_left = libbalsa_conf_get_double("LeftMargin");
balsa_app.margin_top = libbalsa_conf_get_double("TopMargin");
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index fc8187a05..b39baaa3c 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -358,7 +358,7 @@ balsa_attach_info_finalize(GObject * object)
if (info->popup_menu)
gtk_widget_destroy(info->popup_menu);
if (info->file_uri)
- g_object_unref(G_OBJECT(info->file_uri));
+ g_object_unref(info->file_uri);
g_free(info->force_mime_type);
g_free(info->charset);
libbalsa_message_headers_destroy(info->headers);
@@ -578,7 +578,7 @@ balsa_sendmsg_destroy_handler(BalsaSendmsg * bsmsg)
libbalsa_mailbox_close(mailbox,
/* Respect pref setting: */
balsa_app.expunge_on_close);
- g_object_unref(G_OBJECT(bsmsg->parent_message));
+ g_object_unref(bsmsg->parent_message);
bsmsg->parent_message = NULL;
}
@@ -592,7 +592,7 @@ balsa_sendmsg_destroy_handler(BalsaSendmsg * bsmsg)
libbalsa_mailbox_close(mailbox,
/* Respect pref setting: */
balsa_app.expunge_on_close);
- g_object_unref(G_OBJECT(bsmsg->draft_message));
+ g_object_unref(bsmsg->draft_message);
bsmsg->draft_message = NULL;
}
@@ -3545,7 +3545,7 @@ collect_for_quote(BalsaSendmsg * bsmsg,
}
/* clean up */
- g_object_unref(G_OBJECT(tree_store));
+ g_object_unref(tree_store);
libbalsa_message_body_unref(message);
return q_body;
}
@@ -3932,7 +3932,7 @@ sw_save_draft(BalsaSendmsg * bsmsg)
/* Respect pref setting: */
balsa_app.expunge_on_close);
}
- g_object_unref(G_OBJECT(bsmsg->draft_message));
+ g_object_unref(bsmsg->draft_message);
}
bsmsg->state = SENDMSG_STATE_CLEAN;
@@ -5530,7 +5530,7 @@ send_message_handler(BalsaSendmsg * bsmsg, gboolean queue_only)
sw_delete_draft(bsmsg);
}
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
if (result != LIBBALSA_MESSAGE_CREATE_OK) {
const char *msg;
@@ -5662,7 +5662,7 @@ message_postpone(BalsaSendmsg * bsmsg)
g_clear_error(&error);
}
- g_object_unref(G_OBJECT(message));
+ g_object_unref(message);
return successp;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
