[gtk+] modelmenuitem: Fix icon/label alignment

[Timm Bäder <baedert src gnome org>]

commit c8add3d169be9ac51d52e5b10511f6c6fa059b10
Author: Timm Bäder <mail baedert org>
Date:   Wed Oct 11 09:03:40 2017 +0200

    modelmenuitem: Fix icon/label alignment
    
    gtk_box_pack_end will put the label child at the right side of the label
    (in LTR orientation), but we want it left, directly next to the icon.
    Also remove the spacing from the box child as this is a theme thing.

 gtk/gtkmodelmenuitem.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
index 9afca43..0f05e83 100644
--- a/gtk/gtkmodelmenuitem.c
+++ b/gtk/gtkmodelmenuitem.c
@@ -165,12 +165,12 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item,
       if (icon == NULL)
         return;
 
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
       /* Reparent the child without destroying it */
       g_object_ref (child);
       gtk_container_remove (GTK_CONTAINER (item), child);
-      gtk_box_pack_end (GTK_BOX (box), child);
+      gtk_container_add (GTK_CONTAINER (box), child);
       g_object_unref (child);
 
       gtk_container_add (GTK_CONTAINER (item), box);
@@ -190,7 +190,8 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item,
 
       image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
       gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
-      gtk_box_pack_start (GTK_BOX (child), image);
+      gtk_container_add (GTK_CONTAINER (child), image);
+      gtk_box_reorder_child (GTK_BOX (child), image, 0);
     }
 
   g_object_notify (G_OBJECT (item), "icon");