2 files changed, 14 insertions, 44 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 4698e0e1..ae9e4c02 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -78,8 +78,6 @@ struct FMDesktopIconViewDetails
     gulong delayed_init_signal;
     guint reload_desktop_timeout;
     gboolean pending_rescan;
-
-    guint lockdown_notification_id;
 };
 
 static void     fm_desktop_icon_view_init                   (FMDesktopIconView      *desktop_icon_view);
@@ -109,15 +107,6 @@ desktop_directory_changed_callback (gpointer callback_data)
     desktop_directory = caja_get_desktop_directory ();
 }
 
-static void
-lockdown_disable_command_line_changed_callback (MateConfClient* client,
-                                                guint cnxn_id,
-                                                MateConfEntry *entry,
-                                                gpointer callback_data)
-{
-    fm_directory_view_update_menus (FM_DIRECTORY_VIEW (callback_data));
-}
-
 static CajaIconContainer *
 get_icon_container (FMDesktopIconView *icon_view)
 {
@@ -313,8 +302,9 @@ fm_desktop_icon_view_finalize (GObject *object)
                                           font_changed_callback,
                                           icon_view);
 
-    mateconf_client_notify_remove (caja_mateconf_client,
-                                icon_view->details->lockdown_notification_id);
+    g_signal_handlers_disconnect_by_func (mate_lockdown_preferences,
+                                          fm_directory_view_update_menus,
+                                          icon_view);
     g_signal_handlers_disconnect_by_func (caja_preferences,
                                           desktop_directory_changed_callback,
                                           NULL);
@@ -636,13 +626,10 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
     default_zoom_level_changed (desktop_icon_view);
     fm_desktop_icon_view_update_icon_container_fonts (desktop_icon_view);
 
-    desktop_icon_view->details->lockdown_notification_id =
-            mateconf_client_notify_add (caja_mateconf_client,
-                         CAJA_MATECONF_LOCKDOWN_COMMAND_LINE,
-                         lockdown_disable_command_line_changed_callback,
-                         desktop_icon_view,
-                         NULL,
-                         NULL);
+    g_signal_connect_swapped (mate_lockdown_preferences,
+                              "changed::" CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE,
+                              G_CALLBACK (fm_directory_view_update_menus),
+                              desktop_icon_view);
 
 }
 
@@ -734,7 +721,7 @@ real_update_menus (FMDirectoryView *view)
     desktop_view = FM_DESKTOP_ICON_VIEW (view);
 
     /* New Launcher */
-    disable_command_line = mateconf_client_get_bool (caja_mateconf_client, CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE, NULL);
+    disable_command_line = g_settings_get_boolean (mate_lockdown_preferences, CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE);
     action = gtk_action_group_get_action (desktop_view->details->desktop_action_group,
                                           FM_ACTION_NEW_LAUNCHER_DESKTOP);
     gtk_action_set_visible (action,
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index e7628333..55b1e5bb 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -253,7 +253,6 @@ struct FMDirectoryViewDetails
 	gboolean allow_moves;
 
 	GdkPoint context_menu_position;
-	guint lockdown_notification_id;
 
 	gboolean undo_active;
 	gboolean redo_active;
@@ -1636,18 +1635,6 @@ sort_directories_first_changed_callback (gpointer callback_data)
 	}
 }
 
-static void
-lockdown_disable_command_line_changed_callback (MateConfClient* client,
-												guint cnxn_id,
-												MateConfEntry *entry,
-												gpointer callback_data)
-{
-	FMDirectoryView *view;
-
-	view = FM_DIRECTORY_VIEW (callback_data);
-	schedule_update_menus (view);
-}
-
 static void set_up_scripts_directory_global(void)
 {
 	if (scripts_directory_uri != NULL)
@@ -2062,13 +2049,9 @@ fm_directory_view_init (FMDirectoryView *view)
 							  "changed::" CAJA_PREFERENCES_SORT_DIRECTORIES_FIRST, 
 							  G_CALLBACK(sort_directories_first_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);
+	g_signal_connect_swapped (mate_lockdown_preferences,
+							  "changed::" CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE,
+							  G_CALLBACK (schedule_update_menus), view);
 
 	/* Update undo actions stuff and connect signals from the undostack manager */
 	view->details->undo_active = FALSE;
@@ -2196,8 +2179,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);
-	mateconf_client_notify_remove (caja_mateconf_client,
-								   view->details->lockdown_notification_id);
+	g_signal_handlers_disconnect_by_func (mate_lockdown_preferences,
+										  schedule_update_menus, view);
 
 	unschedule_pop_up_location_context_menu (view);
 	if (view->details->location_popup_event != NULL) {
@@ -8960,7 +8943,7 @@ real_update_menus (FMDirectoryView *view)
 
 	real_update_paste_menu (view, selection, selection_count);
 
-	disable_command_line = mateconf_client_get_bool (caja_mateconf_client, CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE, NULL);
+	disable_command_line = g_settings_get_boolean (mate_lockdown_preferences, CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE);
 	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);