GNOME.org
 

[balsa] Do not use redundant cast

commit 64cc296ea7f09a19a81da75079e46c4bb1c987e7
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Aug 9 09:37:23 2019 -0400

    Do not use redundant cast
    
    In calls to g_object_[gs]et(), do not cast object using
    G_OBJECT(object).
    
    The argument is a gpointer, so the cast is redundant.
    
    * libbalsa/files.c (libbalsa_icon_finder):
    * libbalsa/libbalsa.c (libbalsa_is_cert_known), (ask_cert_real),
    (get_gnutls_cert):
    * libbalsa/mime.c (get_quote_tag):
    * libbalsa/server-config.c (libbalsa_server_cfg_new):
    * libnetclient/test/tests.c (check_cert):
    * src/balsa-app.c (ask_password_real):
    * src/balsa-mblist.c (balsa_mblist_init):
    * src/balsa-message.c (balsa_message_init):
    * src/balsa-mime-widget-message.c (balsa_mime_widget_new_message):
    * src/balsa-mime-widget-text.c (structured_phrases_toggle):
    * src/balsa-mime-widget.c (balsa_mime_widget_new):
    * src/main-window.c (balsa_window_new):
    * src/pref-manager.c (apply_prefs):
    * src/sendmsg-window.c (sw_attachment_list), (sw_can_undo_cb),
    (sw_can_redo_cb):
    * src/toolbar-factory.c (tm_populate):

 ChangeLog                       | 25 +++++++++++++++++++++++++
 libbalsa/files.c                |  2 +-
 libbalsa/libbalsa.c             |  6 +++---
 libbalsa/mime.c                 |  2 +-
 libbalsa/server-config.c        |  4 ++--
 libnetclient/test/tests.c       |  2 +-
 src/balsa-app.c                 |  2 +-
 src/balsa-mblist.c              |  2 +-
 src/balsa-message.c             |  6 +++---
 src/balsa-mime-widget-message.c |  2 +-
 src/balsa-mime-widget-text.c    |  6 +++---
 src/balsa-mime-widget.c         |  2 +-
 src/main-window.c               |  2 +-
 src/pref-manager.c              |  2 +-
 src/sendmsg-window.c            | 14 +++++++-------
 src/toolbar-factory.c           |  2 +-
 16 files changed, 53 insertions(+), 28 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e9daa60d8..b13c9febe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2019-08-09  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       In calls to g_object_[gs]et(), do not cast object using
+       G_OBJECT(object).
+
+       The argument is a gpointer, so the cast is redundant.
+
+       * libbalsa/files.c (libbalsa_icon_finder):
+       * libbalsa/libbalsa.c (libbalsa_is_cert_known), (ask_cert_real),
+       (get_gnutls_cert):
+       * libbalsa/mime.c (get_quote_tag):
+       * libbalsa/server-config.c (libbalsa_server_cfg_new):
+       * libnetclient/test/tests.c (check_cert):
+       * src/balsa-app.c (ask_password_real):
+       * src/balsa-mblist.c (balsa_mblist_init):
+       * src/balsa-message.c (balsa_message_init):
+       * src/balsa-mime-widget-message.c (balsa_mime_widget_new_message):
+       * src/balsa-mime-widget-text.c (structured_phrases_toggle):
+       * src/balsa-mime-widget.c (balsa_mime_widget_new):
+       * src/main-window.c (balsa_window_new):
+       * src/pref-manager.c (apply_prefs):
+       * src/sendmsg-window.c (sw_attachment_list), (sw_can_undo_cb),
+       (sw_can_redo_cb):
+       * src/toolbar-factory.c (tm_populate):
+
 2019-08-03  Albrecht Dreß  <albrecht dress arcor de>
 
        SMTP logging
