diff --git a/src/zmapApp/zmapApp_P.h b/src/zmapApp/zmapApp_P.h index 58110dd48138af3c2506a70c93f6b2ed3a717de7..9dcd5441c42a3b39ce655bae9f8a392d9ba4551c 100755 --- a/src/zmapApp/zmapApp_P.h +++ b/src/zmapApp/zmapApp_P.h @@ -25,9 +25,9 @@ * Description: * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Nov 14 15:15 2003 (edgrif) + * Last edited: Nov 17 16:11 2003 (edgrif) * Created: Thu Jul 24 14:35:41 2003 (edgrif) - * CVS info: $Id: zmapApp_P.h,v 1.2 2003-11-14 17:44:36 edgrif Exp $ + * CVS info: $Id: zmapApp_P.h,v 1.3 2003-11-18 10:44:16 edgrif Exp $ *------------------------------------------------------------------- */ #ifndef ZMAP_APP_PRIV_H @@ -53,7 +53,7 @@ typedef struct GtkWidget *clist_widg ; ZMapManager zmap_manager ; - ZMapWinConn selected_zmap ; + ZMap selected_zmap ; } ZMapAppContextStruct, *ZMapAppContext ; diff --git a/src/zmapApp/zmapAppconnect.c b/src/zmapApp/zmapAppconnect.c index 7fee3c7bb0200468708e7e5a3bbc5ec4a226619b..5b14b0db6b00a95992ad611074fc7b0f598d9349 100755 --- a/src/zmapApp/zmapAppconnect.c +++ b/src/zmapApp/zmapAppconnect.c @@ -26,9 +26,9 @@ * Description: * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Nov 14 17:07 2003 (edgrif) + * Last edited: Nov 17 14:58 2003 (edgrif) * Created: Thu Jul 24 14:36:37 2003 (edgrif) - * CVS info: $Id: zmapAppconnect.c,v 1.2 2003-11-14 17:45:26 edgrif Exp $ + * CVS info: $Id: zmapAppconnect.c,v 1.3 2003-11-18 10:44:16 edgrif Exp $ *------------------------------------------------------------------- */ @@ -114,7 +114,7 @@ static void createThreadCB(GtkWidget *widget, gpointer cb_data) char *sequence ; char *row_text[ZMAP_NUM_COLS] = {"", "", ""} ; int row ; - ZMapWinConn zmapconn ; + ZMap zmap ; machine = (char *)gtk_entry_get_text(GTK_ENTRY(app_context->machine_widg)) ; port_str = (char *)gtk_entry_get_text(GTK_ENTRY(app_context->port_widg)) ; @@ -122,16 +122,15 @@ static void createThreadCB(GtkWidget *widget, gpointer cb_data) sequence = (char *)gtk_entry_get_text(GTK_ENTRY(app_context->sequence_widg)) ; - zmapconn = zMapManagerAdd(app_context->zmap_manager, machine, port, sequence) ; + zmap = zMapManagerAdd(app_context->zmap_manager, machine, port, sequence) ; /* ERROR HANDLING ETC.... */ - row_text[0] = machine ; row_text[1] = port_str ; row_text[2] = sequence ; row = gtk_clist_append(GTK_CLIST(app_context->clist_widg), row_text) ; - gtk_clist_set_row_data(GTK_CLIST(app_context->clist_widg), row, (gpointer)zmapconn) ; + gtk_clist_set_row_data(GTK_CLIST(app_context->clist_widg), row, (gpointer)zmap) ; ZMAP_DEBUG(("GUI: create thread number %d to access: %s on port %d\n", diff --git a/src/zmapApp/zmapAppmanage.c b/src/zmapApp/zmapAppmanage.c index 20a09965f2e9678086bdc76545e1c9b4ccc164f1..1580964312e0b78c3cb71c3200f3941d2ea29154 100755 --- a/src/zmapApp/zmapAppmanage.c +++ b/src/zmapApp/zmapAppmanage.c @@ -26,9 +26,9 @@ * Description: * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Nov 14 17:12 2003 (edgrif) + * Last edited: Nov 17 16:11 2003 (edgrif) * Created: Thu Jul 24 14:36:47 2003 (edgrif) - * CVS info: $Id: zmapAppmanage.c,v 1.2 2003-11-14 17:45:55 edgrif Exp $ + * CVS info: $Id: zmapAppmanage.c,v 1.3 2003-11-18 10:44:16 edgrif Exp $ *------------------------------------------------------------------- */ @@ -173,7 +173,7 @@ static void selectRow(GtkCList *clist, gint row, gint column, GdkEventButton *ev { ZMapAppContext app_context = (ZMapAppContext)cb_data ; - app_context->selected_zmap = (ZMapWinConn)gtk_clist_get_row_data(clist, row) ; + app_context->selected_zmap = (ZMap)gtk_clist_get_row_data(clist, row) ; #ifdef ED_G_NEVER_INCLUDE_THIS_CODE