GNOME.org
 

[balsa/wip/gtk4: 206/351] Use gtk_box_pack_start()

commit 6923e888119b173ed69d9a5342ce8959cd040598
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Mar 5 17:37:58 2018 -0500

    Use gtk_box_pack_start()
    
    …instead of gtk_container_add(), when the widget is a GtkBox. That
    includes a GtkDialog's content-area, which is documented to be a GtkBox.
    
    The ContainerClass method, gtk_box_add(), does exactly the same thing,
    so we cut out one function call.

 libbalsa/identity.c               |    6 ++--
 libbalsa/libbalsa-gpgme-cb.c      |   16 +++++---------
 libbalsa/smtp-server.c            |    3 +-
 src/ab-main.c                     |   38 +++++++++++++++++++-----------------
 src/ab-window.c                   |    4 +-
 src/address-book-config.c         |   14 +++---------
 src/balsa-app.c                   |   11 +++++----
 src/balsa-index.c                 |    7 +++--
 src/balsa-mblist.c                |    4 +--
 src/balsa-mime-widget-crypto.c    |    2 +-
 src/balsa-mime-widget-message.c   |   12 +++++-----
 src/balsa-mime-widget-vcalendar.c |   16 +++++++-------
 src/filter-edit-dialog.c          |   14 ++++++------
 src/filter-run-dialog.c           |   12 +++++-----
 src/folder-conf.c                 |   12 +++-------
 src/mailbox-conf.c                |    8 +++---
 src/main-window.c                 |   15 +++----------
 src/pref-manager.c                |    6 ++--
 src/toolbar-prefs.c               |    4 +-
 19 files changed, 93 insertions(+), 111 deletions(-)
