[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: kdebase/konqueror/sidebar/trees
From:       Ian Reinhart Geiser <geiseri () yahoo ! com>
Date:       2003-07-24 1:59:53
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please revert this or #ifdef it so it works with Qt 3.1 please.

Cheers
	-ian reinhart geiser
On Wednesday 23 July 2003 06:32 pm, Joseph Wenninger wrote:
> CVS commit by jowenn:
>
> Now this really fixes Bug #53734.
> CCMAIL: 53734-done@bugs.kde.org
>
>
>   M +40 -35    konq_sidebartree.cpp   1.32
>
>
> --- kdebase/konqueror/sidebar/trees/konq_sidebartree.cpp  #1.31:1.32
> @@ -523,6 +523,9 @@ void KonqSidebarTree::scanDir( KonqSideb
>          {
>              // We will copy over the configuration for the dirtree, from
> the global directory -            QString dirtree_dir =
> KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtre
>eDir.relDir+"/").last();  // most global -            kdDebug(1201) <<
> "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl; +          
>  QStringList dirtree_dirs =
> KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtre
>eDir.relDir+"/"); +
> +
> +//            QString dirtree_dir =
> KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtre
>eDir.relDir+"/").last();  // most global +//            kdDebug(1201) <<
> "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl;
>
>              /*
> @@ -537,5 +540,8 @@ void KonqSidebarTree::scanDir( KonqSideb
>              */
>
> -            if ( !dirtree_dir.isEmpty() && dirtree_dir != path )
> +            for (QStringList::const_iterator
> ddit=dirtree_dirs.constBegin();ddit!=dirtree_dirs.constEnd();++ddit) { +   
>             QString dirtree_dir=*ddit;
> +                if (dirtree_dir==path) continue;
> +                //    if ( !dirtree_dir.isEmpty() && dirtree_dir != path )
>              {
>                  QDir globalDir( dirtree_dir );
> @@ -559,5 +565,6 @@ void KonqSidebarTree::scanDir( KonqSideb
>                      }
>                  }
> -
> +                     }
> +                  }
>                  // hack to make QDir refresh the lists
>                  dir.setPath(path);
> @@ -568,6 +575,4 @@ void KonqSidebarTree::scanDir( KonqSideb
>              }
>          }
> -    }
> -
>      QStringList::ConstIterator eIt = entries.begin();
>      QStringList::ConstIterator eEnd = entries.end();

- -- 
- --:Ian Reinhart Geiser <geiseri@yahoo.com>
- --:Public Key: http://geiseri.myip.org/~geiseri/publickey.asc
- --:Public Calender: http://geiseri.myip.org/~geiseri/publicevents.ics
- --:Jabber: geiseri@geiseri.myip.org
- --:Be an optimist -- at least until they start moving animals in 
- --:   pairs to Cape Canaveral. ~ Source Unknown
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE/Hz2ZPy62TRm8dvgRArtmAKDBs38fmAd69JSrty0Eb91oCPOunACdGAxV
O2e0GqIrlgjJrQ/bA7Pp4tQ=
=4Xpk
-----END PGP SIGNATURE-----

[prev in list] [next in list] [prev in thread] [next in thread]