aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-03-23 01:33:31 (GMT)
committerrathnor <rathnor>2003-03-23 01:33:31 (GMT)
commit029e4e5dc7fccad2a7020d0f532e94ed50fb4dfa (patch)
treeae4ed06f6ad5a5e36d1a541698e5175a3f21c4fe
parent524481403e4f31b98f401cc43843197a2513224f (diff)
downloadfluxbox_paul-029e4e5dc7fccad2a7020d0f532e94ed50fb4dfa.zip
fluxbox_paul-029e4e5dc7fccad2a7020d0f532e94ed50fb4dfa.tar.bz2
Some fixes for when strftime isn't available
-rw-r--r--src/Toolbar.cc4
-rw-r--r--src/fluxbox.cc10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 1aa8764..70e7020 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.65 2003/03/03 21:51:07 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.66 2003/03/23 01:33:31 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -663,7 +663,7 @@ void Toolbar::checkClock(bool redraw, bool date) {
663 char t[9]; 663 char t[9];
664 if (date) { 664 if (date) {
665 // format the date... with special consideration for y2k ;) 665 // format the date... with special consideration for y2k ;)
666 if (screen().getDateFormat() == Blackbox::B_EuropeanDate) { 666 if (screen().getDateFormat() == Fluxbox::B_EUROPEANDATE) {
667 sprintf(t, 667 sprintf(t,
668 i18n->getMessage( 668 i18n->getMessage(
669 ToolbarSet, ToolbarNoStrftimeDateFormatEu, 669 ToolbarSet, ToolbarNoStrftimeDateFormatEu,
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 8c9ee65..f8762b1 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.104 2003/03/22 05:13:08 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.105 2003/03/23 01:33:31 rathnor Exp $
26 26
27 27
28#include "fluxbox.hh" 28#include "fluxbox.hh"
@@ -1760,7 +1760,7 @@ void Fluxbox::save_rc() {
1760 XrmPutLineResource(&new_blackboxrc, rc_string); 1760 XrmPutLineResource(&new_blackboxrc, rc_string);
1761#else // !HAVE_STRFTIME 1761#else // !HAVE_STRFTIME
1762 sprintf(rc_string, "session.screen%d.dateFormat: %s", screen_number, 1762 sprintf(rc_string, "session.screen%d.dateFormat: %s", screen_number,
1763 ((screen->getDateFormat() == B_EuropeanDate) ? 1763 ((screen->getDateFormat() == B_EUROPEANDATE) ?
1764 "European" : "American")); 1764 "European" : "American"));
1765 XrmPutLineResource(&new_blackboxrc, rc_string); 1765 XrmPutLineResource(&new_blackboxrc, rc_string);
1766 1766
@@ -2064,11 +2064,11 @@ void Fluxbox::load_rc(BScreen *screen) {
2064 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type, 2064 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
2065 &value)) { 2065 &value)) {
2066 if (strncasecmp(value.addr, "european", value.size)) 2066 if (strncasecmp(value.addr, "european", value.size))
2067 screen->saveDateFormat(B_AmericanDate); 2067 screen->saveDateFormat(B_AMERICANDATE);
2068 else 2068 else
2069 screen->saveDateFormat(B_EuropeanDate); 2069 screen->saveDateFormat(B_EUROPEANDATE);
2070 } else 2070 } else
2071 screen->saveDateFormat(B_AmericanDate); 2071 screen->saveDateFormat(B_AMERICANDATE);
2072 2072
2073 sprintf(name_lookup, "session.screen%d.clockFormat", screen_number); 2073 sprintf(name_lookup, "session.screen%d.clockFormat", screen_number);
2074 sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number); 2074 sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number);