---
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index 74b7909..d9f5a40 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -1304,7 +1304,7 @@ md_face_path_changed(const gchar * filename, gboolean active,
 
     gtk_container_foreach(GTK_CONTAINER(face_box),
                           (GtkCallback) gtk_widget_destroy, NULL);
-    gtk_container_add(GTK_CONTAINER(face_box), image);
+    gtk_box_pack_start(GTK_BOX(face_box), image);
     gtk_widget_show(face_box);
 
     g_free(content);
@@ -1416,10 +1416,10 @@ ident_dialog_add_boxes(GtkWidget * grid, gint row, GtkDialog * dialog,
     gtk_grid_attach(GTK_GRID(grid), hbox, 1, row, 1, 1);
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     g_object_set_data(G_OBJECT(dialog), key1, vbox);
-    gtk_container_add(GTK_CONTAINER(hbox), vbox);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox);
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     g_object_set_data(G_OBJECT(dialog), key2, vbox);
-    gtk_container_add(GTK_CONTAINER(hbox), vbox);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox);
 }
 
 /* set_identity_name_in_tree:
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index 9c8b527..fd64640 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -186,9 +186,7 @@ lb_gpgme_select_key(const gchar * user_name, lb_key_sel_md_t mode, GList * keys,
 #endif
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_widget_set_vexpand (vbox, TRUE);
-    gtk_container_add(GTK_CONTAINER
-                     (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                     vbox);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
     g_object_set(G_OBJECT(vbox), "margin", 12, NULL);
     switch (mode) {
        case LB_SELECT_PRIVATE_KEY:
@@ -345,18 +343,16 @@ get_passphrase_real(const gchar * uid_hint, const gchar * passphrase_info,
 #endif
     hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
     g_object_set(G_OBJECT(hbox), "margin", 12, NULL);
-    gtk_container_add(GTK_CONTAINER
-                     (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                     hbox);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox);
 
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
-    gtk_container_add(GTK_CONTAINER(hbox), vbox);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox);
     if (!padlock_keyhole)
        padlock_keyhole =
            gdk_pixbuf_new_from_xpm_data(padlock_keyhole_xpm);
     gtk_box_pack_start(GTK_BOX(vbox), gtk_image_new_from_pixbuf(padlock_keyhole));
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
-    gtk_container_add(GTK_CONTAINER(hbox), vbox);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox);
     if (prev_was_bad)
        prompt =
            g_strdup_printf(_
@@ -367,10 +363,10 @@ get_passphrase_real(const gchar * uid_hint, const gchar * passphrase_info,
            g_strdup_printf(_
                            ("%s\nPlease enter the passphrase for the secret key!\n\nKey: %s"),
                            passphrase_info, uid_hint);
-    gtk_container_add(GTK_CONTAINER(vbox), gtk_label_new(prompt));
+    gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(prompt));
     g_free(prompt);
     entry = gtk_entry_new();
-    gtk_container_add(GTK_CONTAINER(vbox), entry);
+    gtk_box_pack_start(GTK_BOX(vbox), entry);
 
     gtk_widget_show(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
     gtk_entry_set_width_chars(GTK_ENTRY(entry), 40);
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index c735cce..7020018 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -472,7 +472,8 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
                                       FALSE);
 
     notebook = gtk_notebook_new();
-    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), notebook);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+                       notebook);
 
 #define HIG_PADDING 12
 
diff --git a/src/ab-main.c b/src/ab-main.c
index 068853a..c2396a1 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -862,24 +862,28 @@ cancel_button_cb(GtkWidget * w, gpointer data)
 static GtkWidget*
 bab_get_edit_button_box(struct ABMainWindow *abmw)
 {
-    GtkWidget *box;
-    box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-    gtk_container_add(GTK_CONTAINER(box),
-                      abmw->apply_button =
-                      gtk_button_new_with_mnemonic(_("_Apply")));
-    g_signal_connect(G_OBJECT(abmw->apply_button), "clicked",
+    GtkWidget *box_widget;
+    GtkBox *box;
+
+    box_widget = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+    box = GTK_BOX(box_widget);
+
+    abmw->apply_button = gtk_button_new_with_mnemonic(_("_Apply"));
+    gtk_box_pack_start(box, abmw->apply_button);
+    g_signal_connect(abmw->apply_button, "clicked",
                      G_CALLBACK(apply_button_cb), (gpointer) NULL);
-    gtk_container_add(GTK_CONTAINER(box),
-                      abmw->remove_button =
-                      gtk_button_new_with_mnemonic(_("_Remove")));
-    g_signal_connect(G_OBJECT(abmw->remove_button), "clicked",
+
+    abmw->remove_button = gtk_button_new_with_mnemonic(_("_Remove"));
+    gtk_box_pack_start(box, abmw->remove_button);
+    g_signal_connect(abmw->remove_button, "clicked",
                      G_CALLBACK(remove_button_cb), (gpointer) NULL);
-    gtk_container_add(GTK_CONTAINER(box),
-                      abmw->cancel_button =
-                      gtk_button_new_with_mnemonic(_("_Cancel")));
-    g_signal_connect(G_OBJECT(abmw->cancel_button), "clicked",
+
+    abmw->cancel_button = gtk_button_new_with_mnemonic(_("_Cancel"));
+    gtk_box_pack_start(box, abmw->cancel_button);
+    g_signal_connect(abmw->cancel_button, "clicked",
                      G_CALLBACK(cancel_button_cb), abmw);
-    return box;
+
+    return box_widget;
 }
 
 static void
@@ -913,9 +917,7 @@ bab_get_filter_box(void)
     gtk_box_pack_start(GTK_BOX(search_hbox), find_entry);
     gtk_widget_show(search_hbox);
     gtk_label_set_mnemonic_widget(GTK_LABEL(find_label), find_entry);
-    button = gtk_button_new();
-    gtk_container_add(GTK_CONTAINER(button),
-                      gtk_image_new_from_icon_name("gtk-ok"));
+    button = gtk_button_new_from_icon_name("gtk-ok");
     gtk_box_pack_start(GTK_BOX(search_hbox), button);
 
     g_signal_connect(G_OBJECT(find_entry), "activate",
diff --git a/src/ab-window.c b/src/ab-window.c
index 4fd0884..2f51c1f 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -331,14 +331,14 @@ balsa_ab_window_init(BalsaAbWindow *ab)
     w = gtk_button_new_with_mnemonic(_("Run _Editor"));
     g_signal_connect(w, "clicked",
                      G_CALLBACK(balsa_ab_window_run_editor), NULL);
-    gtk_container_add(GTK_CONTAINER(hbox), w);
+    gtk_box_pack_start(GTK_BOX(hbox), w);
     gtk_widget_show(w);
 
     w = gtk_button_new_with_mnemonic(_("_Re-import"));
     g_signal_connect(G_OBJECT(w), "clicked",
                      G_CALLBACK(balsa_ab_window_reload),
                       ab);
-    gtk_container_add(GTK_CONTAINER(hbox), w);
+    gtk_box_pack_start(GTK_BOX(hbox), w);
     gtk_widget_show(w);
 
     balsa_ab_window_load(ab);
diff --git a/src/address-book-config.c b/src/address-book-config.c
index bec572f..ddb5955 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -394,7 +394,7 @@ create_osmo_dialog(AddressBookConfig *abc)
 
     grid = libbalsa_create_grid();
     content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-    gtk_container_add(GTK_CONTAINER(content_area), grid);
+    gtk_box_pack_start(GTK_BOX(content_area), grid);
     gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), grid);
     label = libbalsa_create_grid_label(_("A_ddress Book Name:"), grid, 0);
     gtk_size_group_add_widget(size_group, label);
@@ -468,9 +468,7 @@ create_externq_dialog(AddressBookConfig * abc)
 
     dialog = create_generic_dialog(abc, "Extern");
     g_object_set(G_OBJECT(grid), "margin", 12, NULL);
-    gtk_container_add(GTK_CONTAINER
-                      (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      grid);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), grid);
     return dialog;
 }
 
@@ -538,9 +536,7 @@ create_ldap_dialog(AddressBookConfig * abc)
     
     dialog = create_generic_dialog(abc, "LDAP");
     g_object_set(G_OBJECT(grid), "margin", 12, NULL);
-    gtk_container_add(GTK_CONTAINER
-                      (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      grid);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), grid);
     return dialog;
 }
 #endif
@@ -573,9 +569,7 @@ create_gpe_dialog(AddressBookConfig * abc)
 
     dialog = create_generic_dialog(abc, "GPE");
     g_object_set(G_OBJECT(grid), "margin", 12, NULL);
-    gtk_container_add(GTK_CONTAINER
-                      (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      grid);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), grid);
     return dialog;
 }
 #endif
diff --git a/src/balsa-app.c b/src/balsa-app.c
index 530bef0..4b36134 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -90,16 +90,17 @@ ask_password_real(LibBalsaServer * server, LibBalsaMailbox * mbox)
 #endif
     content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
     gtk_box_set_spacing(GTK_BOX(content_area), HIG_PADDING);
-    gtk_container_add(GTK_CONTAINER(content_area),
-                      gtk_label_new_with_mnemonic(prompt));
+    gtk_box_pack_start(GTK_BOX(content_area),
+                       gtk_label_new_with_mnemonic(prompt));
     g_free(prompt);
-    gtk_container_add(GTK_CONTAINER(content_area),
-                      entry = gtk_entry_new());
+
+    entry = gtk_entry_new();
+    gtk_box_pack_start(GTK_BOX(content_area), entry);
     gtk_entry_set_width_chars(GTK_ENTRY(entry), 20);
     gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
 
     rememb =  gtk_check_button_new_with_mnemonic(_(remember_password_message));
-    gtk_container_add(GTK_CONTAINER(content_area), rememb);
+    gtk_box_pack_start(GTK_BOX(content_area), rememb);
     if(server->remember_passwd)
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rememb), TRUE);
 
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 5f6f7e1..9e10acc 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -2629,15 +2629,16 @@ balsa_index_pipe(BalsaIndex * index)
     vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
     g_object_set(G_OBJECT(vbox), "margin", 5, NULL);
     gtk_box_set_spacing(GTK_BOX(vbox), HIG_PADDING);
-    gtk_container_add(GTK_CONTAINER(vbox), label =
-                      gtk_label_new(_("Specify the program to run:")));
+
+    label = gtk_label_new(_("Specify the program to run:"));
+    gtk_box_pack_start(GTK_BOX(vbox), label);
 
     info->entry = entry = gtk_combo_box_text_new_with_entry();
     for (list = balsa_app.pipe_cmds; list; list = list->next)
         gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(entry),
                                        list->data);
     gtk_combo_box_set_active(GTK_COMBO_BOX(entry), 0);
-    gtk_container_add(GTK_CONTAINER(vbox), entry);
+    gtk_box_pack_start(GTK_BOX(vbox), entry);
 
     gtk_widget_show(label);
     gtk_widget_show(entry);
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index a4af819..291459e 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -1804,9 +1804,7 @@ bmbl_mru_show_tree(GtkWidget * widget, gpointer data)
     libbalsa_macosx_menu_for_parent(dialog, mru->window);
 #endif
     gtk_widget_set_vexpand(scroll, TRUE);
-    gtk_box_pack_start(GTK_BOX
-                      (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      scroll);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), scroll);
 
     g_signal_connect(dialog, "size-allocate",
                      G_CALLBACK(bmbl_mru_size_allocate_cb), NULL);
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index d28a58c..5620bdf 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -148,7 +148,7 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
      * the label... */
     signature_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     expander = gtk_expander_new(lines[0]);
