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

List:       kde-commits
Subject:    kdebase/konqueror/client
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-07-26 17:39:29
Message-ID: 20040726173929.8974C9245 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

If Konqy is configured to always reuse, then really always reuse.


  M +15 -15    kfmclient.cc   1.118


--- kdebase/konqueror/client/kfmclient.cc  #1.117:1.118
@@ -174,4 +174,19 @@ extern "C" int kdemain( int argc, char *
 static bool startNewKonqueror( QString url, QString mimetype, const QString& profile )
 {
+    KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+    cfg.setGroup( "Reusing" );
+    QStringList allowed_parts;
+    // is duplicated in ../KonquerorIface.cc
+    allowed_parts << QString::fromLatin1( "konq_iconview.desktop" )
+                  << QString::fromLatin1( "konq_multicolumnview.desktop" )
+                  << QString::fromLatin1( "konq_sidebartng.desktop" )
+                  << QString::fromLatin1( "konq_infolistview.desktop" )
+                  << QString::fromLatin1( "konq_treeview.desktop" )
+                  << QString::fromLatin1( "konq_detailedlistview.desktop" );
+    if( cfg.hasKey( "SafeParts" )
+        && cfg.readEntry( "SafeParts" ) != QString::fromLatin1( "SAFE" ))
+        allowed_parts = cfg.readListEntry( "SafeParts" );
+    if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" ))
+        return false; // all parts allowed
     if( url.isEmpty())
     {
@@ -201,19 +216,4 @@ static bool startNewKonqueror( QString u
         mimetype = QString::fromLatin1( "" );
     }
-    KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
-    cfg.setGroup( "Reusing" );
-    QStringList allowed_parts;
-    // is duplicated in ../KonquerorIface.cc
-    allowed_parts << QString::fromLatin1( "konq_iconview.desktop" )
-                  << QString::fromLatin1( "konq_multicolumnview.desktop" )
-                  << QString::fromLatin1( "konq_sidebartng.desktop" )
-                  << QString::fromLatin1( "konq_infolistview.desktop" )
-                  << QString::fromLatin1( "konq_treeview.desktop" )
-                  << QString::fromLatin1( "konq_detailedlistview.desktop" );
-    if( cfg.hasKey( "SafeParts" )
-        && cfg.readEntry( "SafeParts" ) != QString::fromLatin1( "SAFE" ))
-        allowed_parts = cfg.readListEntry( "SafeParts" );
-    if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" ))
-        return false; // all parts allowed
     if( mimetype.isEmpty())
         mimetype = KMimeType::findByURL( KURL( url ) )->name();


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