3 files changed, 11 insertions, 6 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 2d4c1dc82..bb086b671 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.c,v 1.35 2002/09/22 14:29:40 mroi Exp $
+ * $Id: configfile.c,v 1.36 2002/10/23 11:44:31 jcdutton Exp $
  *
  * config object (was: file) management - implementation
  *
@@ -37,9 +37,9 @@
 #include "xineutils.h"
 #include "xine_internal.h"
 
-/* 
+ 
 #define LOG
-*/
+
 
 
 /* 
diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c
index d46fda323..af5d27398 100644
--- a/src/xine-engine/events.c
+++ b/src/xine-engine/events.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: events.c,v 1.12 2002/10/22 07:36:05 jcdutton Exp $
+ * $Id: events.c,v 1.13 2002/10/23 11:44:31 jcdutton Exp $
  *
  * Event handling functions
  *
@@ -84,7 +84,7 @@ void xine_event_send (xine_stream_t *stream, const xine_event_t *event) {
     cevent->type        = event->type;
     cevent->stream      = event->stream;
     cevent->data_length = event->data_length;
-    if (cevent->data_length > 0 ) {
+    if ((event->data_length > 0) && (event->data) ) {
       cevent->data = malloc (event->data_length);
       memcpy (cevent->data, event->data, event->data_length);
     } else {
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 77b0d72d2..fce314595 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.c,v 1.172 2002/10/21 12:11:03 jcdutton Exp $
+ * $Id: xine.c,v 1.173 2002/10/23 11:44:31 jcdutton Exp $
  *
  * top-level xine functions
  *
@@ -620,6 +620,11 @@ xine_t *xine_new (void) {
   return this;
 }
 
+void xine_scan_plugins(xine_t *this) {
+  printf("scan plugins entered\n");
+  scan_plugins(this);
+  printf("scan plugins finished\n");
+}
 
 void xine_init (xine_t *this) {