[gnome-photos] selection-toolbar: Rearrange layout of buttons in the toolbar

[Debarshi Ray <debarshir src gnome org>]

commit a45f1a2d10c710ba8dcbe8cad17206e543a01e19
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Nov 14 19:23:06 2012 +0100

    selection-toolbar: Rearrange layout of buttons in the toolbar
    
    Original patch from Cosimo Cecchi for gnome-documents.

 src/photos-selection-toolbar.c |   48 ++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 4948c33..ba82bf0 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -535,15 +535,14 @@ photos_selection_toolbar_init (PhotosSelectionToolbar *self)
                     G_CALLBACK (photos_selection_toolbar_favorite_clicked),
                     self);
 
-  priv->toolbar_properties = gtk_button_new ();
-  image = gtk_image_new_from_icon_name ("document-properties-symbolic", GTK_ICON_SIZE_INVALID);
+  priv->toolbar_open = gtk_button_new ();
+  image = gtk_image_new_from_icon_name ("folder-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
-  gtk_container_add (GTK_CONTAINER (priv->toolbar_properties), image);
-  gtk_widget_set_tooltip_text (GTK_WIDGET (priv->toolbar_properties), _("Properties"));
-  gtk_container_add (GTK_CONTAINER (priv->left_box), priv->toolbar_properties);
-  g_signal_connect (priv->toolbar_properties,
+  gtk_container_add (GTK_CONTAINER (priv->toolbar_open), image);
+  gtk_container_add (GTK_CONTAINER (priv->left_box), priv->toolbar_open);
+  g_signal_connect (priv->toolbar_open,
                     "clicked",
-                    G_CALLBACK (photos_selection_toolbar_properties_clicked),
+                    G_CALLBACK (photos_selection_toolbar_open_clicked),
                     self);
 
   priv->toolbar_print = gtk_button_new ();
@@ -557,6 +556,17 @@ photos_selection_toolbar_init (PhotosSelectionToolbar *self)
                     G_CALLBACK (photos_selection_toolbar_print_clicked),
                     self);
 
+  priv->toolbar_trash = gtk_button_new ();
+  image = gtk_image_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_INVALID);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
+  gtk_container_add (GTK_CONTAINER (priv->toolbar_trash), image);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (priv->toolbar_trash), _("Delete"));
+  gtk_container_add (GTK_CONTAINER (priv->left_box), priv->toolbar_trash);
+  g_signal_connect (priv->toolbar_trash,
+                    "clicked",
+                    G_CALLBACK (photos_selection_toolbar_trash_clicked),
+                    self);
+
   priv->separator = gtk_separator_tool_item_new ();
   gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (priv->separator), FALSE);
   gtk_widget_set_visible (GTK_WIDGET (priv->separator), TRUE);
@@ -579,25 +589,15 @@ photos_selection_toolbar_init (PhotosSelectionToolbar *self)
                     G_CALLBACK (photos_selection_toolbar_collection_clicked),
                     self);
 
-  priv->toolbar_trash = gtk_button_new ();
-  image = gtk_image_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_INVALID);
-  gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
-  gtk_container_add (GTK_CONTAINER (priv->toolbar_trash), image);
-  gtk_widget_set_tooltip_text (GTK_WIDGET (priv->toolbar_trash), _("Delete"));
-  gtk_container_add (GTK_CONTAINER (priv->right_box), priv->toolbar_trash);
-  g_signal_connect (priv->toolbar_trash,
-                    "clicked",
-                    G_CALLBACK (photos_selection_toolbar_trash_clicked),
-                    self);
-
-  priv->toolbar_open = gtk_button_new ();
-  image = gtk_image_new_from_icon_name ("folder-symbolic", GTK_ICON_SIZE_INVALID);
+  priv->toolbar_properties = gtk_button_new ();
+  image = gtk_image_new_from_icon_name ("document-properties-symbolic", GTK_ICON_SIZE_INVALID);
   gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
-  gtk_container_add (GTK_CONTAINER (priv->toolbar_open), image);
-  gtk_container_add (GTK_CONTAINER (priv->right_box), priv->toolbar_open);
-  g_signal_connect (priv->toolbar_open,
+  gtk_container_add (GTK_CONTAINER (priv->toolbar_properties), image);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (priv->toolbar_properties), _("Properties"));
+  gtk_container_add (GTK_CONTAINER (priv->right_box), priv->toolbar_properties);
+  g_signal_connect (priv->toolbar_properties,
                     "clicked",
-                    G_CALLBACK (photos_selection_toolbar_open_clicked),
+                    G_CALLBACK (photos_selection_toolbar_properties_clicked),
                     self);
 
   gtk_widget_show_all (priv->widget);