Merge commit '20070318' into HEAD

[ion3.git] / mod_sm / sm.c

diff --git a/mod_sm/sm.c b/mod_sm/sm.c
index 6971f7d1d6354f77ee926053f6ef7e43443c0b4e..16bd2d2e2a6d12a1e98c72a66535005f324d6580 100644 (file)
--- a/mod_sm/sm.c
+++ b/mod_sm/sm.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sm/sm.c
  *
- * Copyright (c) Tuomo Valkonen 2004-2006. 
+ * Copyright (c) Tuomo Valkonen 2004-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -15,6 +15,7 @@
 #include <libtu/misc.h>
 #include <libtu/parser.h>
 #include <libtu/tokenizer.h>
+#include <libtu/util.h>
 
 #include <ioncore/common.h>
 #include <ioncore/global.h>
@@ -84,7 +85,7 @@ static void mod_sm_set_sessiondir()
      * to the session.
      */
     if(smdir!=NULL){
-        tmp=scat(smdir, "/ion3"); /* TODO: pwm<=>ion! */
+        tmp=scat3(smdir, "/", libtu_progbasename());
     }else if(id!=NULL){
         tmp=scat("gnome-session-", id);
         if(tmp!=NULL){