[xine-cvs] CVS: xine-ui/src/xitk actions.c,1.122,1.123 mrl_browser.c,1.48,1.49

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs1:/tmp/cvs-serv13991

Modified Files:
	actions.c mrl_browser.c 
Log Message:
fix segfault when dbl clicking in mrl browser (thanks to Michael).

Index: actions.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- actions.c	1 Dec 2002 15:42:13 -0000	1.122
+++ actions.c	1 Dec 2002 16:22:00 -0000	1.123
@@ -257,9 +257,9 @@
     return 0;
   }
 
-  /*if(!strcmp(mrl, gGui->mmk.mrl))
-    gGui->playlist.mmk[gGui->playlist.cur]->played = 1;*/
-
+  if(!strcmp(mrl, gGui->mmk.mrl))
+    gGui->playlist.mmk[gGui->playlist.cur]->played = 1;
+  
   return 1;
 }
 

Index: mrl_browser.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/mrl_browser.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mrl_browser.c	23 Nov 2002 02:40:38 -0000	1.48
+++ mrl_browser.c	1 Dec 2002 16:22:00 -0000	1.49
@@ -354,20 +354,14 @@
 static void mrl_add_and_play(xitk_widget_t *w, void *data, xine_mrl_t *mrl) {
 
   if(mrl) {
-    mediamark_t mmk;
-
+    
     if((xine_get_status(gGui->stream) != XINE_STATUS_STOP)) {
       gGui->ignore_next = 1;
-      xine_stop (gGui->stream);
+      xine_stop(gGui->stream);
       gGui->ignore_next = 0;
     }
-
-    mmk.mrl = mrl->mrl;
-    mmk.ident = mrl->mrl;
-    mmk.start = 0;
-    mmk.end = -1;
-
-    gui_set_current_mrl(&mmk);
+    
+    gui_dndcallback((char *)mrl->mrl);
     
     if(!is_playback_widgets_enabled())
       enable_playback_controls(1);