[xine-cvs] CVS: xine-ui/src/xitk/xine-toolkit label.c,1.54,1.55

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

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

Modified Files:
	label.c 
Log Message:
oops, i introduced a deadlock on deadlock fixing ;-)

Index: label.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/label.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- label.c	28 Mar 2003 13:50:12 -0000	1.54
+++ label.c	28 Mar 2003 13:56:32 -0000	1.55
@@ -162,7 +162,7 @@
     xitk_image_t          *font = (xitk_image_t *) private_data->font;
 
     pthread_mutex_lock(&private_data->paint_mutex);
-
+    
     /* non skinable widget */
     if(private_data->skin_element_name == NULL) {
       xitk_font_t   *fs = NULL;
@@ -198,11 +198,13 @@
       
       xitk_font_unload_font(fs);
       
+      pthread_mutex_unlock(&private_data->paint_mutex);
       return;
     }
     else {
       int width = private_data->char_length * private_data->length;
       
+
       XLOCK(private_data->imlibdata->x.disp);
       XCopyArea(private_data->imlibdata->x.disp, 
 		private_data->labelpix->pixmap, w->wl->win, font->image->gc, 
@@ -214,6 +216,7 @@
 	XSync(private_data->imlibdata->x.disp, False);
       
       XUNLOCK(private_data->imlibdata->x.disp);
+
     }
     
     pthread_mutex_unlock(&private_data->paint_mutex);