diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-10-06 18:57:34 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-10-06 18:57:34 +0000 |
| commit | a755ca568661d4e8513306e33728e8c10fb65e61 (patch) | |
| tree | 820d01c24294cadee6ca410725ef6d2d432b87e7 /src/nautilus-object-window.c | |
| parent | c939faefede60925e65a6f065902dbffbd6357cd (diff) | |
| download | nautilus-a755ca568661d4e8513306e33728e8c10fb65e61.tar.gz | |
Work on bug 3496 (labels in menu bar items never change)
Finished bug 3505 (tool bar & location bar don't extend across window)
* libnautilus-extensions/nautilus-bonobo-extensions.h:
* libnautilus-extensions/nautilus-bonobo-extensions.c:
(nautilus_bonobo_set_label): New cover for bonobo xml
shenanigans to change the displayed label of an item
(menu item, toolbar item, whatever).
* src/nautilus-shell-ui.xml: Set behavior attributes on
tool bar and location bar so they fill the width of the
window and so the location bar can't be made vertical.
(Requires bonobo update to see this work.)
* src/nautilus-window-menus.c:
(append_separator): New not-yet-implemented function called
by other not-yet-working-again code.
(nautilus_window_initialize_menus): Took out a bunch of the
old #ifdeffed code now that the replacement code works.
(nautilus_window_update_find_menu_item): Toggle the label
of the Find menu item.
* src/nautilus-window.c: (nautilus_window_constructed):
Removed some #ifdeffed code.
Diffstat (limited to 'src/nautilus-object-window.c')
| -rw-r--r-- | src/nautilus-object-window.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index 1a8d8732f..a54266b40 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -367,19 +367,6 @@ nautilus_window_constructed (NautilusWindow *window) gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar, TRUE, TRUE, GNOME_PAD_SMALL); -#ifdef UIH - behavior = GNOME_DOCK_ITEM_BEH_EXCLUSIVE - | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL; - if (!gnome_preferences_get_toolbar_detachable ()) { - behavior |= GNOME_DOCK_ITEM_BEH_LOCKED; - } -#endif - -#ifdef UIH - gnome_app_add_docked (app, location_bar_box, - URI_ENTRY_DOCK_ITEM, behavior, - GNOME_DOCK_TOP, 2, 0, 0); -#endif /* Option menu for content view types; it's empty here, filled in when a uri is set. * Pack it into vbox so it doesn't grow vertically when location bar does. @@ -405,8 +392,6 @@ nautilus_window_constructed (NautilusWindow *window) gtk_widget_show (location_bar_box); #ifdef UIH - /* insert a little padding so status bar text isn't jammed against frame */ - gtk_misc_set_padding (GTK_MISC (GTK_STATUSBAR (status_bar)->label), GNOME_PAD, 0); window->status_bar_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (status_bar), "IhateGtkStatusbar"); #endif |