Merge lp:~optimisme/pantheon-files/fix-1179137 into lp:~elementary-apps/pantheon-files/trunk

[Albert]

Show icons for mounted filesystems to fix bug #1179137.

Organized protocols alphabetically and source cleaning.

[Cody Garver (codygarver)]

Now it's on 19, 27, 28 :(

Maybe try this

bzr branch lp:pantheon-files files
cd files
# make changes
bzr commit -m "Symbolic icon for mounted units"
bzr push lp:~optimisme/pantheon-files/fix-1179137 --overwrite

review: Needs Fixing

[Albert (optimisme)]

Hi Cody, I will remove this source since is for two different bugs and I will leave each bug clean.

[lp:~optimisme/pantheon-files/fix-1179137]

1186. By Albert on 2013-05-20

Code cleaning 2

1187. By Albert on 2013-05-20

Code cleaning 2

1188. By Albert on 2013-05-20

Code cleaning 2

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2013-05-19 17:05:41 +0000
+++ src/View/LocationBar.vala	2013-05-20 08:14:25 +0000
@@ -104,17 +104,15 @@
             /* grab the UIManager */
             this.ui = ui;
             this.win = win;
-            /*add_icon({ Marlin.TRASH_URI, Marlin.ICON_TRASH, true, null, null, true, N_("Trash")});
-            add_icon({ Marlin.NETWORK_URI, Marlin.ICON_NETWORK, true, null, null, true, N_("Network")});*/
             /* FIXME the string split of the path url is kinda too basic, we should use the Gile to split our uris and determine the protocol (if any) with g_uri_parse_scheme or g_file_get_uri_scheme */
-            add_icon({ "trash://", Marlin.ICON_TRASH_SYMBOLIC, true, null, null, null, true, _("Trash")});
-            add_icon({ "network://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("Network")});
             add_icon({ "afp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("AFP")});
             add_icon({ "dav://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("DAV")});
             add_icon({ "davs://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("DAVS")});
             add_icon({ "ftp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("FTP")});
+            add_icon({ "network://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("Network")});
             add_icon({ "sftp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("SFTP")});
             add_icon({ "smb://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("SMB")});
+            add_icon({ "trash://", Marlin.ICON_TRASH_SYMBOLIC, true, null, null, null, true, _("Trash")});
 
             /* music */
             string dir;
@@ -125,7 +123,6 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-    
             /* image */
             dir = Environment.get_user_special_dir(UserDirectory.PICTURES);
             if(dir.contains("/"))
@@ -134,7 +131,6 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-
             /* movie */
             dir = Environment.get_user_special_dir(UserDirectory.VIDEOS);
             if(dir.contains("/"))
@@ -143,7 +139,6 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-    
             /* downloads */
             dir = Environment.get_user_special_dir(UserDirectory.DOWNLOAD);
             if(dir.contains("/"))
@@ -152,7 +147,6 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-    
             /* documents */
             dir = Environment.get_user_special_dir(UserDirectory.DOCUMENTS);
             if(dir.contains("/"))
@@ -161,7 +155,6 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-            
             /* templates */
             dir = Environment.get_user_special_dir(UserDirectory.TEMPLATES);
             if(dir.contains("/"))
@@ -170,7 +163,7 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-
+            /* home */
             dir = Environment.get_home_dir();
             if(dir.contains("/"))
             {
@@ -178,8 +171,15 @@
                 icon.exploded[0] = "/";
                 add_icon(icon);
             }
-
-            
+            /* media mounted volumes */
+            dir = "/media";
+            if(dir.contains("/"))
+            {
+                IconDirectory icon = {dir, Marlin.ICON_FILESYSTEM_SYMBOLIC, false, null, null, dir.split("/"), true, null};
+                icon.exploded[0] = "/";
+                add_icon(icon);
+            }
+            /* filesystem */
             IconDirectory icon = {"/", Marlin.ICON_FILESYSTEM_SYMBOLIC, false, null, null, null, false, null};
             icon.exploded = {"/"};
             add_icon(icon);
@@ -197,10 +197,7 @@
             menu.show_all();
             
             need_completion.connect(on_need_completion);
-
-
         }
-        
 
         protected void merge_in_clipboard_actions ()
         {