diff options
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/ChangeLog | 4 | ||||
-rw-r--r-- | calendar/gui/calendar-commands.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 445d11e473..51cb7a39ab 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,7 @@ +2000-08-09 Cody Russell <bratsche@gnome.org> + * gui/calendar-commands.c: Make the toolbar honor the user's + gnomecc settings for detachable toolbars. + 2000-08-09 Federico Mena Quintero <federico@helixcode.com> * gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 4f06fd6239..feb3cd9590 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -650,9 +650,14 @@ calendar_control_activate (BonoboControl *control, gtk_widget_show_all (toolbar_frame); + behavior = GNOME_DOCK_ITEM_BEH_EXCLUSIVE | + GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL; + if (!gnome_preferences_get_toolbar_detachable ()) + behavior |= GNOME_DOCK_ITEM_BEH_LOCKED; + bonobo_ui_handler_dock_add (uih, "/Toolbar", bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_control_new (toolbar_frame))), - GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL, + behavior, GNOME_DOCK_TOP, 1, 1, 0); |