[gnome-disk-utility/gnome-3-12] Fix headerbar item positions

[David Zeuthen <davidz src gnome org>]

commit cdbb0497d9536d81b24abe166ab7c7834fd18e8f
Author: Yosef Or Boczko <yoseforb src gnome org>
Date:   Thu May 1 19:46:20 2014 +0200

    Fix headerbar item positions
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729349
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 configure.ac          |    2 +-
 src/disks/gduwindow.c |   19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ebdd5b0..6ecfbe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,7 +104,7 @@ AC_MSG_RESULT([no])])
 
 GLIB2_REQUIRED=2.31.0
 UDISKS2_REQUIRED=2.1.1
-GTK3_REQUIRED=3.10.0
+GTK3_REQUIRED=3.12.0
 LIBSECRET1_REQUIRED=0.7
 PWQUALITY_REQUIRED=1.0.0
 CANBERRA_REQUIRED=0.1
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index 24834ce..f8710d6 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -978,26 +978,27 @@ create_header (GduWindow *window)
   header = gtk_header_bar_new ();
   gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
 
-  button = window->devtab_drive_loop_detach_button = gtk_button_new ();
-  image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_MENU);
+  button = window->devtab_drive_generic_button = gtk_menu_button_new ();
+  gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), window->generic_drive_menu);
+  image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU);
   gtk_button_set_image (GTK_BUTTON (button), image);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
-  button = window->devtab_drive_eject_button = gtk_button_new ();
-  image = gtk_image_new_from_icon_name ("media-eject-symbolic", GTK_ICON_SIZE_MENU);
+  button = window->devtab_drive_power_off_button = gtk_button_new ();
+  image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
   gtk_button_set_image (GTK_BUTTON (button), image);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
-  button = window->devtab_drive_power_off_button = gtk_button_new ();
-  image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
+  button = window->devtab_drive_eject_button = gtk_button_new ();
+  image = gtk_image_new_from_icon_name ("media-eject-symbolic", GTK_ICON_SIZE_MENU);
   gtk_button_set_image (GTK_BUTTON (button), image);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
-  button = window->devtab_drive_generic_button = gtk_menu_button_new ();
-  gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), window->generic_drive_menu);
-  image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU);
+  button = window->devtab_drive_loop_detach_button = gtk_button_new ();
+  image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_MENU);
   gtk_button_set_image (GTK_BUTTON (button), image);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
+
   return header;
 }