Merge lp:~junrrein/pantheon-files/fix-1015228 into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

Disable changing the zoom level when entering an icons folder.

Disable changing the zoom level when entering an icons folder.

To test this, go to any folder like "/usr/share/icons/xxx/xxx/number", where "number" can be any number, and is generally the size of all icons contained inside that folder.

For example: "/usr/share/icons/elementary/apps/128".

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2013-05-27 22:20:15 +0000
+++ src/fm-directory-view.c	2013-06-27 03:30:39 +0000
@@ -2838,12 +2838,6 @@
         g_signal_connect_object (gof_preferences_get_default (), "notify::interpret-desktop-files",
                                  G_CALLBACK (show_desktop_files_changed), view, 0);
         
-        /* automagicly zoom if we have a valid keypath_size */
-        int keypath_size = fm_directory_view_get_uri_keypath_size (view);
-        if (keypath_size != 0) {
-            MarlinZoomLevel zoom = marlin_zoom_level_get_nearest_from_value (keypath_size); 
-            g_object_set (G_OBJECT (view), "zoom-level", zoom, NULL);
-        }
         
         fm_directory_view_connect_directory_handlers (view, slot->directory);