summaryrefslogtreecommitdiff
path: root/src/nautilus-main.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2004-08-23 17:11:15 +0000
committerAlexander Larsson <alexl@src.gnome.org>2004-08-23 17:11:15 +0000
commit0d39bf7bdb23f67c40966c55f206a6f4c91d7087 (patch)
treef48272f153cde4a627f1b1146b68888562349822 /src/nautilus-main.c
parent82b5a9458d68e4da4a04173b68706b63133cfe8b (diff)
downloadnautilus-0d39bf7bdb23f67c40966c55f206a6f4c91d7087.tar.gz
Avoid multiple x-directory/normal warnings
2004-08-23 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-file.c: (get_description): Avoid multiple x-directory/normal warnings * libnautilus-private/nautilus-program-chooser.[ch]: cvs remove old code * libnautilus-private/nautilus-global-preferences.[ch]: * libnautilus-private/nautilus-view-query.c: * src/nautilus-applicable-views.c: * src/nautilus-main.c: Make default component for folders just use the gconf setting instead of the short list (which is essentially random). Remove component picking for non-folders. Remove unused code.
Diffstat (limited to 'src/nautilus-main.c')
-rw-r--r--src/nautilus-main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a2bf0a7a2..4dc524e9e 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -291,7 +291,7 @@ main (int argc, char *argv[])
* defaults are available before any preference peeking
* happens.
*/
- nautilus_global_preferences_init_with_folder_browsing ();
+ nautilus_global_preferences_init ();
if (no_desktop) {
eel_preferences_set_is_invisible
(NAUTILUS_PREFERENCES_SHOW_DESKTOP, TRUE);