diff options
| author | Andy Hertzfeld <andy@src.gnome.org> | 2001-01-18 19:46:08 +0000 |
|---|---|---|
| committer | Andy Hertzfeld <andy@src.gnome.org> | 2001-01-18 19:46:08 +0000 |
| commit | 252f7dcd95c50cd97624b63d7949f8bf2388be08 (patch) | |
| tree | 523315f41d352b302b15b8e82d5f2a990f5b540a /src/nautilus-window-toolbars.c | |
| parent | e82bab8c493c3d173622c18e5df07e3f36d982ea (diff) | |
| download | nautilus-252f7dcd95c50cd97624b63d7949f8bf2388be08.tar.gz | |
backed out the Bonobo component throbber temporarily due to Bonobo
backed out the Bonobo component throbber temporarily due
to Bonobo problems and restored the old one; hopefully, the
new one will come back soon.
* src/Makefile.am:
* src/nautilus-window-toolbars.c:
(nautilus_window_initialize_toolbars):
* src/nautilus-window.c: (nautilus_window_constructed),
(nautilus_window_destroy), (nautilus_window_allow_stop):
* src/nautilus-window.h:
fixed bug 5393, custom emblems arent scaling properly, by
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
* libnautilus-extensions/nautilus-icon-factory.c:
(get_themed_icon_file_path), (load_pixbuf_svg),
(load_specific_icon):
Diffstat (limited to 'src/nautilus-window-toolbars.c')
| -rw-r--r-- | src/nautilus-window-toolbars.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index d74931c20..e3a51e4a7 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -29,6 +29,7 @@ #include <config.h> #include "nautilus-application.h" +#include "nautilus-throbber.h" #include "nautilus-window-manage-views.h" #include "nautilus-window-private.h" #include "nautilus-window.h" @@ -352,11 +353,14 @@ set_up_back_or_forward_tool_bar_item (NautilusWindow *window, void nautilus_window_initialize_toolbars (NautilusWindow *window) { + GtkWidget *box; + + /* CORBA_Environment ev; CORBA_exception_init (&ev); - window->throbber = bonobo_get_object ("OAFIID:nautilus_throbber", "IDL:Bonobo/Control:1.0", &ev); + if (BONOBO_EX (&ev)) { char *txt; g_warning ("Throbber Activation exception '%s'", @@ -371,6 +375,18 @@ nautilus_window_initialize_toolbars (NautilusWindow *window) &ev); CORBA_exception_free (&ev); + */ + + window->throbber = nautilus_throbber_new (); + gtk_widget_show (window->throbber); + + /* wrap it in another box to add some visual padding */ + box = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (box), 4); + gtk_widget_show (box); + gtk_container_add (GTK_CONTAINER (box), window->throbber); + + set_widget_for_bonobo_control (window, box, "/Tool Bar/ThrobberWrapper"); window->details->back_button_item = set_up_back_or_forward_tool_bar_item |