-    gtk_container_add(GTK_CONTAINER(signature_widget), expander);
+    gtk_box_pack_start(GTK_BOX(signature_widget), expander);
     gtk_container_add(GTK_CONTAINER(expander), vbox);
 
     /* add a callback to load the key when the user wants to show the details
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index d5dc834..3c07476 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -494,7 +494,7 @@ bm_header_widget_new(BalsaMessage * bm, GtkWidget * const * buttons)
 
 #ifdef GTK_INFO_BAR_WRAPPING_IS_BROKEN
     hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_container_add(GTK_CONTAINER(hbox), grid);
+    gtk_box_pack_start(GTK_BOX(hbox), grid);
     g_object_set(G_OBJECT(hbox), "margin", 6, NULL);
 
     action_area = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
@@ -506,7 +506,7 @@ bm_header_widget_new(BalsaMessage * bm, GtkWidget * const * buttons)
     info_bar = GTK_INFO_BAR(info_bar_widget);
 
     content_area = gtk_info_bar_get_content_area(info_bar);
-    gtk_container_add(GTK_CONTAINER(content_area), grid);
+    gtk_box_pack_start(GTK_BOX(content_area), grid);
 
     action_area = gtk_info_bar_get_action_area(info_bar);
     gtk_orientable_set_orientation(GTK_ORIENTABLE(action_area),
@@ -516,14 +516,14 @@ bm_header_widget_new(BalsaMessage * bm, GtkWidget * const * buttons)
 #endif                          /* GTK_INFO_BAR_WRAPPING_IS_BROKEN */
     if (!bm->face_box) {
         bm->face_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-        gtk_container_add(GTK_CONTAINER(action_area), bm->face_box);
+        gtk_box_pack_start(GTK_BOX(action_area), bm->face_box);
         gtk_button_box_set_child_non_homogeneous(GTK_BUTTON_BOX(action_area),
                                                  bm->face_box, TRUE);
     }
 
     if (buttons) {
         while (*buttons) {
-            gtk_container_add(GTK_CONTAINER(action_area), *buttons++);
+            gtk_box_pack_start(GTK_BOX(action_area), *buttons++);
         }
     }
 
