[xine-cvs] CVS: xine-ui/src/xitk setup.c,1.90,1.91

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13820/src/xitk

Modified Files:
	setup.c 
Log Message:
check for callback_data and callback, because xine-ui uses callbacks with
callback_data=NULL (since xine-ui has access to the structures via global vars)


Index: setup.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/setup.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- setup.c	18 Mar 2004 17:52:58 -0000	1.90
+++ setup.c	19 Mar 2004 14:48:47 -0000	1.91
@@ -94,7 +94,8 @@
     xitk_widget_t *lbl;                                                                         \
     char           _labelkey[strlen(labelkey) + 5];                                             \
                                                                                                 \
-    sprintf(_labelkey, "%s%s", labelkey, (!entry->callback_data) ? " (*)" : "");                \
+    sprintf(_labelkey, "%s%s", labelkey,                                                        \
+      (!entry->callback_data && !entry->callback) ? " (*)" : "");                               \
                                                                                                 \
     fs = xitk_font_load_font(gGui->display, fontname);                                          \
     xitk_font_set_font(fs, (XITK_WIDGET_LIST_GC(setup->widget_list)));                          \
@@ -284,7 +285,7 @@
 	  char          *strval = NULL;
 	  
 	  if(!need_restart) {
-	    if(setup->wg[i]->changed && (!setup->wg[i]->cfg->callback_data))
+	    if(setup->wg[i]->changed && (!setup->wg[i]->cfg->callback_data && !setup->wg[i]->cfg->callback))
 	      need_restart = 1;
 	  }