[gnome-panel] ditem-editor: avoid deprecated gtk_container_set_focus_chain

[Alberts Muktupāvels <muktupavels src gnome org>]

commit f3b48b6a20022a14e7462de98b1200ea5291da5b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Mar 8 15:14:15 2020 +0200

    ditem-editor: avoid deprecated gtk_container_set_focus_chain

 gnome-panel/panel-ditem-editor.c | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/gnome-panel/panel-ditem-editor.c b/gnome-panel/panel-ditem-editor.c
index 6a773de73..29b63457c 100644
--- a/gnome-panel/panel-ditem-editor.c
+++ b/gnome-panel/panel-ditem-editor.c
@@ -576,6 +576,7 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
 {
        PanelDItemEditorPrivate *priv;
        GtkWidget *dialog_vbox;
+       GtkWidget *hbox;
 
        priv = dialog->priv;
 
@@ -584,11 +585,23 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
        dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
        gtk_box_set_spacing (GTK_BOX (dialog_vbox), 2);
 
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+       gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
+       gtk_widget_show (hbox);
+
+       /* Icon */
+       priv->icon_chooser = panel_icon_chooser_new (NULL);
+       panel_icon_chooser_set_fallback_icon_name (PANEL_ICON_CHOOSER (priv->icon_chooser),
+                                                  PANEL_ICON_LAUNCHER);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->icon_chooser, FALSE, FALSE, 0);
+       gtk_widget_set_valign (priv->icon_chooser, GTK_ALIGN_START);
+       gtk_widget_show (priv->icon_chooser);
+
        priv->grid = gtk_grid_new ();
-       gtk_container_set_border_width (GTK_CONTAINER (priv->grid), 5);
        gtk_grid_set_row_spacing (GTK_GRID (priv->grid), 6);
        gtk_grid_set_column_spacing (GTK_GRID (priv->grid), 12);
-       gtk_box_pack_start (GTK_BOX (dialog_vbox), priv->grid, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->grid, TRUE, TRUE, 0);
        gtk_widget_show (priv->grid);
 
        /* Type */
@@ -605,13 +618,6 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
        gtk_label_set_mnemonic_widget (GTK_LABEL (priv->name_label),
                                       priv->name_entry);
 
-       /* Icon */
-       priv->icon_chooser = panel_icon_chooser_new (NULL);
-       panel_icon_chooser_set_fallback_icon_name (PANEL_ICON_CHOOSER (priv->icon_chooser),
-                                                  PANEL_ICON_LAUNCHER);
-       gtk_grid_attach (GTK_GRID (priv->grid), priv->icon_chooser, 0, 0, 1, 2);
-       gtk_widget_show (priv->icon_chooser);
-
        /* Command */
        priv->command_label = label_new_with_mnemonic ("");
 
@@ -662,7 +668,6 @@ panel_ditem_editor_setup_ui (PanelDItemEditor *dialog)
        PanelDItemEditorPrivate *priv;
        PanelDItemEditorType     type;
        gboolean                 show_combo;
-       GList                   *focus_chain;
 
        priv = dialog->priv;
        type = panel_ditem_editor_get_item_type (dialog);
@@ -747,18 +752,6 @@ panel_ditem_editor_setup_ui (PanelDItemEditor *dialog)
 
        type_combo_changed (dialog);
 
-       /* set a focus chain since GTK+ doesn't want to put the icon entry
-        * as the first widget in the chain */
-       focus_chain = NULL;
-       focus_chain = g_list_prepend (focus_chain, priv->icon_chooser);
-       focus_chain = g_list_prepend (focus_chain, priv->type_combo);
-       focus_chain = g_list_prepend (focus_chain, priv->name_entry);
-       focus_chain = g_list_prepend (focus_chain, priv->command_hbox);
-       focus_chain = g_list_prepend (focus_chain, priv->comment_entry);
-       focus_chain = g_list_reverse (focus_chain);
-       gtk_container_set_focus_chain (GTK_CONTAINER (priv->grid), focus_chain);
-       g_list_free (focus_chain);
-
        gtk_widget_grab_focus (priv->name_entry);
 }