@@ -652,8 +652,8 @@ add_header_gchar(GtkGrid * grid, const gchar * header, const gchar * label,
                          G_CALLBACK(label_size_allocate_cb), expander);
 
         hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-        gtk_container_add(GTK_CONTAINER(hbox), value_label);
-        gtk_container_add(GTK_CONTAINER(hbox), expander);
+        gtk_box_pack_start(GTK_BOX(hbox), value_label);
+        gtk_box_pack_start(GTK_BOX(hbox), expander);
         gtk_widget_show(hbox);
         gtk_grid_attach_next_to(grid, hbox, lab, GTK_POS_RIGHT, 1, 1);
     }
diff --git a/src/balsa-mime-widget-vcalendar.c b/src/balsa-mime-widget-vcalendar.c
index ca6f8ea..80cc2b2 100644
--- a/src/balsa-mime-widget-vcalendar.c
+++ b/src/balsa-mime-widget-vcalendar.c
@@ -70,7 +70,7 @@ balsa_mime_widget_new_vcalendar(BalsaMessage * bm,
     g_free(text);
     gtk_widget_set_halign(label, GTK_ALIGN_START);
     gtk_widget_set_valign(label, GTK_ALIGN_START);
-    gtk_container_add(GTK_CONTAINER(widget), label);
+    gtk_box_pack_start(GTK_BOX(widget), label);
 
     /* a reply may be created only for unread requests */
     if ((vcal_obj->method == ITIP_REQUEST) &&
@@ -94,7 +94,7 @@ balsa_mime_widget_new_vcalendar(BalsaMessage * bm,
        GtkWidget *event =
            balsa_vevent_widget((LibBalsaVEvent *) l->data, may_reply,
                                sender);
-       gtk_container_add(GTK_CONTAINER(widget), event);
+       gtk_box_pack_start(GTK_BOX(widget), event);
     }
 
     g_object_unref(vcal_obj);
@@ -228,14 +228,14 @@ balsa_vevent_widget(LibBalsaVEvent * event, gboolean may_reply,
                               (GDestroyNotify) g_object_unref);
 
        /* pack everything into a box */
-       gtk_container_add(GTK_CONTAINER(box), GTK_WIDGET(grid));
+       gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(grid));
        label =
            gtk_label_new(_("The sender asks you for a reply to this request:"));
-       gtk_container_add(GTK_CONTAINER(box), label);
+       gtk_box_pack_start(GTK_BOX(box), label);
        bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox),
                                  GTK_BUTTONBOX_SPREAD);
