diff -pu ../../../../vdr-1.3.6/PLUGINS/src/remote/remote.c ./remote.c
--- ../../../../vdr-1.3.6/PLUGINS/src/remote/remote.c	Thu Apr 29 02:43:07 2004
+++ ./remote.c	Sun May 16 18:29:38 2004
@@ -28,7 +28,7 @@
  
 #define KEYMAP_DEVICE_AV7110   "/proc/av7110_ir"
 
-static const char *VERSION        = "0.3.1";
+static const char *VERSION        = "0.3.1a";
 static const char *DESCRIPTION    = "Remote control";
 
 
@@ -204,7 +204,7 @@ bool cRemoteDevInput::loadKeymap(const c
     else
     {
         esyslog("%s: error uploading keymap to '%s'", Name(), devname);
-        Interface->Error(tr("Error uploading keymap"));
+        MSG_ERROR(tr("Error uploading keymap"));
         return false;
     }
 }
@@ -285,18 +285,18 @@ bool cRemoteDevInput::Initialize()
         {
             if (n == 0)
             {
-                Interface->Info(tr("Press any key to use pre-loaded keymap"));
+                MSG_INFO(tr("Press any key to use pre-loaded keymap"));
                 for (testKey = 0, i = 0; testKey == 0 && i < 35; i++)
                     usleep(200000);
                 if (testKey != 0)
                 {
-                    Interface->Info(tr("User-supplied keymap will be used"));
+                    MSG_INFO(tr("User-supplied keymap will be used"));
                     break;
                 }
             }
 
             kOptions = 0x0000;
-            Interface->Info(tr("Remote control test - press and hold down any key"));
+            MSG_INFO(tr("Remote control test - press and hold down any key"));
             loadKeymap(kDevname, kOptions);
             for (testKey = 0, i = 0; testKey == 0 && i < 10; i++)
                 usleep(200000);
@@ -315,7 +315,7 @@ bool cRemoteDevInput::Initialize()
 			break;
 		    }
 		}
-                Interface->Info(tr("RC5 protocol detected"));
+                MSG_INFO(tr("RC5 protocol detected"));
                 sprintf (setupStr, "%s %.8x %d", kDevname, kOptions, kAddr);
                 break;
             }
@@ -339,7 +339,7 @@ bool cRemoteDevInput::Initialize()
                         break;
                     }
                 }
-                Interface->Info(tr("RC5 protocol detected (inverted signal)"));
+                MSG_INFO(tr("RC5 protocol detected (inverted signal)"));
                 sprintf (setupStr, "%s %.8x %d", kDevname, kOptions, kAddr);
                 break;
             }
@@ -350,7 +350,7 @@ bool cRemoteDevInput::Initialize()
                 usleep(200000);
             if (testKey != 0)
             {
-                Interface->Info(tr("RCMM protocol detected"));
+                MSG_INFO(tr("RCMM protocol detected"));
                 sprintf (setupStr, "%s %.8x %d", kDevname, kOptions, kAddr);
                 break;
             }
@@ -361,7 +361,7 @@ bool cRemoteDevInput::Initialize()
                 usleep(200000);
             if (testKey != 0)
             {
-                Interface->Info(tr("RCMM protocol detected (inverted signal)"));
+                MSG_INFO(tr("RCMM protocol detected (inverted signal)"));
                 sprintf (setupStr, "%s %.8x %d", kDevname, kOptions, kAddr);
                 break;
             }
@@ -369,7 +369,7 @@ bool cRemoteDevInput::Initialize()
 
         if (testKey == 0)
         {
-            Interface->Error(tr("No remote control detected"));
+            MSG_ERROR(tr("No remote control detected"));
             esyslog("%s: no remote control detected", device);
             usleep(5000000);
             testMode = false;
diff -pu ../../../../vdr-1.3.6/PLUGINS/src/remote/remote.h ./remote.h
--- ../../../../vdr-1.3.6/PLUGINS/src/remote/remote.h	Thu Apr 22 19:07:31 2004
+++ ./remote.h	Sun May 16 17:51:12 2004
@@ -22,11 +22,19 @@
 #define DSYSLOG(x...)
 #endif
 
+#if VDRVERSNUM <= 10306
+#define MSG_ERROR(x)	Interface->Error(x)
+#define MSG_INFO(x)	Interface->Info(x)
+#else
+#define MSG_ERROR(x)	Skins.Message(mtError,x)
+#define MSG_INFO(x)	Skins.Message(mtInfo,x)
+#endif
+				
 // display error message with parameters on OSD
 #define EOSD(fmt,parms...)     {  char msg[132]; \
                                   snprintf(msg, sizeof msg, fmt, parms); \
-                                  Interface->Error(msg); \
-                                  Interface->Error(msg); /* repeat once */ }
+                                  MSG_ERROR(msg); \
+                                  MSG_ERROR(msg); /* repeat once */ }