update for new thread request interface.

src/zmapView/zmapViewUtils.c

@@ -27,15 +27,14 @@
  * Exported functions: See ZMap/ZMapView.h for public functions and
  *              zmapView_P.h for private functions.
  * HISTORY:
- * Last edited: Jan 20 16:49 2005 (edgrif)
+ * Last edited: Feb  1 12:51 2005 (edgrif)
  * Created: Mon Sep 20 10:29:15 2004 (edgrif)
- * CVS info:   $Id: zmapViewUtils.c,v 1.3 2005-01-24 11:50:20 edgrif Exp $
+ * CVS info:   $Id: zmapViewUtils.c,v 1.4 2005-02-02 15:00:35 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
 #include <glib.h>
 #include <ZMap/zmapUtils.h>
-#include <ZMap/zmapConn.h>
 #include <zmapView_P.h>
 
 
@@ -111,7 +110,7 @@ gboolean zmapAnyConnBusy(GList *connection_list)
 	{
 	  view_con = list_item->data ;
 	  
-	  if (view_con->curr_request == ZMAP_REQUEST_GETDATA)
+	  if (view_con->curr_request == ZMAPTHREAD_REQUEST_EXECUTE)
 	    {
 	      result = TRUE ;
 	      break ;

src/zmapView/zmapView_P.h

@@ -24,16 +24,16 @@
  *
  * Description: 
  * HISTORY:
- * Last edited: Dec 15 12:23 2004 (edgrif)
+ * Last edited: Feb  2 11:31 2005 (edgrif)
  * Created: Thu May 13 15:06:21 2004 (edgrif)
- * CVS info:   $Id: zmapView_P.h,v 1.13 2004-12-15 14:13:13 edgrif Exp $
+ * CVS info:   $Id: zmapView_P.h,v 1.14 2005-02-02 14:59:33 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_VIEW_P_H
 #define ZMAP_VIEW_P_H
 
 #include <glib.h>
-#include <ZMap/zmapConn.h>
+#include <ZMap/zmapThreads.h>
 #include <ZMap/zmapView.h>
 
 
@@ -61,7 +61,12 @@ typedef struct _ZMapViewConnectionStruct
 
   ZMapThreadRequest curr_request ;
 
+
+#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
   ZMapConnection connection ;
+#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
+  ZMapThread thread ;
+
 
 } ZMapViewConnectionStruct, *ZMapViewConnection ;