summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-28 01:33:08 +0200
committerJasmine Hassan <[email protected]>2012-12-03 21:15:16 +0200
commit532fbb1ce6bf446c8c5e40f8a49abc3e450a65d0 (patch)
tree7b89f7baa470cbb06a4468e4f0fd64c78f86e77d /src/file-manager
parent4ca41b3e2371f706dd129bd8938a55cf2e421ad8 (diff)
downloadcaja-532fbb1ce6bf446c8c5e40f8a49abc3e450a65d0.tar.bz2
caja-532fbb1ce6bf446c8c5e40f8a49abc3e450a65d0.tar.xz
[directory-bg] rewrite/refactor, untangle directory & desktop bg-setting code
- Fixes crashes when resizing a VM window in VirtualBox. - Adds a method to allow handling desktop reset.
Diffstat (limited to 'src/file-manager')
-rw-r--r--src/file-manager/fm-icon-view.c7
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);
}