aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorCody Russell <bratsche@src.gnome.org>2000-08-10 07:59:37 +0800
committerCody Russell <bratsche@src.gnome.org>2000-08-10 07:59:37 +0800
commit57b053b87516dd32f785fcb0cb35e15adc661239 (patch)
treec5ba77eb44e5824915a5f483d9b10486a4ae2b45 /addressbook
parentfc65f736557ec270e57a27d6c813ff3f1d2356ea (diff)
downloadgsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.tar
gsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.tar.gz
gsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.tar.bz2
gsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.tar.lz
gsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.tar.xz
gsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.tar.zst
gsoc2013-evolution-57b053b87516dd32f785fcb0cb35e15adc661239.zip
Made the toolbars conform to the user's gnomecc settings for detachable
toolbars. svn path=/trunk/; revision=4677
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ee3199562a..2f83d27c87 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-09 Cody Russell <bratsche@gnome.org>
+
+ * gui/component/addressbook.c: Make the toolbar honor the user's
+ gnomecc settings for detachable toolbars.
+
2000-08-09 Nat Friedman <nat@helixcode.com>
* ename/e-name-western-tables.h: Added some military prefixes.
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index ffc40a3424..2e484ee1ff 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -481,6 +481,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
Bonobo_UIHandler remote_uih;
GtkWidget *toolbar, *toolbar_frame;
BonoboControl *toolbar_control;
+ GnomeDockItemBehavior behavior;
GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
GtkWidget *quick_search_widget;
@@ -550,11 +551,15 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
gtk_widget_show_all (toolbar_frame);
+ behavior = GNOME_DOCK_ITEM_BEH_EXCLUSIVE;
+ if (!gnome_preferences_get_toolbar_detachable ())
+ behavior |= GNOME_DOCK_ITEM_BEH_LOCKED;
+
toolbar_control = bonobo_control_new (toolbar_frame);
bonobo_ui_handler_dock_add (
uih, "/Toolbar",
bonobo_object_corba_objref (BONOBO_OBJECT (toolbar_control)),
- GNOME_DOCK_ITEM_BEH_EXCLUSIVE,
+ behavior,
GNOME_DOCK_TOP,
1, 1, 0);
}