diff options
| author | Michael Meeks <michael@ximian.com> | 2001-11-06 03:00:42 +0000 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2001-11-06 03:00:42 +0000 |
| commit | d625b6573e36b28f90fb9a52a651eee66182d373 (patch) | |
| tree | b2ebc29b465669ebeaf7d587ae0cff50b58f286a /libnautilus | |
| parent | 55941234a1093b594a8cd5085331c58cf695ff4a (diff) | |
| download | nautilus-d625b6573e36b28f90fb9a52a651eee66182d373.tar.gz | |
update bonobo requirement to 1.106.0 bump bonobo-activation to 0.9.3, bump
2001-11-06 Michael Meeks <michael@ximian.com>
* configure.in: update bonobo requirement to 1.106.0
bump bonobo-activation to 0.9.3, bump canvas and libgnome[ui]
to 1.105, ORBit2 >= 2.3.97, glib, gtk+, gdk-pixbuf >= 1.3.10,
gconf >= 1.1.3
* components/adapter/nautilus-adapter-control-embed-strategy.c
(nautilus_adapter_control_embed_strategy_activate): add NULL opt_ev
to bonobo_ui_util_set_ui and/or bonobo_control_frame_set_ui_container
* components/adapter/nautilus-adapter-embeddable-embed-strategy.c
(nautilus_adapter_embeddable_embed_strategy_activate): ditto.
* libnautilus/nautilus-view.c (nautilus_view_set_up_ui): ditto.
* libnautilus/nautilus-clipboard.c (merge_in_clipboard_menu_items): ditto.
* src/nautilus-window.c (nautilus_window_constructed): ditto.
* src/file-manager/fm-desktop-icon-view.c (real_merge_menus): ditto.
* src/file-manager/fm-search-list-view.c (real_merge_menus): ditto.
* libnautilus/nautilus-view.c (nautilus_view_set_up_ui): ditto.
Diffstat (limited to 'libnautilus')
| -rw-r--r-- | libnautilus/nautilus-clipboard.c | 2 | ||||
| -rw-r--r-- | libnautilus/nautilus-view.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c index 8b2b3eaf0..5e60b1249 100644 --- a/libnautilus/nautilus-clipboard.c +++ b/libnautilus/nautilus-clipboard.c @@ -279,7 +279,7 @@ merge_in_clipboard_menu_items (GtkObject *widget_as_object, bonobo_ui_util_set_ui (ui, DATADIR, "nautilus-clipboard-ui.xml", - "nautilus"); + "nautilus", NULL); if (add_selection_callback) { gtk_signal_connect_after (GTK_OBJECT (widget_as_object), "selection_changed", diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index c64949f10..514eb5df4 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -796,7 +796,7 @@ nautilus_view_set_up_ui (NautilusView *view, bonobo_object_release_unref (ui_container, NULL); /* Set up the UI from an XML file. */ - bonobo_ui_util_set_ui (ui_component, datadir, ui_file_name, application_name); + bonobo_ui_util_set_ui (ui_component, datadir, ui_file_name, application_name, NULL); return ui_component; } |