diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-12-09 20:45:12 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-12-09 20:45:12 +0000 |
| commit | 0df7aba68df19dd7b5b09ca3022538f92da56644 (patch) | |
| tree | 0efca6cfcd2ac328009e9b0755e92ce498d6127f /libnautilus/nautilus-view-standard-main.c | |
| parent | d58fa91abdd3229e6e867189010b19e15eb4e9e0 (diff) | |
| download | nautilus-0df7aba68df19dd7b5b09ca3022538f92da56644.tar.gz | |
Do fix based on patch from Martin Wehner <mwehner@tfh-berlin.de> to
* libnautilus-private/nautilus-file-operations.c:
(handle_transfer_ok): Do fix based on patch from Martin Wehner
<mwehner@tfh-berlin.de> to prevent cancel of emptying trash or
deleting from core dumping.
* Makefile.am:
* configure.in:
* docs/.cvsignore:
* docs/Makefile.am:
Add files in the docs directory to tarball.
* libnautilus/nautilus-view-standard-main.c:
(nautilus_view_standard_main_multi): Whitespace tweak.
Diffstat (limited to 'libnautilus/nautilus-view-standard-main.c')
| -rw-r--r-- | libnautilus/nautilus-view-standard-main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index 6cfe50b4e..5770ad4ad 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -210,8 +210,8 @@ nautilus_view_standard_main_multi (const char *executable_name, gnome_vfs_init (); #if GNOME2_CONVERSION_COMPLETE bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - #endif + bonobo_ui_init (executable_name, version, &argc, argv); if (post_initialize_callback != NULL) { @@ -238,6 +238,7 @@ nautilus_view_standard_main_multi (const char *executable_name, #ifdef GNOME2_CONVERSION_COMPLETE g_free (registration_id); #endif + if (factory != NULL) { /* Loop until we have no more objects. */ do { |