diff options
author | Marco Pesenti Gritti <marco@gnome.org> | 2004-10-18 16:44:35 +0000 |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-10-18 16:44:35 +0000 |
commit | 28bb1db544d481e80fc425ae4a29d7caac0fd35a (patch) | |
tree | b7b0061dd8674cfbf52be2240c06ef503e0a97d4 | |
parent | 8b4284fd198b3c3cb8af191dbfc4b264eac77b37 (diff) | |
download | nautilus-28bb1db544d481e80fc425ae4a29d7caac0fd35a.tar.gz |
reviewed by: Alexander Larsson <alexl@redhat.com>
2004-10-18 Marco Pesenti Gritti <marco@gnome.org>
reviewed by: Alexander Larsson <alexl@redhat.com>
* src/nautilus-navigation-window-ui.xml:
* src/nautilus-window-toolbars.c:
(nautilus_navigation_window_initialize_toolbars):
Work around pack-ends no more working in libbonoboui
by putting an expanded event box before the
throbber
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | src/nautilus-navigation-window-ui.xml | 2 | ||||
-rw-r--r-- | src/nautilus-window-toolbars.c | 11 |
3 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,15 @@ +2004-10-18 Marco Pesenti Gritti <marco@gnome.org> + + reviewed by: Alexander Larsson <alexl@redhat.com> + + * src/nautilus-navigation-window-ui.xml: + * src/nautilus-window-toolbars.c: + (nautilus_navigation_window_initialize_toolbars): + + Work around pack-ends no more working in libbonoboui + by putting an expanded event box before the + throbber + 2004-10-15 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-program-choosing.c (nautilus_launch_show_file): diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml index 14a277995..5a453b14f 100644 --- a/src/nautilus-navigation-window-ui.xml +++ b/src/nautilus-navigation-window-ui.xml @@ -183,7 +183,7 @@ <placeholder name="Extra Buttons Placeholder" delimit="top"> <placeholder name="Extension Actions"/> </placeholder> - + <control name="SpaceWrapper" behavior="expandable"/> <control name="ThrobberWrapper" behavior="pack-end"/> </dockitem> </Root> diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index edac4c6ad..a86142b81 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -42,7 +42,7 @@ #include <eel/eel-gnome-extensions.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-string.h> -#include <gtk/gtkframe.h> +#include <gtk/gtklabel.h> #include <gtk/gtktogglebutton.h> #include <gdk/gdkkeysyms.h> #include <libgnome/gnome-i18n.h> @@ -357,6 +357,8 @@ nautilus_navigation_window_activate_throbber (NautilusNavigationWindow *window) void nautilus_navigation_window_initialize_toolbars (NautilusNavigationWindow *window) { + GtkWidget *space; + nautilus_window_ui_freeze (NAUTILUS_WINDOW (window)); nautilus_navigation_window_activate_throbber (window); @@ -368,6 +370,13 @@ nautilus_navigation_window_initialize_toolbars (NautilusNavigationWindow *window (window, _("Go forward a number of pages"), "/Toolbar/ForwardMenu"); + space = gtk_event_box_new (); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (space), FALSE); + bonobo_ui_component_widget_set (NAUTILUS_WINDOW (window)->details->shell_ui, + "/Toolbar/SpaceWrapper", + space, + NULL); + nautilus_window_ui_thaw (NAUTILUS_WINDOW (window)); } |