From 12e085081592626b01721bebd07c22b69d1b4262 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 5 Sep 2012 19:08:00 +0200 Subject: convert icon-view preferences to gsettings --- src/file-manager/fm-desktop-icon-view.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/file-manager/fm-desktop-icon-view.c') diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 86d1cce6..ca9de561 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -300,9 +300,9 @@ fm_desktop_icon_view_finalize (GObject *object) icon_view = FM_DESKTOP_ICON_VIEW (object); - eel_preferences_remove_callback (CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, - default_zoom_level_changed, - icon_view); + g_signal_handlers_disconnect_by_func (caja_icon_view_preferences, + default_zoom_level_changed, + icon_view); eel_preferences_remove_callback (CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE, lockdown_disable_command_line_changed_callback, @@ -432,8 +432,9 @@ get_default_zoom_level (void) if (!auto_storage_added) { auto_storage_added = TRUE; - eel_preferences_add_auto_enum (CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, - (int *) &default_zoom_level); + eel_g_settings_add_auto_enum (caja_icon_view_preferences, + CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, + (int *) &default_zoom_level); } return CLAMP (default_zoom_level, CAJA_ZOOM_LEVEL_SMALLEST, CAJA_ZOOM_LEVEL_LARGEST); @@ -615,9 +616,10 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view) g_signal_connect_object (desktop_icon_view, "unrealize", G_CALLBACK (unrealized_callback), desktop_icon_view, 0); - eel_preferences_add_callback (CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, - default_zoom_level_changed, - desktop_icon_view); + g_signal_connect_swapped (caja_icon_view_preferences, + "changed::" CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, + G_CALLBACK (default_zoom_level_changed), + desktop_icon_view); eel_preferences_add_callback_while_alive (CAJA_PREFERENCES_DESKTOP_FONT, font_changed_callback, -- cgit v1.2.1