diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-07-21 22:34:25 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-07-23 12:22:54 +0200 |
| commit | 9318df841a5a0ccd0723e2d5dbce8d2ddfd89b1d (patch) | |
| tree | 7041474dee75900bbf474d63e5d73ed8ccd16a9d /libnautilus-private/nautilus-directory.c | |
| parent | 036ae8def6b46048b8d3db36ae944f3d6c6523de (diff) | |
| download | nautilus-9318df841a5a0ccd0723e2d5dbce8d2ddfd89b1d.tar.gz | |
Convert show-hidden-files to gsettings and merge it with show-backup-files
Diffstat (limited to 'libnautilus-private/nautilus-directory.c')
| -rw-r--r-- | libnautilus-private/nautilus-directory.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index ff4c41bd9..ba7bad4c7 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -316,12 +316,11 @@ add_preferences_callbacks (void) { nautilus_global_preferences_init (); - eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - filtering_changed_callback, - NULL); - eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, - filtering_changed_callback, - NULL); + g_signal_connect_swapped (nautilus_preferences, + "changed::" NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + G_CALLBACK(filtering_changed_callback), + NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, async_data_preference_changed_callback, NULL); @@ -1560,7 +1559,6 @@ void nautilus_directory_file_monitor_add (NautilusDirectory *directory, gconstpointer client, gboolean monitor_hidden_files, - gboolean monitor_backup_files, NautilusFileAttributes file_attributes, NautilusDirectoryCallback callback, gpointer callback_data) @@ -1572,7 +1570,6 @@ nautilus_directory_file_monitor_add (NautilusDirectory *directory, (NAUTILUS_DIRECTORY_CLASS, directory, file_monitor_add, (directory, client, monitor_hidden_files, - monitor_backup_files, file_attributes, callback, callback_data)); } @@ -1824,7 +1821,7 @@ nautilus_self_check_directory (void) nautilus_directory_file_monitor_add (directory, &data_dummy, - TRUE, TRUE, 0, NULL, NULL); + TRUE, 0, NULL, NULL); /* FIXME: these need to be updated to the new metadata infrastructure * as make check doesn't pass. |