fix 2 bus errors on osx:

[chaz/openbox] / src / Toolbar.cc

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index b6469957ddf66d72583a9dd853b5bff7853a5ff9..d0753aab9bfc7575d4e0bf7e27af90641a6609d8 100644 (file)
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -73,6 +73,7 @@ Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
   m_placement = BottomCenter;
   m_ontop = false;
   m_hidden = m_autohide = false;
+  load();
 
   // get the clock updating every minute
   clock_timer = new BTimer(openbox, *this);
@@ -257,6 +258,13 @@ void Toolbar::setPlacement(int p) {
   config.setValue(s.str(), placement);
 }
 
+void Toolbar::save() {
+  setOnTop(m_ontop);
+  setAutoHide(m_autohide);
+  setWidthPercent(m_width_percent);
+  setPlacement(m_placement);
+}
+
 void Toolbar::load() {
   std::ostrstream rscreen, rname, rclass;
   std::string s;
@@ -379,7 +387,7 @@ void Toolbar::reconfigure() {
     tt = localtime(&ttmp);
     if (tt) {
       char t[1025], *time_string = (char *) 0;
-      int len = strftime(t, 1024, screen.getStrftimeFormat(), tt);
+      int len = strftime(t, 1024, screen.strftimeFormat(), tt);
       t[len++-1] = ' ';   // add a space to the string for padding
       t[len] = '\0';
 
@@ -616,7 +624,7 @@ void Toolbar::checkClock(Bool redraw, Bool date) {
   if (redraw) {
 #ifdef    HAVE_STRFTIME
     char t[1024];
-    if (! strftime(t, 1024, screen.getStrftimeFormat(), tt))
+    if (! strftime(t, 1024, screen.strftimeFormat(), tt))
       return;
 #else // !HAVE_STRFTIME
     char t[9];
@@ -950,7 +958,7 @@ void Toolbar::edit() {
     return;
 
   XSetInputFocus(display, frame.workspace_label,
-                 ((screen.isSloppyFocus()) ? RevertToPointerRoot :
+                 ((screen.sloppyFocus()) ? RevertToPointerRoot :
                   RevertToParent),
                  CurrentTime);
   XClearWindow(display, frame.workspace_label);
@@ -1264,9 +1272,13 @@ Toolbarmenu::Toolbarmenu(Toolbar &tb) : Basemenu(tb.screen), toolbar(tb) {
                          "Edit current workspace name"), 3);
 
   update();
+ 
+  setValues();
+}
 
-  if (toolbar.onTop()) setItemSelected(1, True);
-  if (toolbar.autoHide()) setItemSelected(2, True);
+void Toolbarmenu::setValues() {
+  setItemSelected(1, toolbar.onTop());
+  setItemSelected(2, toolbar.autoHide());
 }
 
 
@@ -1321,6 +1333,7 @@ void Toolbarmenu::internal_hide() {
 
 
 void Toolbarmenu::reconfigure() {
+  setValues();
   placementmenu->reconfigure();
 
   Basemenu::reconfigure();
@@ -1349,7 +1362,6 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu &tm)
   update();
 }
 
-
 void Toolbarmenu::Placementmenu::itemSelected(int button, int index) {
   if (button != 1)
     return;