-       gtk_container_add(GTK_CONTAINER(box), bbox);
+       gtk_box_pack_start(GTK_BOX(box), bbox);
 
        button = gtk_button_new_with_label(_("Accept"));
        g_object_set_data_full(G_OBJECT(button), "event", event,
@@ -244,7 +244,7 @@ balsa_vevent_widget(LibBalsaVEvent * event, gboolean may_reply,
                          GINT_TO_POINTER(VCAL_PSTAT_ACCEPTED));
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(vevent_reply), bbox);
-       gtk_container_add(GTK_CONTAINER(bbox), button);
+       gtk_box_pack_start(GTK_BOX(bbox), button);
 
        button = gtk_button_new_with_label(_("Accept tentatively"));
        g_object_set_data(G_OBJECT(button), "event", event);
@@ -252,7 +252,7 @@ balsa_vevent_widget(LibBalsaVEvent * event, gboolean may_reply,
                          GINT_TO_POINTER(VCAL_PSTAT_TENTATIVE));
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(vevent_reply), bbox);
-       gtk_container_add(GTK_CONTAINER(bbox), button);
+       gtk_box_pack_start(GTK_BOX(bbox), button);
 
        button = gtk_button_new_with_label(_("Decline"));
        g_object_set_data(G_OBJECT(button), "event", event);
@@ -260,7 +260,7 @@ balsa_vevent_widget(LibBalsaVEvent * event, gboolean may_reply,
                          GINT_TO_POINTER(VCAL_PSTAT_DECLINED));
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(vevent_reply), bbox);
-       gtk_container_add(GTK_CONTAINER(bbox), button);
+       gtk_box_pack_start(GTK_BOX(bbox), button);
 
        return box;
     } else
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index 2ec9ebe..17441f2 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -226,12 +226,12 @@ build_left_side(void)
     fe_new_button = gtk_button_new_with_mnemonic(C_("filter", "_New"));
     g_signal_connect(G_OBJECT(fe_new_button), "clicked",
                     G_CALLBACK(fe_new_pressed), NULL);
-    gtk_container_add(GTK_CONTAINER(bbox), fe_new_button);
+    gtk_box_pack_start(GTK_BOX(bbox), fe_new_button);
     /* delete button */
     fe_delete_button = gtk_button_new_with_mnemonic(("_Delete"));
     g_signal_connect(G_OBJECT(fe_delete_button), "clicked",
                     G_CALLBACK(fe_delete_pressed), NULL);
