Skip to content
Snippets Groups Projects
Commit d7bd8666 authored by rds's avatar rds
Browse files

fix inheritance when reading from file

parent 6203e842
No related branches found
No related tags found
No related merge requests found
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
* Exported functions: See ZMap/zmapConfigLoader.h * Exported functions: See ZMap/zmapConfigLoader.h
* *
* HISTORY: * HISTORY:
* Last edited: Apr 27 11:41 2009 (edgrif) * Last edited: Jun 26 15:46 2009 (rds)
* Created: Thu Sep 25 14:12:05 2008 (rds) * Created: Thu Sep 25 14:12:05 2008 (rds)
* CVS info: $Id: zmapConfigLoader.c,v 1.8 2009-04-28 14:31:05 edgrif Exp $ * CVS info: $Id: zmapConfigLoader.c,v 1.9 2009-06-30 21:28:12 rds Exp $
*------------------------------------------------------------------- *-------------------------------------------------------------------
*/ */
...@@ -257,7 +257,7 @@ static gpointer create_config_style() ...@@ -257,7 +257,7 @@ static gpointer create_config_style()
{ {
{ ZMAPSTYLE_PROPERTY_NAME, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_NONE, {NULL} }, { ZMAPSTYLE_PROPERTY_NAME, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_NONE, {NULL} },
{ ZMAPSTYLE_PROPERTY_DESCRIPTION, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_NONE, {NULL} }, { ZMAPSTYLE_PROPERTY_DESCRIPTION, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_NONE, {NULL} },
{ ZMAPSTYLE_PROPERTY_PARENT_STYLE, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_NONE, {NULL} }, { ZMAPSTYLE_PROPERTY_PARENT_STYLE, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_STR2ENUM, {(ZMapConfStr2EnumFunc)zMapStyleCreateID} },
{ ZMAPSTYLE_PROPERTY_MODE, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_STR2ENUM, {(ZMapConfStr2EnumFunc)zMapStyleStr2Mode} }, { ZMAPSTYLE_PROPERTY_MODE, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_STR2ENUM, {(ZMapConfStr2EnumFunc)zMapStyleStr2Mode} },
{ ZMAPSTYLE_PROPERTY_COLOURS, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_STR2COLOUR, {NULL} }, { ZMAPSTYLE_PROPERTY_COLOURS, FALSE, ZMAPCONF_STR, {FALSE}, ZMAPCONV_STR2COLOUR, {NULL} },
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment