aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-02-20 09:29:07 (GMT)
committerfluxgen <fluxgen>2004-02-20 09:29:07 (GMT)
commit6b3a626cbef1f50696c15937f77735ed1c916eb3 (patch)
treefa43ca4e303c3392e8b53316fde2e95e6d959188 /src/Slit.cc
parent3c78d753c0c1b293d20ad52e38586929bf47f13e (diff)
downloadfluxbox_pavel-6b3a626cbef1f50696c15937f77735ed1c916eb3.zip
fluxbox_pavel-6b3a626cbef1f50696c15937f77735ed1c916eb3.tar.bz2
filename fix, patch from Mathias Gumz
Diffstat (limited to 'src/Slit.cc')
-rw-r--r--src/Slit.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 3802d07..08378ed 100644
--- a/src/Slit.cc
+++ b/src/Slit.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: Slit.cc,v 1.91 2004/02/12 10:29:24 rathnor Exp $ 25// $Id: Slit.cc,v 1.92 2004/02/20 09:29:06 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -1129,11 +1129,12 @@ void Slit::loadClientList(const char *filename) {
1129 return; 1129 return;
1130 1130
1131 // save filename so we can save client list later 1131 // save filename so we can save client list later
1132 m_filename = FbTk::StringUtil::expandFilename(filename); 1132 m_filename = filename;
1133 std::string real_filename= FbTk::StringUtil::expandFilename(filename);
1133 1134
1134 struct stat buf; 1135 struct stat buf;
1135 if (stat(m_filename.c_str(), &buf) == 0) { 1136 if (stat(real_filename.c_str(), &buf) == 0) {
1136 std::ifstream file(m_filename.c_str()); 1137 std::ifstream file(real_filename.c_str());
1137 std::string name; 1138 std::string name;
1138 while (! file.eof()) { 1139 while (! file.eof()) {
1139 name = ""; 1140 name = "";
@@ -1170,7 +1171,7 @@ void Slit::updateClientmenu() {
1170 m_clientlist_menu.insert("Cycle Up", cycle_up); 1171 m_clientlist_menu.insert("Cycle Up", cycle_up);
1171 m_clientlist_menu.insert("Cycle Down", cycle_down); 1172 m_clientlist_menu.insert("Cycle Down", cycle_down);
1172 1173
1173 FbTk::MenuItem *separator = new FbTk::MenuItem("-------"); 1174 FbTk::MenuItem *separator = new FbTk::MenuItem("---");
1174 separator->setEnabled(false); 1175 separator->setEnabled(false);
1175 m_clientlist_menu.insert(separator); 1176 m_clientlist_menu.insert(separator);
1176 1177
@@ -1186,7 +1187,7 @@ void Slit::updateClientmenu() {
1186 1187
1187void Slit::saveClientList() { 1188void Slit::saveClientList() {
1188 1189
1189 std::ofstream file(m_filename.c_str()); 1190 std::ofstream file(FbTk::StringUtil::expandFilename(m_filename).c_str());
1190 SlitClients::iterator it = m_client_list.begin(); 1191 SlitClients::iterator it = m_client_list.begin();
1191 SlitClients::iterator it_end = m_client_list.end(); 1192 SlitClients::iterator it_end = m_client_list.end();
1192 std::string prevName; 1193 std::string prevName;