-    gtk_container_add(GTK_CONTAINER(bbox), fe_delete_button);
+    gtk_box_pack_start(GTK_BOX(bbox), fe_delete_button);
     gtk_widget_set_sensitive(fe_delete_button, FALSE);
 
     return vbox;
@@ -309,17 +309,17 @@ build_match_page()
     gtk_grid_attach(GTK_GRID(page), box, 0, 3, 2, 1);
     fe_condition_edit_button = gtk_button_new_with_mnemonic(_("_Edit"));
     gtk_widget_set_sensitive(fe_condition_edit_button,FALSE);
-    gtk_container_add(GTK_CONTAINER(box), fe_condition_edit_button);
+    gtk_box_pack_start(GTK_BOX(box), fe_condition_edit_button);
     g_signal_connect(G_OBJECT(fe_condition_edit_button), "clicked",
                      G_CALLBACK(fe_edit_condition), GINT_TO_POINTER(0));
     /* Translators: button "New" filter match */
     button = gtk_button_new_with_mnemonic(C_("filter match", "Ne_w"));
-    gtk_container_add(GTK_CONTAINER(box), button);
+    gtk_box_pack_start(GTK_BOX(box), button);
     g_signal_connect(G_OBJECT(button), "clicked",
                      G_CALLBACK(fe_edit_condition), GINT_TO_POINTER(1));
     fe_condition_delete_button = gtk_button_new_with_mnemonic(_("_Remove"));
     gtk_widget_set_sensitive(fe_condition_delete_button,FALSE);
-    gtk_container_add(GTK_CONTAINER(box), fe_condition_delete_button);
+    gtk_box_pack_start(GTK_BOX(box), fe_condition_delete_button);
     g_signal_connect(G_OBJECT(fe_condition_delete_button), "clicked",
                     G_CALLBACK(fe_condition_remove_pressed), NULL);
 
@@ -503,12 +503,12 @@ build_right_side(GtkWindow * window)
     fe_apply_button = gtk_button_new_with_mnemonic(_("_Apply"));
     g_signal_connect(G_OBJECT(fe_apply_button), "clicked",
                     G_CALLBACK(fe_apply_pressed), NULL);
-    gtk_container_add(GTK_CONTAINER(bbox), fe_apply_button);
+    gtk_box_pack_start(GTK_BOX(bbox), fe_apply_button);
 
     fe_revert_button = gtk_button_new_with_mnemonic(_("Re_vert"));
     g_signal_connect(G_OBJECT(fe_revert_button), "clicked",
                     G_CALLBACK(fe_revert_pressed), NULL);
-    gtk_container_add(GTK_CONTAINER(bbox), fe_revert_button);
+    gtk_box_pack_start(GTK_BOX(bbox), fe_revert_button);
     gtk_widget_set_sensitive(fe_apply_button, FALSE);
     gtk_widget_set_sensitive(fe_revert_button, FALSE);
 
diff --git a/src/filter-run-dialog.c b/src/filter-run-dialog.c
index 7e31bcd..eafda90 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -361,7 +361,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     gtk_widget_set_sensitive(button, FALSE);
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_apply_selected_pressed), p);
-    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_box_pack_start(GTK_BOX(bbox), button);
 
     /* Buttons between the 2 lists */
     bbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
@@ -376,7 +376,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     gtk_widget_set_sensitive(button, FALSE);
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_add_pressed), G_OBJECT(p));
-    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_box_pack_start(GTK_BOX(bbox), button);
     /* Left/Remove button */
     p->remove_button = button =
         gtk_button_new_from_icon_name("go-previous-symbolic");
@@ -385,7 +385,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     gtk_widget_set_sensitive(button, FALSE);
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_remove_pressed), G_OBJECT(p));
-    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_box_pack_start(GTK_BOX(bbox), button);
 
     gtk_widget_set_margin_start(bbox, 4);
     gtk_box_pack_start(GTK_BOX(hbox), bbox);
@@ -428,7 +428,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
                                 _("Move selected filter up"));
     g_signal_connect(G_OBJECT(button), "clicked",
                     G_CALLBACK(fr_up_pressed), p);
