Merge lp:~mhr3/unity-lens-files/fix-actions-order into lp:unity-lens-files

[Michal Hruby]

Fix the order of the actions to match the design

Fix the order of the actions to match the design.

[Łukasz Zemczak (sil2100)]

Looks cool! Let's see if the merger pushes it to the staging PPA now.

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-08-13 15:29:32 +0000
+++ src/daemon.vala	2012-08-20 11:11:20 +0000
@@ -953,7 +953,11 @@
 
           string mime_type = finfo.get_content_type ();
           preview.add_info (new InfoHint ("format", _("Format"), null, GLib.ContentType.get_description (mime_type)));
-            
+
+          var open_action = new Unity.PreviewAction ("open", _("Open"), null);
+          open_action.activated.connect (on_preview_open);
+          preview.add_action (open_action);
+
           int64 total_size = 0;
           if (finfo.get_file_type () == GLib.FileType.DIRECTORY)
           {
@@ -980,20 +984,17 @@
             total_size = finfo.get_size ();
             preview.add_info (new InfoHint ("size", _("Size"), null, GLib.format_size (total_size)));
         
+            var open_folder_action = new Unity.PreviewAction ("open-dir", _("Show in Folder"), null);
+            open_folder_action.activated.connect (on_preview_open_folder);
+            preview.add_action (open_folder_action);
+
             if (email_app_info != null)
             {
               var email_action = new Unity.PreviewAction ("email", _("Email"), null);
               email_action.activated.connect (on_email_file);
               preview.add_action (email_action);
             }
-            var open_folder_action = new Unity.PreviewAction ("open-dir", _("Show in Folder"), null);
-            open_folder_action.activated.connect (on_preview_open_folder);
-            preview.add_action (open_folder_action);
           }
-
-          var open_action = new Unity.PreviewAction ("open", _("Open"), null);
-          open_action.activated.connect (on_preview_open);
-          preview.add_action (open_action);
         }
         else
         {