diff options
| author | Alexander Larsson <alexl@redhat.com> | 2004-11-22 15:24:38 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2004-11-22 15:24:38 +0000 |
| commit | 67e2a42fea65f2685580b119b98a058c8e81ac4e (patch) | |
| tree | 19bc7c578c9f1a47f299d012ac4775010e06661e /src/nautilus-main.c | |
| parent | 8dc115c33951754d75b57c67e4d918900a795468 (diff) | |
| download | nautilus-67e2a42fea65f2685580b119b98a058c8e81ac4e.tar.gz | |
Merge bonobo-slay-branch
2004-11-22 Alexander Larsson <alexl@redhat.com>
* Merge bonobo-slay-branch
Diffstat (limited to 'src/nautilus-main.c')
| -rw-r--r-- | src/nautilus-main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 4dc524e9e..63040110d 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -36,7 +36,6 @@ #include "nautilus-window.h" #include <bonobo-activation/bonobo-activation.h> #include <bonobo/bonobo-main.h> -#include <bonobo/bonobo-ui-main.h> #include <dlfcn.h> #include <eel/eel-debug.h> #include <eel/eel-glib-extensions.h> @@ -283,10 +282,6 @@ main (int argc, char *argv[]) /* Initialize the services that we use. */ LIBXML_TEST_VERSION - if (g_getenv ("NAUTILUS_ENABLE_TEST_COMPONENTS") != NULL) { - bonobo_activation_set_test_components_enabled (TRUE); - } - /* Initialize preferences. This is needed so that proper * defaults are available before any preference peeking * happens. @@ -345,7 +340,6 @@ main (int argc, char *argv[]) } eel_debug_shut_down (); - bonobo_ui_debug_shutdown (); /* If told to restart, exec() myself again. This is used when * the program is told to restart with CORBA, for example when |