-    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_box_pack_start(GTK_BOX(bbox), button);
     /* down button */
     p->move_down_button = button =
         gtk_button_new_from_icon_name("go-down-symbolic");
@@ -437,14 +437,14 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
                                 _("Move selected filter down"));
     g_signal_connect(G_OBJECT(button), "clicked",
                     G_CALLBACK(fr_down_pressed), p);
-    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_box_pack_start(GTK_BOX(bbox), button);
 
     p->apply_now_button = button =
         gtk_button_new_with_mnemonic(_("A_pply Now!"));
     gtk_widget_set_sensitive(button, FALSE);
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_apply_now_pressed), G_OBJECT(p));
-    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_box_pack_start(GTK_BOX(bbox), button);
 
     p->filters_modified=FALSE;
 }
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 1f0a0f9..3c04206 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -317,8 +317,7 @@ folder_conf_imap_node(BalsaMailboxNode *mn)
 
     notebook = gtk_notebook_new();
     gtk_widget_set_vexpand(notebook, TRUE);
-    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(fcw->dialog)),
-                       notebook);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(fcw->dialog)), notebook);
     grid = libbalsa_create_grid();
     g_object_set(G_OBJECT(grid), "margin", 12, NULL);
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook), grid,
@@ -568,9 +567,7 @@ browse_button_cb(GtkWidget * widget, SubfolderDialogData * sdd)
     
     scroll = gtk_scrolled_window_new(NULL, NULL);
     gtk_widget_set_vexpand(scroll, TRUE);
-    gtk_box_pack_start(GTK_BOX
-                       (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                       scroll);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), scroll);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
                                    GTK_POLICY_AUTOMATIC,
                                    GTK_POLICY_ALWAYS);
@@ -654,7 +651,7 @@ folder, parent);
 #if HAVE_MACOSX_DESKTOP
                libbalsa_macosx_menu_for_parent(ask, GTK_WINDOW(sdd->dialog));
 #endif
-                gtk_container_add(GTK_CONTAINER
+                gtk_box_pack_start(GTK_BOX
                                   (gtk_dialog_get_content_area
                                    (GTK_DIALOG(ask))), gtk_label_new(msg));
                 g_free(msg);
@@ -826,8 +823,7 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
         gtk_container_add(GTK_CONTAINER(content), grid);
     }
     gtk_widget_set_vexpand(content, TRUE);
-    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(sdd->dialog)),
-                       content);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(sdd->dialog)), content);
  
     row = 0;
     /* INPUT FIELD CREATION */
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 4cc37e6..fba4a50 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -1340,7 +1340,8 @@ create_pop_mailbox_dialog(MailboxConfWindow *mcw)
     gtk_widget_grab_focus(mcw->mailbox_name);
 
     dialog = create_generic_dialog(mcw);
-    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), notebook);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+                       notebook);
     return dialog;
 }
 
@@ -1458,9 +1459,8 @@ create_imap_mailbox_dialog(MailboxConfWindow *mcw)
                           mcw->mailbox_name : mcw->mb_data.imap.bsc.server);
 
     dialog = create_generic_dialog(mcw);
