diff options
author | akir <akir> | 2004-10-10 16:35:29 (GMT) |
---|---|---|
committer | akir <akir> | 2004-10-10 16:35:29 (GMT) |
commit | 4e052521727d2d5aeb8180c0dda6b42864dc4199 (patch) | |
tree | d41a9393b8f089df906c5b10f409e34d7706b337 | |
parent | 30ff5c93e730d7aa9655d1d4451344a797dc84d1 (diff) | |
download | fluxbox_pavel-4e052521727d2d5aeb8180c0dda6b42864dc4199.zip fluxbox_pavel-4e052521727d2d5aeb8180c0dda6b42864dc4199.tar.bz2 |
fbrun switches between file-search and path-to-file-search now correctly (i think)
-rw-r--r-- | util/fbrun/FbRun.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc index 0199f88..bd9a2c8 100644 --- a/util/fbrun/FbRun.cc +++ b/util/fbrun/FbRun.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbRun.cc,v 1.32 2004/09/29 00:51:29 akir Exp $ | 22 | // $Id: FbRun.cc,v 1.33 2004/10/10 16:35:29 akir Exp $ |
23 | 23 | ||
24 | #include "FbRun.hh" | 24 | #include "FbRun.hh" |
25 | 25 | ||
@@ -365,7 +365,8 @@ void FbRun::tabCompleteApps() { | |||
365 | 365 | ||
366 | string path; | 366 | string path; |
367 | 367 | ||
368 | if(!prefix.empty() && prefix[0] =='/') { | 368 | if(!prefix.empty() && |
369 | string("/.~").find_first_of(prefix[0]) != string::npos) { | ||
369 | size_t rseparator= prefix.find_last_of("/"); | 370 | size_t rseparator= prefix.find_last_of("/"); |
370 | path= prefix.substr(0, rseparator + 1) + ":"; | 371 | path= prefix.substr(0, rseparator + 1) + ":"; |
371 | add_dirs= true; | 372 | add_dirs= true; |
@@ -438,7 +439,7 @@ void FbRun::tabCompleteApps() { | |||
438 | } | 439 | } |
439 | if (m_apps[apps_item].find(prefix) == 0) { | 440 | if (m_apps[apps_item].find(prefix) == 0) { |
440 | m_current_apps_item = apps_item; | 441 | m_current_apps_item = apps_item; |
441 | if (FbTk::Directory::isDirectory(m_apps[m_current_apps_item])) | 442 | if (add_dirs && FbTk::Directory::isDirectory(m_apps[m_current_apps_item])) |
442 | setText(m_apps[m_current_apps_item] + "/"); | 443 | setText(m_apps[m_current_apps_item] + "/"); |
443 | else | 444 | else |
444 | setText(m_apps[m_current_apps_item]); | 445 | setText(m_apps[m_current_apps_item]); |