From: Shie E. <er...@us...> - 2005-02-08 18:59:42
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11534/krusader/Panel Modified Files: panelfunc.cpp Log Message: fix: KChooseDir::getDir() always returns a "good" url Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** panelfunc.cpp 5 Feb 2005 21:35:39 -0000 1.117 --- panelfunc.cpp 8 Feb 2005 18:58:48 -0000 1.118 *************** *** 359,365 **** dest = KChooseDir::getDir(s, dest, panel->virtualPath()); if ( dest.isEmpty() ) return ; // the user canceled - if ( dest.isRelativeURL(dest.url()) ) { - dest = KURL::fromPathOrURL(files()->vfs_workingDir()+"/"+dest.url()); - } } --- 359,362 ---- *************** *** 464,470 **** dest = KChooseDir::getDir(s, dest, panel->virtualPath()); if ( dest.isEmpty() ) return ; // the user canceled - if ( dest.isRelativeURL(dest.url()) ) { - dest = KURL::fromPathOrURL(files()->vfs_workingDir()+"/"+dest.url()); - } } --- 461,464 ---- *************** *** 783,792 **** KURL dest = KChooseDir::getDir(s, panel->otherPanel->virtualPath(), panel->virtualPath()); if ( dest.isEmpty() ) return ; // the user canceled ! if ( dest.isRelativeURL(dest.url()) ) { ! dest = KURL::fromPathOrURL(files()->vfs_workingDir()+"/"+dest.url()); ! } ! ! /* REVIEW - rafi, can the "check for partial urls" below be replaced by isRelativeURL above ? KChooseDir *chooser = new KChooseDir( 0, s, panel->otherPanel->virtualPath().prettyURL(), panel->virtualPath().prettyURL() ); if ( chooser->dest == QString::null ) --- 777,783 ---- KURL dest = KChooseDir::getDir(s, panel->otherPanel->virtualPath(), panel->virtualPath()); if ( dest.isEmpty() ) return ; // the user canceled ! ! /* REVIEW KChooseDir *chooser = new KChooseDir( 0, s, panel->otherPanel->virtualPath().prettyURL(), panel->virtualPath().prettyURL() ); if ( chooser->dest == QString::null ) |