-    gtk_container_add(GTK_CONTAINER
-                      (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      notebook);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+                       notebook);
 
     mcw->view_info =
         mailbox_conf_view_new_full(mcw->mailbox, GTK_WINDOW(dialog), grid,
diff --git a/src/main-window.c b/src/main-window.c
index a11ca3a..cce7650 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -486,10 +486,8 @@ bw_create_index_widget(BalsaWindow *bw)
     gtk_widget_set_hexpand(bw->sos_entry, TRUE);
     gtk_box_pack_start(GTK_BOX(bw->sos_bar), bw->sos_entry);
     gtk_widget_show(bw->sos_entry);
-    button = gtk_button_new();
+    button = gtk_button_new_from_icon_name("gtk-ok");
     gtk_box_pack_start(GTK_BOX(bw->sos_bar), button);
-    gtk_container_add(GTK_CONTAINER(button),
-                      gtk_image_new_from_icon_name("gtk-ok"));
     g_signal_connect(G_OBJECT(bw->sos_entry), "activate",
                      G_CALLBACK(bw_filter_entry_activate),
                      button);
@@ -2769,7 +2767,6 @@ static GtkWidget *
 bw_notebook_label_new(BalsaMailboxNode * mbnode)
 {
     GtkWidget *lab;
-    GtkWidget *close_pix;
     GtkWidget *box;
     GtkWidget *but;
     GtkCssProvider *css_provider;
@@ -2800,15 +2797,11 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
     gtk_widget_set_hexpand(lab, TRUE);
     gtk_box_pack_start(GTK_BOX(box), lab);
 
-    but = gtk_button_new();
+    but = gtk_button_new_from_icon_name("window-close-symbolic");
     gtk_widget_set_focus_on_click(but, FALSE);
     gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE);
-
     g_signal_connect(but, "clicked",
                      G_CALLBACK(bw_mailbox_tab_close_cb), mbnode);
-
-    close_pix = gtk_image_new_from_icon_name("window-close-symbolic");
-    gtk_container_add(GTK_CONTAINER(but), close_pix);
     gtk_box_pack_start(GTK_BOX(box), but);
 
     gtk_widget_show(box);
@@ -3833,14 +3826,14 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
                         G_CALLBACK(bw_find_button_clicked),
                         GINT_TO_POINTER(FIND_RESPONSE_FILTER));
        g_object_set(G_OBJECT(button), "margin", 6, NULL);
-       gtk_container_add(GTK_CONTAINER(box), button);
+       gtk_box_pack_start(GTK_BOX(box), button);
 
        button = gtk_button_new_with_mnemonic(_("_Clear"));
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(bw_find_button_clicked),
                         GINT_TO_POINTER(FIND_RESPONSE_RESET));
        g_object_set(G_OBJECT(button), "margin", 6, NULL);
-       gtk_container_add(GTK_CONTAINER(box), button);
+       gtk_box_pack_start(GTK_BOX(box), button);
 
        g_object_set(G_OBJECT(box), "margin", 6, NULL);
        gtk_container_add(GTK_CONTAINER(frame), box);
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 74131f0..ac8958d 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -3263,7 +3263,7 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
        content_area = gtk_dialog_get_content_area(GTK_DIALOG(property_box));
-       gtk_container_add(GTK_CONTAINER(content_area), hbox);
+       gtk_box_pack_start(GTK_BOX(content_area), hbox);
 
     store = gtk_tree_store_new(PM_NUM_COLS,
                                G_TYPE_STRING,   /* PM_TEXT_COL     */
@@ -3272,7 +3272,7 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
             );
     pui->view = view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
     g_object_set(view, "margin", BORDER_WIDTH, NULL);
-    gtk_container_add(GTK_CONTAINER(hbox), view);
+    gtk_box_pack_start(GTK_BOX(hbox), view);
     gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
 
     renderer = gtk_cell_renderer_text_new();
@@ -3286,7 +3286,7 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
     gtk_stack_set_transition_type((GtkStack *) stack,
                                   GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
     gtk_stack_set_transition_duration((GtkStack *) stack, 400);
-    gtk_container_add(GTK_CONTAINER(hbox), stack);
+    gtk_box_pack_start(GTK_BOX(hbox), stack);
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
     g_signal_connect(selection, "changed",
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index ca6fc42..ecfd3f2 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -443,11 +443,11 @@ create_toolbar_page(BalsaToolbarModel * model, GActionMap * map)
     /* Standard button */
     page->standard_button =
         gtk_button_new_with_mnemonic(_("_Restore toolbar to standard buttons"));
-    gtk_container_add(GTK_CONTAINER(button_box), page->standard_button);
+    gtk_box_pack_start(GTK_BOX(button_box), page->standard_button);
 
     /* Style button */
     style_button = gtk_button_new_with_mnemonic(_("Toolbar _style…"));
-    gtk_container_add(GTK_CONTAINER(button_box), style_button);
+    gtk_box_pack_start(GTK_BOX(button_box), style_button);
 
     /* Done with preview */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]