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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdemultimedia/noatun/library
From:       Carsten Pfeiffer <carpdjih () mailbox ! tu-berlin ! de>
Date:       2003-05-05 14:40:44
[Download RAW message or body]

CVS commit by pfeiffer: 

backport remove() <-> kapp->exit() patch


  M +7 -0      noatun/pluginloader.h   1.1.4.1
  M +9 -1      pluginloader.cpp   1.40.2.1


--- kdemultimedia/noatun/library/pluginloader.cpp  #1.40:1.40.2.1
@@ -218,7 +218,9 @@ void LibraryLoader::setModules(const QSt
 }
 
-bool LibraryLoader::remove(const QString &spec)
+bool LibraryLoader::remove(const QString& spec, bool terminateOnLastUI)
 {
         removeNow(spec);
+        if ( !terminateOnLastUI )
+                return true;
 
         // exit if this is the last UI
@@ -243,4 +245,10 @@ bool LibraryLoader::remove(const QString
 
         return true;
+
+}
+
+bool LibraryLoader::remove(const QString &spec)
+{
+        remove(spec, true);
 }
 

--- kdemultimedia/noatun/library/noatun/pluginloader.h  #1.1:1.1.4.1
@@ -60,4 +60,11 @@ public:
         bool remove(const QString &spec);
         /**
+         * Same as the above, but does not call kapp->exit() even
+         * when the last userinterface plugin is removed. Necessary
+         * during session management (see marquis plugin).
+         * ### BIC: merge with above with terminateOnLastUI = true
+         */
+        bool remove(const QString &spec, bool terminateOnLastUI);
+        /**
          * unload the plugin that is plugin
          **/


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