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

List:       kde-commits
Subject:    new_kcm_code: kdelibs/kcmshell
From:       Frans Englich <frans.englich () telia ! com>
Date:       2004-11-20 21:40:27
Message-ID: 20041120214027.4E81916EFD () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 

Use different DCOP name when embedding; append rootMode.


  M +12 -4     main.cpp   1.75.2.8
  M +3 -1      main.h   1.2.2.6


--- kdelibs/kcmshell/main.cpp  #1.75.2.7:1.75.2.8
@@ -144,7 +144,12 @@ void KCMShellMultiDialog::activate( QCSt
 }
 
-void KCMShell::setDCOPName(const QCString &dcopName)
+void KCMShell::setDCOPName(const QCString &dcopName, bool rootMode )
 {
-    m_dcopName = "kcmshell_"+dcopName;
+    m_dcopName = "kcmshell_";
+    if( rootMode )
+        m_dcopName += "rootMode_";
+
+    m_dcopName += dcopName;
+    
     dcopClient()->registerAs(m_dcopName, false);
 }
@@ -247,6 +252,8 @@ extern "C" KDE_EXPORT int kdemain(int _a
     }
 
-    /* Check if this particular module combination is already running */
-    app.setDCOPName(dcopName);
+    /* Check if this particular module combination is already running, but 
+     * allow the same module to run when embedding(root mode) */
+    app.setDCOPName(dcopName, 
+            ( args->isSet( "embed-proxy" ) || args->isSet( "embed" )));
     if( app.isRunning() )
     {
@@ -273,4 +280,5 @@ extern "C" KDE_EXPORT int kdemain(int _a
             KCModuleProxy module( modules.first()->desktopEntryName() );
             QXEmbed::embedClientIntoWindow( &module, id);
+            module.show();
             app.exec();
         }

--- kdelibs/kcmshell/main.h  #1.2.2.5:1.2.2.6
@@ -41,6 +41,8 @@ public:
      * Sets m_dcopName basically to @p dcopName, 
      * and then registers with DCOP.
+     *
+     * @param rootMode true if the kcmshell is embedding
      */
-    void setDCOPName(const QCString &dcopName);
+    void setDCOPName(const QCString &dcopName, bool rootMode );
 
     /**


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