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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdebase/konqueror/client
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2003-05-19 13:30:30
[Download RAW message or body]

CVS commit by lunakl: 

Disable konqyeror reusing for screen > 0.


  M +18 -1     kfmclient.cc   1.87.2.4


--- kdebase/konqueror/client/kfmclient.cc  #1.87.2.3:1.87.2.4
@@ -142,7 +142,24 @@ int main( int argc, char **argv )
 }
 
+static int currentScreen()
+{
+    if( qt_xdisplay() != NULL )
+        return qt_xscreen();
+    // case when there's no KApplication instance
+    const char* env = getenv( "DISPLAY" );
+    if( env == NULL )
+        return 0;
+    const char* dotpos = strrchr( env, '.' );
+    const char* colonpos = strrchr( env, ':' );
+    if( dotpos != NULL && colonpos != NULL && dotpos > colonpos )
+        return atoi( dotpos + 1 );
+    return 0;
+}
+
 /** Whether to start a new konqueror or reuse an existing process */
 static bool startNewKonqueror( const KURL & url )
 {
+    if( currentScreen() != 0 )
+        return true;
     KConfig config( QString::fromLatin1("kfmclientrc") );
     config.setGroup( QString::fromLatin1("Settings") );


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