diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-03 14:20:22 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-03 14:20:22 -0800 |
| commit | a7aa069036f960a37cc6149ecdceab917dffa7a0 (patch) | |
| tree | b47b0816e8ed67229eb5c5fb6de5b2178889ed12 /src/file-manager | |
| parent | 12908bcb598233adabd7492d92efdda3d2cbc47c (diff) | |
| parent | 2665b684fda835cfa6a485b6e2c8c0a98190facb (diff) | |
| download | caja-a7aa069036f960a37cc6149ecdceab917dffa7a0.tar.bz2 caja-a7aa069036f960a37cc6149ecdceab917dffa7a0.tar.xz | |
Merge pull request #63 from jasmineaura/develop
Bring Caja up to speed, stage2
Diffstat (limited to 'src/file-manager')
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 931df9f8..414aae37 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -1301,7 +1301,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view) */ if (FM_IS_DESKTOP_ICON_VIEW (view)) { - caja_connect_desktop_background_to_file_metadata (CAJA_ICON_CONTAINER (icon_container), file); + caja_connect_desktop_background_to_settings (CAJA_ICON_CONTAINER (icon_container)); } else { @@ -1316,10 +1316,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view) default_action = CAJA_DND_ACTION_SET_AS_FOLDER_BACKGROUND; } - caja_connect_background_to_file_metadata - (icon_container, - file, - default_action); + caja_connect_background_to_file_metadata (icon_container, file, default_action); } |