aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 96165af..6c9cc60 100644
--- a/src/Screen.cc
+++ b/src/Screen.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: Screen.cc,v 1.50 2002/05/08 14:24:57 fluxgen Exp $ 25// $Id: Screen.cc,v 1.51 2002/05/17 11:02:30 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -258,10 +258,6 @@ resource(rm, screenname, altscreenname)
258 258
259 rootmenu = 0; 259 rootmenu = 0;
260 260
261 #ifdef HAVE_STRFTIME
262 resource.strftime_format = 0;
263 #endif // HAVE_STRFTIME
264
265 #ifdef HAVE_GETPID 261 #ifdef HAVE_GETPID
266 pid_t bpid = getpid(); 262 pid_t bpid = getpid();
267 263
@@ -513,11 +509,6 @@ BScreen::~BScreen(void) {
513 netizenList.end(), 509 netizenList.end(),
514 delete_obj<Netizen>); 510 delete_obj<Netizen>);
515 511
516#ifdef HAVE_STRFTIME
517 if (resource.strftime_format)
518 delete [] resource.strftime_format;
519#endif // HAVE_STRFTIME
520
521 delete rootmenu; 512 delete rootmenu;
522 delete workspacemenu; 513 delete workspacemenu;
523 delete iconmenu; 514 delete iconmenu;
@@ -1055,11 +1046,9 @@ void BScreen::raiseWindows(Window *workspace_stack, int num) {
1055} 1046}
1056 1047
1057#ifdef HAVE_STRFTIME 1048#ifdef HAVE_STRFTIME
1058void BScreen::saveStrftimeFormat(char *format) { 1049void BScreen::saveStrftimeFormat(const char *format) {
1059 if (resource.strftime_format) 1050 //make sure std::string don't get 0 string
1060 delete [] resource.strftime_format; 1051 resource.strftime_format = (format ? format : "");
1061
1062 resource.strftime_format = StringUtil::strdup(format);
1063} 1052}
1064#endif // HAVE_STRFTIME 1053#endif // HAVE_STRFTIME
1065 1054