M src/Toolbar.cc → src/Toolbar.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.65 2003/03/03 21:51:07 rathnor Exp $
+// $Id: Toolbar.cc,v 1.66 2003/03/23 01:33:31 rathnor Exp $
 
 #include "Toolbar.hh"
 
@@ -663,7 +663,7 @@ #else // !HAVE_STRFTIME
     char t[9];
     if (date) {
         // format the date... with special consideration for y2k ;)
-        if (screen().getDateFormat() == Blackbox::B_EuropeanDate) {
+        if (screen().getDateFormat() == Fluxbox::B_EUROPEANDATE) {
             sprintf(t,
                     i18n->getMessage(
                                      ToolbarSet, ToolbarNoStrftimeDateFormatEu,

M src/fluxbox.cc → src/fluxbox.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.104 2003/03/22 05:13:08 rathnor Exp $
+// $Id: fluxbox.cc,v 1.105 2003/03/23 01:33:31 rathnor Exp $
 
 
 #include "fluxbox.hh"
@@ -1760,7 +1760,7 @@ screen->getStrftimeFormat());
         XrmPutLineResource(&new_blackboxrc, rc_string);
 #else // !HAVE_STRFTIME
         sprintf(rc_string, "session.screen%d.dateFormat:	%s", screen_number,
-                ((screen->getDateFormat() == B_EuropeanDate) ?
+                ((screen->getDateFormat() == B_EUROPEANDATE) ?
                  "European" : "American"));
         XrmPutLineResource(&new_blackboxrc, rc_string);
 
@@ -2064,11 +2064,11 @@ sprintf(class_lookup, "Session.Screen%d.DateFormat", screen_number);
     if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
                        &value)) {
         if (strncasecmp(value.addr, "european", value.size))
-            screen->saveDateFormat(B_AmericanDate);
+            screen->saveDateFormat(B_AMERICANDATE);
         else
-            screen->saveDateFormat(B_EuropeanDate);
+            screen->saveDateFormat(B_EUROPEANDATE);
     } else
-        screen->saveDateFormat(B_AmericanDate);
+        screen->saveDateFormat(B_AMERICANDATE);
 
     sprintf(name_lookup, "session.screen%d.clockFormat", screen_number);
     sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number);