diff --git a/libbalsa/files.c b/libbalsa/files.c
index d55206de8..ebeda21c9 100644
--- a/libbalsa/files.c
+++ b/libbalsa/files.c
@@ -134,7 +134,7 @@ libbalsa_icon_finder(GtkWidget         * widget,
             gint i;
             GStrv icon_names;
 
-            g_object_get(G_OBJECT(icon), "names", &icon_names, NULL);
+            g_object_get(icon, "names", &icon_names, NULL);
 
             if (icon_names != NULL) {
                 for (i = 0; pixbuf == NULL && icon_names[i] != NULL; i++) {
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index b3c6a9a8a..3fdae6d51 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -375,7 +375,7 @@ libbalsa_is_cert_known(GTlsCertificate      *cert,
                        gchar *pem_data;
                        FILE *fd;
 
-                       g_object_get(G_OBJECT(cert), "certificate-pem", &pem_data, NULL);
+                       g_object_get(cert, "certificate-pem", &pem_data, NULL);
                        fd = fopen(cert_file, "a");
                        if (fd != NULL) {
                                fputs(pem_data, fd);
@@ -429,7 +429,7 @@ ask_cert_real(void *data)
                                          _("_Reject"), GTK_RESPONSE_CANCEL,
                                          NULL);
     gtk_window_set_role(GTK_WINDOW(dialog), "tls_cert_dialog");
-    g_object_get(G_OBJECT(acd->certificate), "certificate", &cert_der, NULL);
+    g_object_get(acd->certificate, "certificate", &cert_der, NULL);
     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));
@@ -478,7 +478,7 @@ get_gnutls_cert(GTlsCertificate *cert)
     if (gnutls_res == GNUTLS_E_SUCCESS) {
        GByteArray *cert_der;
 
-       g_object_get(G_OBJECT(cert), "certificate", &cert_der, NULL);
+        g_object_get(cert, "certificate", &cert_der, NULL);
        if (cert_der != NULL) {
                gnutls_datum_t data;
 
diff --git a/libbalsa/mime.c b/libbalsa/mime.c
index 32f91b085..7363b5f12 100644
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@ -597,7 +597,7 @@ get_quote_tag(GtkTextIter * iter)
     for (list = tag_list; list; list = list->next) {
         GtkTextTag *tag = list->data;
         gchar *name;
-        g_object_get(G_OBJECT(tag), "name", &name, NULL);
+        g_object_get(tag, "name", &name, NULL);
         if (name) {
             if (!strncmp(name, "quote-", 6))
                 quote_tag = tag_list->data;
diff --git a/libbalsa/server-config.c b/libbalsa/server-config.c
index 2c828383b..fbb246e2e 100644
--- a/libbalsa/server-config.c
+++ b/libbalsa/server-config.c
@@ -133,7 +133,7 @@ libbalsa_server_cfg_new(LibBalsaServer *server, const gchar *name)
     server_cfg->password = server_cfg_add_entry(server_cfg->basic_grid, server_cfg->basic_rows++, _("_Pass 
Phrase:"),
                                           libbalsa_server_get_password(server),
         G_CALLBACK(on_server_cfg_changed), server_cfg);
-    g_object_set(G_OBJECT(server_cfg->password), "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
+    g_object_set(server_cfg->password, "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
     gtk_entry_set_visibility(GTK_ENTRY(server_cfg->password), FALSE);
 
     server_cfg->remember_pass = server_cfg_add_check(server_cfg->basic_grid, server_cfg->basic_rows++, 
remember_password_message[0],
@@ -160,7 +160,7 @@ libbalsa_server_cfg_new(LibBalsaServer *server, const gchar *name)
 
        server_cfg->cert_pass = server_cfg_add_entry(server_cfg->advanced_grid, server_cfg->advanced_rows++, 
_("Certificate _Pass Phrase:"),
                libbalsa_server_get_cert_passphrase(server), G_CALLBACK(on_server_cfg_changed), server_cfg);
-    g_object_set(G_OBJECT(server_cfg->cert_pass), "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
+    g_object_set(server_cfg->cert_pass, "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
     gtk_entry_set_visibility(GTK_ENTRY(server_cfg->cert_pass), FALSE);
 
     server_cfg->remember_cert_pass = server_cfg_add_check(server_cfg->advanced_grid, 
server_cfg->advanced_rows++, remember_password_message[1],
diff --git a/libnetclient/test/tests.c b/libnetclient/test/tests.c
index eb20401a6..7ceea8683 100644
--- a/libnetclient/test/tests.c
+++ b/libnetclient/test/tests.c
@@ -218,7 +218,7 @@ check_cert(NetClient *client, GTlsCertificate *peer_cert, GTlsCertificateFlags e
        gchar *hash;
        GByteArray *cert_der = NULL;
 
-       g_object_get(G_OBJECT(peer_cert), "certificate", &cert_der, NULL);
+       g_object_get(peer_cert, "certificate", &cert_der, NULL);
        hash = g_compute_checksum_for_data(G_CHECKSUM_SHA256, cert_der->data, cert_der->len);
        g_byte_array_unref(cert_der);
        g_message("%s(%p, %p, %x, %p) -> fp(sha256) = %s", __func__, client, peer_cert, errors, user_data, 
hash);
diff --git a/src/balsa-app.c b/src/balsa-app.c
index ba82eb4ca..de497ff38 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -177,7 +177,7 @@ ask_password_real(LibBalsaServer * server, const gchar *cert_subject)
 
     label = libbalsa_create_grid_label(_("Password:"), grid, 1);
     entry = libbalsa_create_grid_entry(grid, NULL, NULL, 1, NULL, label);
-    g_object_set(G_OBJECT(entry), "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
+    g_object_set(entry, "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
     gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
     gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_widget_grab_focus(entry);
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index 86ca8a8c7..40ac183ef 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -409,7 +409,7 @@ balsa_mblist_init(BalsaMBList * mblist)
     g_signal_connect(G_OBJECT(tree_view), "row-collapsed",
                      G_CALLBACK(bmbl_tree_collapse), NULL);
 
-    g_object_set(G_OBJECT(mblist),
+    g_object_set(mblist,
                  "show_content_info",
                  balsa_app.mblist_show_mb_content_info,
                  NULL);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 6a95708b9..ca5f998c2 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -753,7 +753,7 @@ balsa_message_init(BalsaMessage * bm)
 
     /* column for the part number */
     renderer = gtk_cell_renderer_text_new ();
-    g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+    g_object_set (renderer, "xalign", 0.0, NULL);
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (bm->treeview),
                                                  -1, NULL,
                                                  renderer, "text",
@@ -762,7 +762,7 @@ balsa_message_init(BalsaMessage * bm)
 
     /* column for type icon */
     renderer = gtk_cell_renderer_pixbuf_new ();
-    g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+    g_object_set (renderer, "xalign", 0.0, NULL);
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (bm->treeview),
                                                  -1, NULL,
                                                  renderer, "pixbuf",
@@ -771,7 +771,7 @@ balsa_message_init(BalsaMessage * bm)
 
     /* column for mime type */
     renderer = gtk_cell_renderer_text_new ();
-    g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+    g_object_set (renderer, "xalign", 0.0, NULL);
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (bm->treeview),
                                                  -1, NULL,
                                                  renderer, "text",
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index b43d8add3..082273aac 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -143,7 +143,7 @@ balsa_mime_widget_new_message(BalsaMessage * bm,
        mw->header_widget = bm_header_widget_new(bm, NULL);
         gtk_widget_set_valign(mw->header_widget, GTK_ALIGN_START);
         gtk_widget_set_vexpand(mw->header_widget, FALSE);
-        g_object_set(G_OBJECT(mw->header_widget), "margin", 5, NULL);
+        g_object_set(mw->header_widget, "margin", 5, NULL);
        gtk_container_add(GTK_CONTAINER(mw->widget), mw->header_widget);
        bmw_message_set_headers(bm, mw, mime_body, TRUE);
     }
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 32e0ebd3a..5a1533176 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -427,15 +427,15 @@ structured_phrases_toggle(GtkCheckMenuItem *checkmenuitem,
        return;
 
     if ((tag = gtk_text_tag_table_lookup(table, "hp-bold")))
-       g_object_set(G_OBJECT(tag), "weight",
+       g_object_set(tag, "weight",
                     new_hl ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
                     NULL);
     if ((tag = gtk_text_tag_table_lookup(table, "hp-underline")))
-       g_object_set(G_OBJECT(tag), "underline",
+       g_object_set(tag, "underline",
                     new_hl ? PANGO_UNDERLINE_SINGLE : PANGO_UNDERLINE_NONE,
                     NULL);
     if ((tag = gtk_text_tag_table_lookup(table, "hp-italic")))
-       g_object_set(G_OBJECT(tag), "style",
+       g_object_set(tag, "style",
                     new_hl ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
                     NULL);
 
diff --git a/src/balsa-mime-widget.c b/src/balsa-mime-widget.c
index 982b00bef..a52ed8186 100644
--- a/src/balsa-mime-widget.c
+++ b/src/balsa-mime-widget.c
@@ -178,7 +178,7 @@ balsa_mime_widget_new(BalsaMessage * bm, LibBalsaMessageBody * mime_body, gpoint
            if (GTK_IS_LAYOUT(mw->widget)) {
                 GtkAdjustment *vadj;
 
-                g_object_get(G_OBJECT(mw->widget), "vadjustment", &vadj,
+                g_object_get(mw->widget, "vadjustment", &vadj,
                              NULL);
                g_signal_connect(vadj, "changed",
                                 G_CALLBACK(vadj_change_cb), mw->widget);
diff --git a/src/main-window.c b/src/main-window.c
index 6ad1f4675..8ccc6acd7 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -2310,7 +2310,7 @@ balsa_window_new(GtkApplication *application)
     balsa_app.mblist =  BALSA_MBLIST(balsa_mblist_new());
     gtk_widget_show(GTK_WIDGET(balsa_app.mblist));
 
-    g_object_get(G_OBJECT(balsa_app.mblist), "hadjustment", &hadj,
+    g_object_get(balsa_app.mblist, "hadjustment", &hadj,
                  "vadjustment", &vadj, NULL);
     priv->mblist = gtk_scrolled_window_new(hadj, vadj);
 
diff --git a/src/pref-manager.c b/src/pref-manager.c
index de8f9f144..508cb300e 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -442,7 +442,7 @@ apply_prefs(GtkDialog * pbox)
                                      (pui->mblist_show_mb_content_info))) {
         balsa_app.mblist_show_mb_content_info =
             !balsa_app.mblist_show_mb_content_info;
-        g_object_set(G_OBJECT(balsa_app.mblist), "show_content_info",
+        g_object_set(balsa_app.mblist, "show_content_info",
                      balsa_app.mblist_show_mb_content_info, NULL);
     }
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index db7c07533..1defed754 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2633,7 +2633,7 @@ sw_attachment_list(BalsaSendmsg *bsmsg)
 
     /* column for type icon */
     renderer = gtk_cell_renderer_pixbuf_new();
-    g_object_set(G_OBJECT(renderer), "xalign", 0.0, NULL);
+    g_object_set(renderer, "xalign", 0.0, NULL);
     gtk_tree_view_insert_column_with_attributes(view,
                                                -1, NULL, renderer,
                                                "pixbuf", ATTACH_ICON_COLUMN,
@@ -2641,7 +2641,7 @@ sw_attachment_list(BalsaSendmsg *bsmsg)
 
     /* column for the mime type */
     renderer = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer), "xalign", 0.0, NULL);
+    g_object_set(renderer, "xalign", 0.0, NULL);
     gtk_tree_view_insert_column_with_attributes(view,
                                                -1, _("Type"), renderer,
                                                "text", ATTACH_TYPE_COLUMN,
@@ -2649,7 +2649,7 @@ sw_attachment_list(BalsaSendmsg *bsmsg)
 
     /* column for the attachment mode */
     renderer = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer), "xalign", 0.0, NULL);
+    g_object_set(renderer, "xalign", 0.0, NULL);
     column = gtk_tree_view_column_new_with_attributes(_("Mode"), renderer,
                                                      "text", ATTACH_MODE_COLUMN,
                                                      NULL);
@@ -2660,7 +2660,7 @@ sw_attachment_list(BalsaSendmsg *bsmsg)
 
     /* column for the attachment size */
     renderer = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
+    g_object_set(renderer, "xalign", 1.0, NULL);
     column = gtk_tree_view_column_new_with_attributes(_("Size"), renderer,
                                                      "text", ATTACH_SIZE_COLUMN,
                                                      NULL);
@@ -2671,7 +2671,7 @@ sw_attachment_list(BalsaSendmsg *bsmsg)
 
     /* column for the file type/description */
     renderer = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer), "xalign", 0.0, NULL);
+    g_object_set(renderer, "xalign", 0.0, NULL);
     gtk_tree_view_insert_column_with_attributes(view,
                                                -1, _("Description"), renderer,
                                                "text", ATTACH_DESC_COLUMN,
@@ -2803,7 +2803,7 @@ sw_can_undo_cb(GtkSourceBuffer * source_buffer, GParamSpec *arg1,
 {
     gboolean can_undo;
 
-    g_object_get(G_OBJECT(source_buffer), "can-undo", &can_undo, NULL);
+    g_object_get(source_buffer, "can-undo", &can_undo, NULL);
     sw_action_set_enabled(bsmsg, "undo", can_undo);
 }
 
@@ -2813,7 +2813,7 @@ sw_can_redo_cb(GtkSourceBuffer * source_buffer, GParamSpec *arg1,
 {
     gboolean can_redo;
 
-    g_object_get(G_OBJECT(source_buffer), "can-redo", &can_redo, NULL);
+    g_object_get(source_buffer, "can-redo", &can_redo, NULL);
     sw_action_set_enabled(bsmsg, "redo", can_redo);
 }
 
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index 799d2ccdb..15d992c6b 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -530,7 +530,7 @@ tm_populate(GtkWidget * toolbar, BalsaToolbarModel * model)
                 (type = g_action_get_state_type(action)) &&
                 g_variant_type_equal(type, G_VARIANT_TYPE_BOOLEAN)) {
                 item = gtk_toggle_tool_button_new();
-                g_object_set(G_OBJECT(item), "icon-widget", icon,
+                g_object_set(item, "icon-widget", icon,
                              "label", entry->action, NULL);
             } else {
                 item = gtk_tool_button_new(icon, entry->action);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]