From 791fe6c40e8425535198c6b82ca1af2a0f8ee98e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Wed, 14 Sep 2005 16:04:09 +0200
Subject: [PATCH] Fixed two errors in 'newplugin'

---
 CONTRIBUTORS | 3 +++
 HISTORY      | 4 ++++
 config.h     | 6 +++---
 newplugin    | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2b6b4e41..3eca5dbf 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1479,3 +1479,6 @@ Marko M
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
+
+Alexander Rieger <Alexander.Rieger@inka.de>
+ for fixing two errors in 'newplugin'
diff --git a/HISTORY b/HISTORY
index f620da8f..07873ab2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3806,3 +3806,7 @@ Video Disk Recorder Revision History
   (thanks to Carsten Koch).
 - Implemented a hash for the channels to reduce the system load in the EIT scanning
   thread (based on a patch by Georg Acher).
+
+2005-09-14: Version 1.3.33
+
+- Fixed two errors in 'newplugin' (thanks to Alexander Rieger).
diff --git a/config.h b/config.h
index 8113c193..fa11391e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.227 2005/09/04 10:49:24 kls Exp $
+ * $Id: config.h 1.228 2005/09/14 16:04:09 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.32"
-#define VDRVERSNUM   10332  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.33"
+#define VDRVERSNUM   10333  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/newplugin b/newplugin
index 90d6113a..92bc0d46 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.20 2005/08/27 16:13:29 kls Exp $
+# $Id: newplugin 1.21 2005/09/14 16:02:06 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -245,13 +245,13 @@ bool cPlugin${PLUGIN_CLASS}::Service(const char *Id, void *Data)
   return false;
 }
 
-const char **cPlugin${PLUGIN_CLASS}::SVDRPHelpPages(vo<F3>id)
+const char **cPlugin${PLUGIN_CLASS}::SVDRPHelpPages(void)
 {
   // Return help text for SVDRP commands this plugin implements
   return NULL;
 }
 
-const char *cPlugin${PLUGIN_CLASS}::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+cString cPlugin${PLUGIN_CLASS}::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
 {
   // Process SVDRP commands this plugin implements
   return NULL;