diff options
| author | Stefano Karapetsas <[email protected]> | 2012-09-05 21:43:27 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-09-05 21:43:27 +0200 |
| commit | 45742f8351e2991d54b00189f6e0c772e257f395 (patch) | |
| tree | f62e0b032ab91575725aa30a2592e3b4d40ec55c /src/file-manager/fm-directory-view.c | |
| parent | 3674c4ca12e2e33cf6669bc3701acd98c3643ec5 (diff) | |
| download | caja-45742f8351e2991d54b00189f6e0c772e257f395.tar.bz2 caja-45742f8351e2991d54b00189f6e0c772e257f395.tar.xz | |
convert last eel_preference users to raw mateconf
from nautilus patch:
This is moslty the lockdown stuff, but we also access the background
setting. This should be converted to use the new gsettings when they
land.
Diffstat (limited to 'src/file-manager/fm-directory-view.c')
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index d9a42b15..e7628333 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -253,6 +253,7 @@ struct FMDirectoryViewDetails gboolean allow_moves; GdkPoint context_menu_position; + guint lockdown_notification_id; gboolean undo_active; gboolean redo_active; @@ -1636,7 +1637,10 @@ sort_directories_first_changed_callback (gpointer callback_data) } static void -lockdown_disable_command_line_changed_callback (gpointer callback_data) +lockdown_disable_command_line_changed_callback (MateConfClient* client, + guint cnxn_id, + MateConfEntry *entry, + gpointer callback_data) { FMDirectoryView *view; @@ -2058,8 +2062,13 @@ fm_directory_view_init (FMDirectoryView *view) "changed::" CAJA_PREFERENCES_SORT_DIRECTORIES_FIRST, G_CALLBACK(sort_directories_first_changed_callback), view); - eel_preferences_add_callback (CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE, - lockdown_disable_command_line_changed_callback, view); + view->details->lockdown_notification_id = + mateconf_client_notify_add (caja_mateconf_client, + CAJA_MATECONF_LOCKDOWN_COMMAND_LINE, + lockdown_disable_command_line_changed_callback, + view, + NULL, + NULL); /* Update undo actions stuff and connect signals from the undostack manager */ view->details->undo_active = FALSE; @@ -2187,8 +2196,8 @@ fm_directory_view_finalize (GObject *object) click_policy_changed_callback, view); g_signal_handlers_disconnect_by_func (caja_preferences, sort_directories_first_changed_callback, view); - eel_preferences_remove_callback (CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE, - lockdown_disable_command_line_changed_callback, view); + mateconf_client_notify_remove (caja_mateconf_client, + view->details->lockdown_notification_id); unschedule_pop_up_location_context_menu (view); if (view->details->location_popup_event != NULL) { @@ -8951,7 +8960,7 @@ real_update_menus (FMDirectoryView *view) real_update_paste_menu (view, selection, selection_count); - disable_command_line = eel_preferences_get_boolean (CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE); + disable_command_line = mateconf_client_get_bool (caja_mateconf_client, CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE, NULL); action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_NEW_LAUNCHER); gtk_action_set_visible (action, vfolder_directory && !disable_command_line); |