diff --git a/src/zmapManager/zmapManager.c b/src/zmapManager/zmapManager.c index 7491cbb3cc036c405453ad0104406de0f227e28c..97ff7e66c18328deaeb116b566099eea45b21b8d 100755 --- a/src/zmapManager/zmapManager.c +++ b/src/zmapManager/zmapManager.c @@ -25,9 +25,9 @@ * Description: * Exported functions: See zmapManager.h * HISTORY: - * Last edited: May 19 14:27 2004 (edgrif) + * Last edited: Jul 13 16:02 2004 (edgrif) * Created: Thu Jul 24 16:06:44 2003 (edgrif) - * CVS info: $Id: zmapManager.c,v 1.9 2004-05-20 14:12:25 edgrif Exp $ + * CVS info: $Id: zmapManager.c,v 1.10 2004-07-14 09:09:13 edgrif Exp $ *------------------------------------------------------------------- */ @@ -38,6 +38,13 @@ static void removeZmapEntry(ZMapManager zmaps, ZMap zmap) ; +/* Do we want a full callback struct for callbacks here ? Might be overkill.... */ + +/* ZMap callbacks passed to zMapInit() */ +ZMapCallbacksStruct zmap_cbs_G = {zmapDestroyedCB} ; + + + ZMapManager zMapManagerCreate(zmapAppCallbackFunc zmap_deleted_func, void *gui_data) { ZMapManager manager ; @@ -49,6 +56,8 @@ ZMapManager zMapManagerCreate(zmapAppCallbackFunc zmap_deleted_func, void *gui_d manager->gui_zmap_deleted_func = zmap_deleted_func ; manager->gui_data = gui_data ; + zMapInit(&zmap_cbs_G) ; + return manager ; } @@ -61,7 +70,7 @@ gboolean zMapManagerAdd(ZMapManager zmaps, char *sequence, ZMap *zmap_out) ZMap zmap = NULL ; ZMapView view = NULL ; - if ((zmap = zMapCreate((void *)zmaps, zmapDestroyedCB))) + if ((zmap = zMapCreate((void *)zmaps))) { zmaps->zmap_list = g_list_append(zmaps->zmap_list, zmap) ; *zmap_out = zmap ;