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

List:       kde-commits
Subject:    extragear/multimedia/kdetv
From:       Dirk Ziegelmeier <dziegel () gmx ! de>
Date:       2006-07-07 19:47:04
Message-ID: 1152301624.272203.28591.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 559626 by dziegel:

Prepare 0.8.9
Disable channelsuite plugin completely


 M  +41 -0     ChangeLog  
 M  +1 -1      kdetv_version.h  
 M  +2 -0      libkdetv/kdetvplugin.desktop  
 M  +24 -22    libkdetv/pluginfactory.cpp  
 M  +1 -0      plugins/misc/channelsuite/kdetv_channelsuite.desktop  


--- trunk/extragear/multimedia/kdetv/ChangeLog #559625:559626
@@ -1,3 +1,44 @@
+2006-07-04 15:22  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-06-15 15:09  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-05-29 14:52  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-05-16 14:49  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-03-27 15:28  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-03-26 16:52  dziegel
+
+	* : Fix compile on systems without libxv
+
+2006-03-21 15:41  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-03-17 21:34  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-01-19 13:46  scripty
+
+	* : SVN_SILENT made messages (.desktop file)
+
+2006-01-07 23:02  dziegel
+
+	* : Disable v4l1 and channelsuite plugin by default; Use update()
+	  instead of repaint();
+
 2005-12-31 11:49  scripty
 
 	* : SVN_SILENT made messages (.desktop file)
--- trunk/extragear/multimedia/kdetv/kdetv_version.h #559625:559626
@@ -1,2 +1,2 @@
-#define KDETV_VERSION "post 0.8.8"
+#define KDETV_VERSION "0.8.9"
 #define KDETV_PLUGIN_VERSION 1
--- trunk/extragear/multimedia/kdetv/libkdetv/kdetvplugin.desktop #559625:559626
@@ -17,3 +17,5 @@
 Type=bool
 [PropertyDef::X-Kdetv-Plugin-Version]
 Type=int
+[PropertyDef::X-Kdetv-Ignore-Plugin]
+Type=bool
--- trunk/extragear/multimedia/kdetv/libkdetv/pluginfactory.cpp #559625:559626
@@ -196,28 +196,30 @@
          it != plugs.constEnd();
          ++it) {
         KService::Ptr service = *it;
-        PluginDesc *x = new PluginDesc(this);
-        x->id    = _upid++;
-        x->name = service->property("Name").toString();
-        x->author = service->property("X-Kdetv-Plugin-Author").toString();
-        x->comment = service->property("Comment").toString();
-        x->icon = service->property("Icon").toString();
-        x->lib = service->property("X-Kdetv-Plugin-Library").toString();
-        x->factory = service->property("X-Kdetv-Plugin-Factory").toString();
-        x->service = service;
-        x->type = type;
-        x->configurable = service->property("X-Kdetv-Configurable").toBool();
-        if (x->factory.isEmpty())
-            x->factory = x->lib;
-        if (!x->factory.startsWith("create_"))
-            x->factory = "create_" + x->factory;
-
-        if (cfg->hasKey(x->name+"-"+x->author))
-            x->enabled = cfg->readBoolEntry(x->name+"-"+x->author);
-        else x->enabled = service->property("X-Kdetv-Default-Enabled").toBool();
-
-        list.append(x);
-        _allPlugins.append(x);
+        if(!service->property("X-Kdetv-Ignore-Plugin").toBool()) {
+            PluginDesc *x = new PluginDesc(this);
+            x->id    = _upid++;
+            x->name = service->property("Name").toString();
+            x->author = service->property("X-Kdetv-Plugin-Author").toString();
+            x->comment = service->property("Comment").toString();
+            x->icon = service->property("Icon").toString();
+            x->lib = service->property("X-Kdetv-Plugin-Library").toString();
+            x->factory = service->property("X-Kdetv-Plugin-Factory").toString();
+            x->service = service;
+            x->type = type;
+            x->configurable = service->property("X-Kdetv-Configurable").toBool();
+            if (x->factory.isEmpty())
+                x->factory = x->lib;
+            if (!x->factory.startsWith("create_"))
+                x->factory = "create_" + x->factory;
+            
+            if (cfg->hasKey(x->name+"-"+x->author))
+                x->enabled = cfg->readBoolEntry(x->name+"-"+x->author);
+            else x->enabled = service->property("X-Kdetv-Default-Enabled").toBool();
+            
+            list.append(x);
+            _allPlugins.append(x);
+        }
     }
 }
 
--- trunk/extragear/multimedia/kdetv/plugins/misc/channelsuite/kdetv_channelsuite.desktop #559625:559626
@@ -55,3 +55,4 @@
 X-Kdetv-Plugin-Author=Dirk Ziegelmeier
 X-Kdetv-Default-Enabled=false
 X-Kdetv-Configurable=false
+X-Kdetv-Ignore-Plugin=true
[prev in list] [next in list] [prev in thread] [next in thread]