diff options
| author | Michael Meeks <michael@ximian.com> | 2002-03-08 18:36:30 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-03-08 18:36:30 +0000 |
| commit | 74e52291f23d3fc1fa22e6f0e57a3d6858580dcc (patch) | |
| tree | 3b0fa629b971c4eed934e6151b2495de761a80a0 | |
| parent | 743848898d5d3486c8a857e578170e5dabe51179 (diff) | |
| download | nautilus-74e52291f23d3fc1fa22e6f0e57a3d6858580dcc.tar.gz | |
do a bonobo_ui_init, we shouldn't need it but libgnomeui has escaped from
2002-03-08 Michael Meeks <michael@ximian.com>
* src/nautilus-main.c (main): do a bonobo_ui_init,
we shouldn't need it but libgnomeui has escaped from
doing this for some reason.
Remove eel_setenv DISPLAY chicanery
* libnautilus/nautilus-view-standard-main.c
(nautilus_view_standard_main_multi): remove double
bonobo_ui_init.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/nautilus-main.c | 4 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2002-03-08 Michael Meeks <michael@ximian.com> + + * src/nautilus-main.c (main): do a bonobo_ui_init, + we shouldn't need it but libgnomeui has escaped from + doing this for some reason. + Remove eel_setenv DISPLAY chicanery + + * libnautilus/nautilus-view-standard-main.c + (nautilus_view_standard_main_multi): remove double + bonobo_ui_init. + 2002-03-07 Darin Adler <darin@bentspoon.com> * components/tree/nautilus-tree-model.h: diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 75db63e8a..33aaf3c6d 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -191,8 +191,6 @@ main (int argc, char *argv[]) popt_context = g_value_get_pointer (&context_as_value); - eel_setenv ("DISPLAY", DisplayString (GDK_DISPLAY ()), TRUE); - /* Check for argument consistency. */ args = poptGetArgs (popt_context); if (perform_self_check && args != NULL) { @@ -219,7 +217,7 @@ main (int argc, char *argv[]) /* Initialize the services that we use. */ LIBXML_TEST_VERSION gnome_vfs_init (); - bonobo_init (&argc, argv); + bonobo_ui_init ("nautilus", VERSION, &argc, argv); if (g_getenv ("NAUTILUS_ENABLE_TEST_COMPONENTS") != NULL) { bonobo_activation_set_test_components_enabled (TRUE); |