*** attr.c.orig Mon Sep 13 11:41:12 1999 --- attr.c Mon Sep 13 11:41:12 1999 *************** *** 1478,1482 **** MiniLinesInfo *minilines=(&attr_ptr1->obj->detail.t->minilines); ! tmp_buf = ConvertMiniLineToString(minilines->first, &need_to_free_tmp_buf); --- 1478,1482 ---- MiniLinesInfo *minilines=(&attr_ptr1->obj->detail.t->minilines); ! tmp_buf = ConvertAttrNameFirstMiniLineToString(attr_ptr1, &need_to_free_tmp_buf); *** drawing.c.orig Mon Sep 13 11:41:14 1999 --- drawing.c Mon Sep 13 11:41:14 1999 *************** *** 2628,2632 **** char *tmp_buf=NULL, *psz=NULL; ! tmp_buf = ConvertMiniLineToString(pMiniLine, &need_to_free_tmp_buf); psz = strchr(tmp_buf, '='); fprintf(fp, "%s\n", &psz[1]); --- 2628,2633 ---- char *tmp_buf=NULL, *psz=NULL; ! tmp_buf = ConvertAttrNameFirstMiniLineToString(attr_ptr, ! &need_to_free_tmp_buf); psz = strchr(tmp_buf, '='); fprintf(fp, "%s\n", &psz[1]); *** miniline.c.orig Mon Sep 13 11:41:16 1999 --- miniline.c Mon Sep 13 11:41:16 1999 *************** *** 5348,5349 **** --- 5348,5373 ---- } + /* ----------------- ConvertAttrNameFirstMiniLineToString() ----------------- */ + + char *ConvertAttrNameFirstMiniLineToString(attr_ptr, pnNeedToFree) + struct AttrRec *attr_ptr; + int *pnNeedToFree; /* must not be NULL */ + /* must free the returned string with UtilFree() */ + { + char *tmp_buf=NULL; + + tmp_buf = ConvertMiniLineToString(attr_ptr->obj->detail.t->minilines.first, + pnNeedToFree); + if (*attr_ptr->attr_name.s != '\0' && !attr_ptr->nameshown) { + char *psz=(char*)malloc(sizeof(char) * + (attr_ptr->attr_name.sz+strlen(tmp_buf))); + + if (psz == NULL) FailAllocMessage(); + sprintf(psz, "%s%s", attr_ptr->attr_name.s, tmp_buf); + if (*pnNeedToFree) UtilFree(tmp_buf); + tmp_buf = psz; + *pnNeedToFree = TRUE; + } + return tmp_buf; + } + *** miniline.e.orig Mon Sep 13 11:41:20 1999 --- miniline.e Mon Sep 13 11:41:20 1999 *************** *** 258,261 **** --- 258,263 ---- extern char *ConvertMiniLineToString ARGS_DECL((MiniLineInfo*, int *pnNeedToFree)); + extern char *ConvertAttrNameFirstMiniLineToString ARGS_DECL(( + struct AttrRec *, int *pnNeedToFree)); #ifdef _INCLUDE_FROM_MINILINE_C_ *** patchlvl.h.orig Mon Sep 13 11:41:21 1999 --- patchlvl.h Mon Sep 13 11:41:21 1999 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 18 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 19 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig Mon Sep 13 11:41:22 1999 --- Imakefile Mon Sep 13 11:41:22 1999 *************** *** 53,57 **** $(MOREDEFINES) ! TGIFVERSION = 4.1.18 XCOMM Things to try to add to the DEFINES line above: --- 53,57 ---- $(MOREDEFINES) ! TGIFVERSION = 4.1.19 XCOMM Things to try to add to the DEFINES line above: *** HISTORY.orig Mon Sep 13 11:41:23 1999 --- HISTORY Mon Sep 13 11:41:24 1999 *************** *** 1,2 **** --- 1,7 ---- + -----------------------> tgif-4.1.18 => tgif-4.1.19 <----------------------- + 1) Fix a crashing bug with the "Edit Attribute In Editor" context menu when + selected attribute has it's name not shown. Thanks to Mohammad Bahathir + Hashim for pointing out the problem. + -----------------------> tgif-4.1.17 => tgif-4.1.18 <----------------------- 1) Fix a crashing bug with PreciseScaleEverything().