[epiphany] ephy-toolbar: Fix item positions

[Yosef Or Boczko <yoseforb src gnome org>]

commit 007e6de4deb8d5ccb86290fbe0715dae35aede5c
Author: Yosef Or Boczko <yoseforb gmail com>
Date:   Tue Jan 7 22:58:36 2014 +0200

    ephy-toolbar: Fix item positions
    
    Also bump GTK+ dependency to 2.1.4.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=721713

 configure.ac       |    2 +-
 src/ephy-toolbar.c |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0e6af74..fa15973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ GNOME_CODE_COVERAGE
 MORE_WARN_FLAGS="-Wdeclaration-after-statement -Wno-deprecated-declarations"
 
 GLIB_REQUIRED=2.35.6
-GTK_REQUIRED=3.11.2
+GTK_REQUIRED=3.11.4
 LIBXML_REQUIRED=2.6.12
 LIBXSLT_REQUIRED=1.1.7
 WEBKIT_GTK_REQUIRED=2.2.2
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 3f55f3f..ec33025 100644
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -176,32 +176,32 @@ ephy_toolbar_constructed (GObject *object)
     gtk_container_add (GTK_CONTAINER (toolbar), box);
   }
 
-  /* New Tab */
+  /* Page Menu */
   button = gtk_button_new ();
+  gtk_widget_set_name (button, "ephy-page-menu-button");
   /* FIXME: apparently we need an image inside the button for the action
    * icon to appear. */
   gtk_button_set_image (GTK_BUTTON (button), gtk_image_new ());
   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-  action = gtk_action_group_get_action (action_group, "FileNewTab");
+  action = gtk_action_group_get_action (action_group, "PageMenu");
   gtk_activatable_set_related_action (GTK_ACTIVATABLE (button),
                                       action);
-  gtk_button_set_label (GTK_BUTTON (button), NULL);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (toolbar), button);
-  if (mode != EPHY_EMBED_SHELL_MODE_APPLICATION)
-    gtk_widget_show_all (button);
+  gtk_widget_show_all (button);
 
-  /* Page Menu */
+  /* New Tab */
   button = gtk_button_new ();
-  gtk_widget_set_name (button, "ephy-page-menu-button");
   /* FIXME: apparently we need an image inside the button for the action
    * icon to appear. */
   gtk_button_set_image (GTK_BUTTON (button), gtk_image_new ());
   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-  action = gtk_action_group_get_action (action_group, "PageMenu");
+  action = gtk_action_group_get_action (action_group, "FileNewTab");
   gtk_activatable_set_related_action (GTK_ACTIVATABLE (button),
                                       action);
+  gtk_button_set_label (GTK_BUTTON (button), NULL);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (toolbar), button);
-  gtk_widget_show_all (button);
+  if (mode != EPHY_EMBED_SHELL_MODE_APPLICATION)
+    gtk_widget_show_all (button);
 
   /* Add title only in application mode. */
   if (mode == EPHY_EMBED_SHELL_MODE_APPLICATION)