diff options
| author | Michael Meeks <michael@ximian.com> | 2002-01-23 17:59:50 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-01-23 17:59:50 +0000 |
| commit | e7c91ff2cf59c30c41c20a6b892675d8701d99bb (patch) | |
| tree | bbd7e6c60c2135dbce9cce8f383678195abd1af3 /src/nautilus-navigation-window.c | |
| parent | 64477f6179790a286abdc39c36a430e74b10583c (diff) | |
| download | nautilus-e7c91ff2cf59c30c41c20a6b892675d8701d99bb.tar.gz | |
re-remove the per display IID creation scheme - it's broken.
2002-01-23 Michael Meeks <michael@ximian.com>
* libnautilus/nautilus-view-standard-main.c
(nautilus_view_standard_main_multi): re-remove the
per display IID creation scheme - it's broken.
* components/throbber/nautilus-throbber.c
(nautilus_throbber_draw): kill, no draw methods
in gtk 2.0
(draw_throbber_image): remove bonobo bug
workaround, if it still exists it should be fixed
in bonobo and fold into
(nautilus_throbber_expose): here
(draw_pixbuf): fold into
(nautilus_throbber_expose): here, and fix
rendering bugs.
(nautilus_throbber_size_allocate): kill bogus
sizing logic.
(nautilus_throbber_button_release_event): do
conversion.
(nautilus_throbber_destroy): remove
force_destroy_later.
2002-01-21 Michael Meeks <michael@ximian.com>
* src/nautilus-window.c,
* src/nautilus-application.c,
* src/nautilus-view-frame.c,
* libnautilus-private/nautilus-undo-manager.c,
* libnautilus-private/nautilus-metafile-factory.c,
* libnautilus/nautilus-undo-transaction.c,
s/bonobo_object_corba_objref/BONOBO_OBJREF/
* libnautilus-private/nautilus-directory-metafile.c
(get_factory): update referencing.
* libnautilus/nautilus-view.c
(nautilus_view_get_view_frame): impl. helper to
reduce sync CORBA traffic.
(view_frame_call_end, view_frame_call_begin): upd.
(nautilus_view_dispose): release the CORBA ref. if we
took it.
(nautilus_view_set_frame): unset the frame if we
loose it.
* libnautilus-private/nautilus-bonobo-extensions.c
(add_numbered_menu_item_internal): kill the label encoding.
(nautilus_bonobo_add_submenu): ditto.
(nautilus_bonobo_set_icon): kill unused.
* components/adaptor/bonobo-stream-vfs.[ch]: remove, now
inside gnome-vfs.
Diffstat (limited to 'src/nautilus-navigation-window.c')
| -rw-r--r-- | src/nautilus-navigation-window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 44c8542a7..36e356b24 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -733,7 +733,7 @@ nautilus_window_constructed (NautilusWindow *window) location_bar_wrapper = bonobo_control_new (location_bar_box); bonobo_ui_component_object_set (window->details->shell_ui, "/Location Bar/Wrapper", - bonobo_object_corba_objref (BONOBO_OBJECT (location_bar_wrapper)), + BONOBO_OBJREF (location_bar_wrapper), NULL); bonobo_ui_component_thaw (window->details->shell_ui, NULL); bonobo_object_unref (BONOBO_OBJECT (location_bar_wrapper)); @@ -2198,7 +2198,7 @@ nautilus_window_get_ui_container (NautilusWindow *window) { g_return_val_if_fail (NAUTILUS_IS_WINDOW (window), CORBA_OBJECT_NIL); - return bonobo_object_corba_objref (BONOBO_OBJECT (window->details->ui_container)); + return BONOBO_OBJREF (window->details->ui_container); } void |