Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 8242) +++ trunk/src_plugins/acompnet/acompnet.c (revision 8243) @@ -102,7 +102,9 @@ PCB_REGISTER_ACTIONS(acompnet_action_list, acompnet_cookie) -static void hid_acompnet_uninit(void) +int pplg_check_ver_acompnet(int ver_needed) { return 0; } + +void pplg_uninit_acompnet(void) { pcb_hid_remove_actions_by_cookie(acompnet_cookie); pcb_uilayer_free_all_cookie(acompnet_cookie); @@ -109,10 +111,10 @@ } #include "dolists.h" -pcb_uninit_t hid_acompnet_init(void) +int pplg_init_acompnet(void) { PCB_REGISTER_ACTIONS(acompnet_action_list, acompnet_cookie) ly = pcb_uilayer_alloc(acompnet_cookie, "autocomp-net", "#c09920"); - return hid_acompnet_uninit; + return 0; } Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 8242) +++ trunk/src_plugins/autocrop/autocrop.c (revision 8243) @@ -233,14 +233,16 @@ PCB_REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie) -static void hid_autocrop_uninit(void) +int pplg_check_ver_autocrop(int ver_needed) { return 0; } + +void pplg_uninit_autocrop(void) { pcb_hid_remove_actions_by_cookie(autocrop_cookie); } #include "dolists.h" -pcb_uninit_t hid_autocrop_init() +int pplg_init_autocrop(void) { PCB_REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie); - return hid_autocrop_uninit; + return 0; } Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 8242) +++ trunk/src_plugins/autoplace/action.c (revision 8243) @@ -64,14 +64,16 @@ PCB_REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie) -static void hid_autoplace_uninit(void) +int pplg_check_ver_autoplace(int ver_needed) { return 0; } + +void pplg_uninit_autoplace(void) { pcb_hid_remove_actions_by_cookie(autoplace_cookie); } #include "dolists.h" -pcb_uninit_t hid_autoplace_init(void) +int pplg_init_autoplace(void) { PCB_REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie) - return hid_autoplace_uninit; + return 0; } Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 8242) +++ trunk/src_plugins/autoroute/action.c (revision 8243) @@ -89,14 +89,16 @@ PCB_REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie) -static void hid_autoroute_uninit(void) +int pplg_check_ver_autoroute(int ver_needed) { return 0; } + +void pplg_uninit_autoroute(void) { pcb_hid_remove_actions_by_cookie(autoroute_cookie); } #include "dolists.h" -pcb_uninit_t hid_autoroute_init(void) +int pplg_init_autoroute(void) { PCB_REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie) - return hid_autoroute_uninit; + return 0; } Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 8242) +++ trunk/src_plugins/boardflip/boardflip.c (revision 8243) @@ -260,15 +260,17 @@ PCB_REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie) -static void hid_boardflip_uninit(void) +int pplg_check_ver_boardflip(int ver_needed) { return 0; } + +void pplg_uninit_boardflip(void) { pcb_hid_remove_actions_by_cookie(boardflip_cookie); } #include "dolists.h" -pcb_uninit_t hid_boardflip_init() +int pplg_init_boardflip(void) { PCB_REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie); - return hid_boardflip_uninit; + return 0; } Index: trunk/src_plugins/dbus/dbus.c =================================================================== --- trunk/src_plugins/dbus/dbus.c (revision 8242) +++ trunk/src_plugins/dbus/dbus.c (revision 8243) @@ -373,7 +373,9 @@ pcb_dbus_setup(); } -static void hid_dbus_uninit(void) +int pplg_check_ver_dbus(int ver_needed) { return 0; } + +void pplg_uninit_dbus(void) { pcb_dbus_finish(); pcb_event_unbind_allcookie(dbus_cookie); @@ -381,9 +383,9 @@ } #include "dolists.h" -pcb_uninit_t hid_dbus_init(void) +int pplg_init_dbus(void) { /* PCB_REGISTER_ACTIONS(debug_action_list, dbus_cookie)*/ pcb_event_bind(PCB_EVENT_GUI_INIT, dbus_gui_init, NULL, dbus_cookie); - return hid_dbus_uninit; + return 0; } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 8242) +++ trunk/src_plugins/diag/diag.c (revision 8243) @@ -247,14 +247,16 @@ PCB_REGISTER_ACTIONS(diag_action_list, diag_cookie) -static void hid_diag_uninit(void) +int pplg_check_ver_diag(int ver_needed) { return 0; } + +void pplg_uninit_diag(void) { pcb_hid_remove_actions_by_cookie(diag_cookie); } #include "dolists.h" -pcb_uninit_t hid_diag_init(void) +int pplg_init_diag(void) { PCB_REGISTER_ACTIONS(diag_action_list, diag_cookie) - return hid_diag_uninit; + return 0; } Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 8242) +++ trunk/src_plugins/distalign/distalign.c (revision 8243) @@ -627,16 +627,18 @@ PCB_REGISTER_ACTIONS(distalign_action_list, distalign_cookie) -static void hid_distalign_uninit(void) +int pplg_check_ver_distalign(int ver_needed) { return 0; } + +void pplg_uninit_distalign(void) { pcb_hid_remove_actions_by_cookie(distalign_cookie); } #include "dolists.h" -pcb_uninit_t hid_distalign_init() +int pplg_init_distalign(void) { PCB_REGISTER_ACTIONS(distalign_action_list, distalign_cookie); - return hid_distalign_uninit; + return 0; } Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 8242) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 8243) @@ -624,14 +624,16 @@ PCB_REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie) -static void hid_distaligntext_uninit(void) +int pplg_check_ver_distaligntext(int ver_needed) { return 0; } + +void pplg_uninit_distaligntext(void) { pcb_hid_remove_actions_by_cookie(distaligntext_cookie); } #include "dolists.h" -pcb_uninit_t hid_distaligntext_init() +int pplg_init_distaligntext(void) { PCB_REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie); - return hid_distaligntext_uninit; + return 0; } Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 8242) +++ trunk/src_plugins/djopt/djopt.c (revision 8243) @@ -2696,7 +2696,9 @@ PCB_REGISTER_ACTIONS(djopt_action_list, djopt_cookie) -static void hid_djopt_uninit(void) +int pplg_check_ver_djopt(int ver_needed) { return 0; } + +void pplg_uninit_djopt(void) { pcb_hid_remove_actions_by_cookie(djopt_cookie); conf_unreg_fields("plugins/djopt/"); @@ -2703,7 +2705,7 @@ } #include "dolists.h" -pcb_uninit_t hid_djopt_init(void) +int pplg_init_djopt(void) { #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_djopt, field,isarray,type_name,cpath,cname,desc,flags); @@ -2710,5 +2712,5 @@ #include "djopt_conf_fields.h" PCB_REGISTER_ACTIONS(djopt_action_list, djopt_cookie) - return hid_djopt_uninit; + return 0; } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 8242) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 8243) @@ -649,7 +649,9 @@ PCB_REGISTER_ACTIONS(draw_csect_action_list, draw_csect_cookie) -static void hid_draw_csect_uninit(void) +int pplg_check_ver_draw_csect(int ver_needed) { return 0; } + +void pplg_uninit_draw_csect(void) { pcb_hid_remove_actions_by_cookie(draw_csect_cookie); } @@ -656,7 +658,7 @@ #include "dolists.h" -pcb_uninit_t hid_draw_csect_init(void) +int pplg_init_draw_csect(void) { PCB_REGISTER_ACTIONS(draw_csect_action_list, draw_csect_cookie) @@ -663,5 +665,5 @@ pcb_stub_draw_csect = draw_csect; pcb_stub_draw_csect_mouse_ev = mouse_csect; - return hid_draw_csect_uninit; + return 0; } Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 8242) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 8243) @@ -295,11 +295,13 @@ text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Title: %s - Fabrication Drawing", PCB_UNKNOWN(PCB->Name)); } -static void hid_draw_fab_uninit(void) +int pplg_check_ver_draw_fab(int ver_needed) { return 0; } + +void pplg_uninit_draw_fab(void) { } -pcb_uninit_t hid_draw_fab_init(void) +int pplg_init_draw_fab(void) { pcb_stub_draw_fab = DrawFab; pcb_stub_draw_fab_overhang = DrawFab_overhang; @@ -309,5 +311,5 @@ #include "draw_fab_conf_fields.h" - return hid_draw_fab_uninit; + return 0; } Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 8242) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 8243) @@ -233,11 +233,13 @@ return 0; } -static void hid_draw_fontsel_uninit(void) +int pplg_check_ver_draw_fontsel(int ver_needed) { return 0; } + +void pplg_uninit_draw_fontsel(void) { } -pcb_uninit_t hid_draw_fontsel_init(void) +int pplg_init_draw_fontsel(void) { pcb_stub_draw_fontsel = pcb_draw_fontsel; pcb_stub_draw_fontsel_mouse_ev = pcb_mouse_fontsel; @@ -245,5 +247,5 @@ pcb_stub_draw_fontsel_layer_obj = &fontsel_layer; pcb_stub_draw_fontsel_text_type = &fontsel_txt_type; - return hid_draw_fontsel_uninit; + return 0; } Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 8242) +++ trunk/src_plugins/export_bboard/bboard.c (revision 8243) @@ -573,13 +573,15 @@ static pcb_hid_t bboard_hid; -void hid_export_bboard_uninit() +int pplg_check_ver_export_bboard(int ver_needed) { return 0; } + +void pplg_uninit_export_bboard(void) { pcb_hid_remove_attributes_by_cookie(bboard_cookie); } -pcb_uninit_t hid_export_bboard_init() +int pplg_init_export_bboard(void) { memset(&bboard_hid, 0, sizeof(bboard_hid)); @@ -598,6 +600,6 @@ pcb_hid_register_hid(&bboard_hid); pcb_hid_register_attributes(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0); - return hid_export_bboard_uninit; + return 0; } Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 8242) +++ trunk/src_plugins/export_bom/bom.c (revision 8243) @@ -303,8 +303,14 @@ pcb_hid_t bom_hid; -pcb_uninit_t hid_export_bom_init() +int pplg_check_ver_export_bom(int ver_needed) { return 0; } + +void pplg_uninit_export_bom(void) { +} + +int pplg_init_export_bom(void) +{ memset(&bom_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&bom_hid); @@ -321,5 +327,5 @@ bom_hid.usage = bom_usage; pcb_hid_register_hid(&bom_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 8242) +++ trunk/src_plugins/export_dsn/dsn.c (revision 8243) @@ -577,13 +577,15 @@ pcb_hid_parse_command_line(argc, argv); } -static void hid_dsn_uninit() +int pplg_check_ver_export_dsn(int ver_needed) { return 0; } + +void pplg_uninit_export_dsn(void) { pcb_hid_remove_attributes_by_cookie(dsn_cookie); } #include "dolists.h" -pcb_uninit_t hid_export_dsn_init() +int pplg_init_export_dsn(void) { memset(&dsn_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&dsn_hid); @@ -598,6 +600,6 @@ pcb_hid_register_hid(&dsn_hid); pcb_hid_register_attributes(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); - return hid_dsn_uninit; + return 0; } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 8242) +++ trunk/src_plugins/export_dxf/dxf.c (revision 8243) @@ -5909,7 +5909,9 @@ const char *dxf_cookie = "dxf exporter"; -void hid_export_dxf_uninit() +int pplg_check_ver_export_dxf(int ver_needed) { return 0; } + +void pplg_uninit_export_dxf(void) { pcb_hid_remove_attributes_by_cookie(dxf_cookie); } @@ -5920,7 +5922,7 @@ * Initialise and register the DXF HID. * No other HID calls are valid until this is called. */ -pcb_uninit_t hid_export_dxf_init() +int pplg_init_export_dxf(void) { memset(&dxf_hid, 0, sizeof(pcb_hid_t)); @@ -5960,7 +5962,7 @@ pcb_hid_register_attributes(dxf_options, sizeof(dxf_options) / sizeof(dxf_options[0]), dxf_cookie, 0); - return hid_export_dxf_uninit; + return 0; } Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 8242) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 8243) @@ -333,8 +333,14 @@ #include "dolists.h" -pcb_uninit_t hid_export_fidocadj_init() +int pplg_check_ver_export_fidocadj(int ver_needed) { return 0; } + +void pplg_uninit_export_fidocadj(void) { +} + +int pplg_init_export_fidocadj(void) +{ memset(&fidocadj_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&fidocadj_hid); @@ -353,5 +359,5 @@ pcb_hid_register_hid(&fidocadj_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 8242) +++ trunk/src_plugins/export_gcode/gcode.c (revision 8243) @@ -879,8 +879,14 @@ pcb_hid_t gcode_hid; -pcb_uninit_t hid_export_gcode_init() +int pplg_check_ver_export_gcode(int ver_needed) { return 0; } + +void pplg_uninit_export_gcode(void) { +} + +int pplg_init_export_gcode(void) +{ memset(&gcode_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&gcode_hid); @@ -917,5 +923,5 @@ pcb_hid_register_hid(&gcode_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 8242) +++ trunk/src_plugins/export_gerber/gerber.c (revision 8243) @@ -1207,8 +1207,14 @@ { } -pcb_uninit_t hid_export_gerber_init() +int pplg_check_ver_export_gerber(int ver_needed) { return 0; } + +void pplg_uninit_export_gerber(void) { +} + +int pplg_init_export_gerber(void) +{ memset(&gerber_hid, 0, sizeof(gerber_hid)); pcb_hid_nogui_init(&gerber_hid); @@ -1241,5 +1247,5 @@ gerber_hid.usage = gerber_usage; pcb_hid_register_hid(&gerber_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 8242) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 8243) @@ -603,12 +603,14 @@ pcb_hid_t IPCD356_hid; -void hid_export_ipcd356_uninit() +int pplg_check_ver_export_ipcd356(int ver_needed) { return 0; } + +void pplg_uninit_export_ipcd356(void) { pcb_hid_remove_attributes_by_cookie(ipcd356_cookie); } -pcb_uninit_t *hid_export_ipcd356_init() +int pplg_init_export_ipcd356(void) { memset(&IPCD356_hid, 0, sizeof(pcb_hid_t)); @@ -626,5 +628,5 @@ pcb_hid_register_hid(&IPCD356_hid); pcb_hid_register_attributes(IPCD356_options, sizeof(IPCD356_options) / sizeof(IPCD356_options[0]), ipcd356_cookie, 0); - return hid_export_ipcd356_uninit; + return 0; } Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 8242) +++ trunk/src_plugins/export_lpr/lpr.c (revision 8243) @@ -123,8 +123,14 @@ pcb_hid_remove_actions_by_cookie(lpr_cookie); } -pcb_uninit_t hid_export_lpr_init() +int pplg_check_ver_export_lpr(int ver_needed) { return 0; } + +void pplg_uninit_export_lpr(void) { +} + +int pplg_init_export_lpr(void) +{ memset(&lpr_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&lpr_hid); @@ -145,5 +151,5 @@ pcb_hid_register_hid(&lpr_hid); - return plugin_lpr_uninit; + return 0; } Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 8242) +++ trunk/src_plugins/export_nelma/nelma.c (revision 8243) @@ -963,8 +963,14 @@ #include "dolists.h" -pcb_uninit_t hid_export_nelma_init() +int pplg_check_ver_export_nelma(int ver_needed) { return 0; } + +int pplg_uninit_export_nelma(void) { +} + +int pplg_init_export_nelma(void) +{ memset(&nelma_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&nelma_hid); @@ -1000,5 +1006,5 @@ nelma_hid.usage = nelma_usage; pcb_hid_register_hid(&nelma_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 8242) +++ trunk/src_plugins/export_openscad/scad.c (revision 8243) @@ -1127,12 +1127,14 @@ static pcb_hid_t scad_hid; -void hid_export_openscad_uninit() +int pplg_check_ver_export_openscad(int ver_needed) { return 0; } + +void pplg_uninit_export_openscad(void) { pcb_hid_remove_attributes_by_cookie(openscad_cookie); } -pcb_uninit_t hid_export_openscad_init() +int pplg_init_export_openscad(void) { memset(&scad_hid, 0, sizeof(scad_hid)); @@ -1169,5 +1171,5 @@ pcb_hid_register_hid(&scad_hid); pcb_hid_register_attributes(scad_options, sizeof(scad_options) / sizeof(scad_options[0]), openscad_cookie, 0); - return hid_export_openscad_uninit; + return 0; } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 8242) +++ trunk/src_plugins/export_png/png.c (revision 8243) @@ -1486,8 +1486,14 @@ #include "dolists.h" -pcb_uninit_t hid_export_png_init() +int pplg_check_ver_export_png(int ver_needed) { return 0; } + +void pplg_uninit_export_png(void) { +} + +int pplg_init_export_png(void) +{ memset(&png_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&png_hid); @@ -1525,5 +1531,5 @@ pcb_hid_register_hid(&png_hid); #endif - return NULL; + return 0; } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 8242) +++ trunk/src_plugins/export_ps/ps.c (revision 8243) @@ -1609,8 +1609,14 @@ } -pcb_uninit_t hid_export_ps_init() +int pplg_check_ver_export_ps(int ver_needed) { return 0; } + +void pplg_uninit_export_ps(void) { +} + +int pplg_init_export_ps(void) +{ memset(&ps_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&ps_hid); @@ -1628,5 +1634,5 @@ pcb_hid_register_hid(&ps_hid); hid_eps_init(); - return plugin_ps_uninit; + return 0; } Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 8242) +++ trunk/src_plugins/export_stat/stat.c (revision 8243) @@ -327,8 +327,14 @@ #include "dolists.h" -pcb_uninit_t hid_export_stat_init() +int pplg_check_ver_export_stat(int ver_needed) { return 0; } + +void pplg_uninit_export_stat(void) { +} + +int pplg_init_export_stat(void) +{ memset(&stat_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&stat_hid); @@ -347,5 +353,5 @@ pcb_hid_register_hid(&stat_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 8242) +++ trunk/src_plugins/export_svg/svg.c (revision 8243) @@ -701,8 +701,14 @@ #include "dolists.h" -pcb_uninit_t hid_export_svg_init() +int pplg_check_ver_export_svg(int ver_needed) { return 0; } + +void pplg_uninit_export_svg(void) { +} + +int pplg_init_export_svg(void) +{ memset(&svg_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&svg_hid); @@ -739,5 +745,5 @@ pcb_hid_register_hid(&svg_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 8242) +++ trunk/src_plugins/export_test/export_test.c (revision 8243) @@ -330,8 +330,14 @@ pcb_hid_t export_test_hid; -pcb_uninit_t hid_export_test_init() +int pplg_check_ver_export_test(int ver_needed) { return 0; } + +void pplg_uninit_export_test(void) { +} + +int pplg_init_export_test(void) +{ memset(&export_test_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&export_test_hid); @@ -348,5 +354,5 @@ export_test_hid.usage = export_test_usage; pcb_hid_register_hid(&export_test_hid); - return NULL; + return 0; } Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 8242) +++ trunk/src_plugins/export_xy/xy.c (revision 8243) @@ -364,8 +364,14 @@ pcb_hid_t xy_hid; -pcb_uninit_t hid_export_xy_init() +int pplg_check_ver_export_xy(int ver_needed) { return 0; } + +void pplg_uninit_export_xy(void) { +} + +int pplg_init_export_xy(void) +{ memset(&xy_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&xy_hid); @@ -382,5 +388,5 @@ xy_hid.usage = xy_usage; pcb_hid_register_hid(&xy_hid); - return NULL; + return 0; } Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 8242) +++ trunk/src_plugins/fontmode/fontmode.c (revision 8243) @@ -368,14 +368,16 @@ PCB_REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie) -static void hid_fontmode_uninit(void) +int pplg_check_ver_fontmode(int ver_needed) { return 0; } + +void pplg_uninit_fontmode(void) { pcb_hid_remove_actions_by_cookie(fontmode_cookie); } #include "dolists.h" -pcb_uninit_t hid_fontmode_init(void) +int pplg_init_fontmode(void) { PCB_REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie) - return hid_fontmode_uninit; + return 0; } Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 8242) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 8243) @@ -506,12 +506,14 @@ static pcb_plug_fp_t fp_fs; -void hid_fp_fs_uninit(void) +int pplg_check_ver_fp_fs(int ver_needed) { return 0; } + +void pplg_uninit_fp_fs(void) { PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs); } -pcb_uninit_t hid_fp_fs_init(void) +int pplg_init_fp_fs(void) { fp_fs.plugin_data = NULL; fp_fs.load_dir = fp_fs_load_dir; @@ -518,5 +520,5 @@ fp_fs.fopen = fp_fs_fopen; fp_fs.fclose = fp_fs_fclose; PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs); - return hid_fp_fs_uninit; + return 0; } Index: trunk/src_plugins/fp_wget/fp_wget.c =================================================================== --- trunk/src_plugins/fp_wget/fp_wget.c (revision 8242) +++ trunk/src_plugins/fp_wget/fp_wget.c (revision 8243) @@ -6,12 +6,14 @@ conf_fp_wget_t conf_fp_wget; -void hid_fp_wget_uninit(void) +int pplg_check_ver_fp_wget(int ver_needed) { return 0; } + +void pplg_uninit_fp_wget(void) { fp_gedasymbols_uninit(); } -pcb_uninit_t hid_fp_wget_init(void) +int pplg_init_fp_wget(void) { #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags); @@ -19,5 +21,5 @@ fp_gedasymbols_init(); fp_edakrill_init(); - return hid_fp_wget_uninit; + return 0; } Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 8242) +++ trunk/src_plugins/hid_batch/batch.c (revision 8243) @@ -40,7 +40,7 @@ static char *prompt = NULL; -static void hid_batch_uninit(void) +static void uninit_batch(void) { pcb_hid_remove_actions_by_cookie(batch_cookie); pcb_event_unbind_allcookie(batch_cookie); @@ -128,7 +128,7 @@ fflush(stdout); } if (fgets(line, sizeof(line) - 1, stdin) == NULL) { - hid_batch_uninit(); + uninit_batch(); return; } pcb_hid_parse_command(line); @@ -320,9 +320,14 @@ static pcb_hid_t batch_hid; +int pplg_check_ver_hid_batch(int ver_needed) { return 0; } -pcb_uninit_t hid_hid_batch_init() +void pplg_uninit_hid_batch(void) { +} + +int pplg_init_hid_batch(void) +{ memset(&batch_hid, 0, sizeof(pcb_hid_t)); pcb_hid_nogui_init(&batch_hid); @@ -378,7 +383,7 @@ pcb_event_bind(PCB_EVENT_BOARD_CHANGED, ev_pcb_changed, NULL, batch_cookie); pcb_hid_register_hid(&batch_hid); - return hid_batch_uninit; + return 0; } static void batch_begin(void) Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c (revision 8242) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c (revision 8243) @@ -33,7 +33,9 @@ gtkhid_parse_arguments(argc, argv); } -static void hid_hid_gtk2_gdk_uninit() +int pplg_check_ver_hid_gtk2_gdk(int ver_needed) { return 0; } + +void pplg_uninit_hid_gtk2_gdk(void) { pcb_event_unbind_allcookie(ghid_cookie); conf_hid_unreg(ghid_cookie); @@ -40,7 +42,7 @@ conf_hid_unreg(ghid_menu_cookie); } -pcb_uninit_t hid_hid_gtk2_gdk_init() +int pplg_init_hid_gtk2_gdk(void) { ghid_win32_init(); @@ -61,5 +63,5 @@ glue_event_init(ghid_cookie); - return hid_hid_gtk2_gdk_uninit; + return 0; } Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 8242) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 8243) @@ -33,7 +33,9 @@ gtkhid_parse_arguments(argc, argv); } -static void hid_hid_gtk2_gl_uninit() +int pplg_check_ver_gtk2_gl(int ver_needed) { return 0; } + +void pplg_uninit_hid_gtk2_gl(void) { pcb_event_unbind_allcookie(ghid_gl_cookie); conf_hid_unreg(ghid_gl_cookie); @@ -40,7 +42,7 @@ conf_hid_unreg(ghid_gl_menu_cookie); } -pcb_uninit_t hid_hid_gtk2_gl_init() +int pplg_init_hid_gtk2_gl(void) { ghid_win32_init(); @@ -61,5 +63,5 @@ glue_event_init(ghid_gl_cookie); - return hid_hid_gtk2_gl_uninit; + return 0; } Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/gtkhid-main.c (revision 8242) +++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-main.c (revision 8243) @@ -33,7 +33,9 @@ gtkhid_parse_arguments(argc, argv); } -static void hid_hid_gtk3_cairo_uninit() +int pplg_check_ver_gtk3_cairo(int ver_needed) { return 0; } + +void pplg_uninit_hid_gtk3_cairo(void) { pcb_event_unbind_allcookie(ghid_cairo_cookie); conf_hid_unreg(ghid_cairo_cookie); @@ -40,7 +42,7 @@ conf_hid_unreg(ghid_cairo_menu_cookie); } -pcb_uninit_t hid_hid_gtk3_cairo_init() +int pplg_init_hid_gtk3_cairo(void) { ghid_win32_init(); @@ -61,5 +63,5 @@ glue_event_init(ghid_cairo_cookie); - return hid_hid_gtk3_cairo_uninit; + return 0; } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 8242) +++ trunk/src_plugins/hid_lesstif/main.c (revision 8243) @@ -3708,12 +3708,14 @@ void lesstif_create_menu(const char *menu, const char *action, const char *mnemonic, const char *accel, const char *tip, const char *cookie); -static void hid_lesstif_uninit(void) +int pplg_check_ver_hid_lesstif(int version_we_need) { return 0; } + +void pplg_uninit_hid_lesstif(void) { pcb_event_unbind_allcookie(lesstif_cookie); } -pcb_uninit_t hid_hid_lesstif_init() +int pplg_init_hid_lesstif(void) { memset(&lesstif_hid, 0, sizeof(pcb_hid_t)); @@ -3795,7 +3797,7 @@ pcb_hid_register_hid(&lesstif_hid); - return hid_lesstif_uninit; + return 0; } Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 8242) +++ trunk/src_plugins/hid_remote/remote.c (revision 8243) @@ -403,13 +403,15 @@ #include "dolists.h" -static void hid_hid_remote_uninit() +int pplg_check_ver_remote(int ver_needed) { return 0; } + +void pplg_uninit_hid_remote(void) { pcb_hid_remove_actions_by_cookie(remote_cookie); pcb_event_unbind_allcookie(remote_cookie); } -pcb_uninit_t hid_hid_remote_init() +int pplg_init_hid_remote(void) { memset(&remote_hid, 0, sizeof(pcb_hid_t)); @@ -469,5 +471,5 @@ pcb_event_bind(PCB_EVENT_BOARD_CHANGED, ev_pcb_changed, NULL, remote_cookie); - return hid_hid_remote_uninit; + return 0; } Index: trunk/src_plugins/hid_srv_ws/server.c =================================================================== --- trunk/src_plugins/hid_srv_ws/server.c (revision 8242) +++ trunk/src_plugins/hid_srv_ws/server.c (revision 8243) @@ -28,13 +28,20 @@ #include "plugins.h" -extern pcb_uninit_t hid_hid_remote_init(); +int pplg_check_ver_hid_srv_ws(int ver_needed) { return 0; } + +extern int pplg_init_hid_remote(void); extern void pcb_set_hid_name(const char *new_hid_name); -pcb_uninit_t hid_hid_srv_ws_init() + +void pplg_init_hid_srv_ws(void) { +} + +int pplg_init_hid_srv_ws(void) +{ printf("WS: waiting for connections\n"); pcb_set_hid_name("remote"); - return hid_hid_remote_init(); + return 0; } Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 8242) +++ trunk/src_plugins/import_dsn/dsn.c (revision 8243) @@ -298,7 +298,9 @@ PCB_REGISTER_ACTIONS(dsn_action_list, dsn_cookie) -static void hid_dsn_uninit() +int pplg_check_ver_import_dsn(int ver_needed) { return 0; } + +void pplg_uninit_import_dsn(void) { pcb_hid_remove_actions_by_cookie(dsn_cookie); @@ -305,9 +307,9 @@ } #include "dolists.h" -pcb_uninit_t hid_import_dsn_init() +int pplg_init_import_dsn(void) { PCB_REGISTER_ACTIONS(dsn_action_list, dsn_cookie) - return hid_dsn_uninit; + return 0; } Index: trunk/src_plugins/import_edif/import_edif.c =================================================================== --- trunk/src_plugins/import_edif/import_edif.c (revision 8242) +++ trunk/src_plugins/import_edif/import_edif.c (revision 8243) @@ -73,11 +73,13 @@ return ret; } -static void hid_import_edif_uninit(void) +int pplg_check_ver_import_edif(int ver_needed) { return 0; } + +void pplg_uninit_import_edif(void) { } -pcb_uninit_t hid_import_edif_init(void) +int pplg_init_import_edif(void) { /* register the IO hook */ @@ -88,6 +90,6 @@ PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_edif); - return hid_import_edif_uninit; + return 0; } Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 8242) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 8243) @@ -310,14 +310,16 @@ PCB_REGISTER_ACTIONS(ltspice_action_list, ltspice_cookie) -static void hid_ltspice_uninit() +int pplg_check_ver_import_ltspice(int ver_needed) { return 0; } + +void pplg_uninit_import_ltspice(void) { pcb_hid_remove_actions_by_cookie(ltspice_cookie); } #include "dolists.h" -pcb_uninit_t hid_import_ltspice_init() +int pplg_init_import_ltspice(void) { PCB_REGISTER_ACTIONS(ltspice_action_list, ltspice_cookie) - return hid_ltspice_uninit; + return 0; } Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 8242) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 8243) @@ -279,7 +279,9 @@ PCB_REGISTER_ACTIONS(mentor_sch_action_list, mentor_sch_cookie) -static void hid_mentor_sch_uninit() +int pplg_check_ver_import_mentor_sch(int ver_needed) { return 0; } + +void pplg_uninit_import_mentor_sch(void) { pcb_hid_remove_actions_by_cookie(mentor_sch_cookie); conf_unreg_fields("plugins/import_mentor_sch/"); @@ -286,7 +288,7 @@ } #include "dolists.h" -pcb_uninit_t hid_import_mentor_sch_init() +int pplg_init_import_mentor_sch(void) { #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ @@ -294,5 +296,5 @@ #include "mentor_sch_conf_fields.h" PCB_REGISTER_ACTIONS(mentor_sch_action_list, mentor_sch_cookie) - return hid_mentor_sch_uninit; + return 0; } Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 8242) +++ trunk/src_plugins/import_mucs/mucs.c (revision 8243) @@ -147,14 +147,16 @@ PCB_REGISTER_ACTIONS(mucs_action_list, mucs_cookie) -static void hid_mucs_uninit() +int pplg_check_ver_import_mucs(int ver_needed) { return 0; } + +void pplg_uninit_import_mucs(void) { pcb_hid_remove_actions_by_cookie(mucs_cookie); } #include "dolists.h" -pcb_uninit_t hid_import_mucs_init() +int pplg_init_import_mucs(void) { PCB_REGISTER_ACTIONS(mucs_action_list, mucs_cookie) - return hid_mucs_uninit; + return 0; } Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 8242) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 8243) @@ -173,11 +173,13 @@ return ReadNetlist(fn); } -static void hid_import_netlist_uninit(void) +int pplg_check_ver_import_netlist(int ver_needed) { return 0; } + +void pplg_uninit_import_netlist(void) { } -pcb_uninit_t hid_import_netlist_init(void) +int pplg_init_import_netlist(void) { /* register the IO hook */ @@ -188,6 +190,6 @@ PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_netlist); - return hid_import_netlist_uninit; + return 0; } Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 8242) +++ trunk/src_plugins/import_sch/import_sch.c (revision 8243) @@ -456,7 +456,9 @@ PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) -static void hid_import_sch_uninit(void) +int pplg_check_ver_import_sch(int ver_needed) { return 0; } + +void pplg_uninit_import_sch(void) { pcb_hid_remove_actions_by_cookie(import_sch_cookie); conf_unreg_fields("plugins/import_sch/"); @@ -463,7 +465,7 @@ } #include "dolists.h" -pcb_uninit_t hid_import_sch_init(void) +int pplg_init_import_sch(void) { char *tmp; @@ -481,5 +483,5 @@ if (tmp != NULL) conf_set(CFR_ENV, "plugins/import_sch/gnetlist_program", -1, tmp, POL_OVERWRITE); - return hid_import_sch_uninit; + return 0; } Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 8242) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 8243) @@ -194,14 +194,16 @@ PCB_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie) -static void hid_tinycad_uninit() +int pplg_check_ver_import_tinycad(int ver_needed) { return 0; } + +void pplg_uninit_import_tinycad(void) { pcb_hid_remove_actions_by_cookie(tinycad_cookie); } #include "dolists.h" -pcb_uninit_t hid_import_tinycad_init() +int pplg_init_import_tinycad(void) { PCB_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie) - return hid_tinycad_uninit; + return 0; } Index: trunk/src_plugins/io_eagle/io_eagle.c =================================================================== --- trunk/src_plugins/io_eagle/io_eagle.c (revision 8242) +++ trunk/src_plugins/io_eagle/io_eagle.c (revision 8243) @@ -44,7 +44,9 @@ return 100; } -static void hid_io_eagle_uninit(void) +int pplg_check_ver_io_eagle(int ver_needed) { return 0; } + +void pplg_uninit_io_eagle(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ pcb_hid_remove_actions_by_cookie(eagle_cookie); @@ -52,7 +54,7 @@ #include "dolists.h" -pcb_uninit_t hid_io_eagle_init(void) +int pplg_init_io_eagle(void) { /* register the IO hook */ @@ -74,6 +76,6 @@ PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle); - return hid_io_eagle_uninit; + return 0; } Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 8242) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 8243) @@ -140,13 +140,15 @@ return hyp_parse(pcb->Data, Filename, 0); } -static void hid_io_hyp_uninit() +int pplg_check_ver_io_hyp(int ver_needed) { return 0; } + +void pplg_uninit_io_hyp(void) { pcb_hid_remove_actions_by_cookie(hyp_cookie); } #include "dolists.h" -pcb_uninit_t hid_io_hyp_init() +int pplg_init_io_hyp(void) { /* register the IO hook */ io_hyp.plugin_data = NULL; @@ -170,7 +172,7 @@ PCB_REGISTER_ACTIONS(hyp_action_list, hyp_cookie) - return hid_io_hyp_uninit; + return 0; } /* not truncated */ Index: trunk/src_plugins/io_kicad/io_kicad.c =================================================================== --- trunk/src_plugins/io_kicad/io_kicad.c (revision 8242) +++ trunk/src_plugins/io_kicad/io_kicad.c (revision 8243) @@ -52,7 +52,9 @@ PCB_REGISTER_ACTIONS(eeschema_action_list, kicad_cookie) -static void hid_io_kicad_uninit(void) +int pplg_check_ver_io_kicad(int ver_needed) { return 0; } + +void pplg_uninit_io_kicad(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ pcb_hid_remove_actions_by_cookie(kicad_cookie); @@ -60,7 +62,7 @@ #include "dolists.h" -pcb_uninit_t hid_io_kicad_init(void) +int pplg_init_io_kicad(void) { /* register the IO hook */ @@ -87,6 +89,6 @@ /* TODO: Alloc plugin-globals here. */ - return hid_io_kicad_uninit; + return 0; } Index: trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c (revision 8242) +++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c (revision 8243) @@ -43,12 +43,14 @@ return 0; /* no read support yet */ } -static void hid_io_kicad_legacy_uninit(void) +int pplg_check_ver_io_kicad_legacy(int ver_needed) { return 0; } + +void pplg_uninit_io_kicad_legacy(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ } -pcb_uninit_t hid_io_kicad_legacy_init(void) +int pplg_init_io_kicad_legacy(void) { /* register the IO hook */ @@ -72,6 +74,6 @@ /* TODO: Alloc plugin-globals here. */ - return hid_io_kicad_legacy_uninit; + return 0; } Index: trunk/src_plugins/io_lihata/io_lihata.c =================================================================== --- trunk/src_plugins/io_lihata/io_lihata.c (revision 8242) +++ trunk/src_plugins/io_lihata/io_lihata.c (revision 8243) @@ -43,11 +43,13 @@ return 100; } -static void hid_io_lihata_uninit(void) +int pplg_check_ver_io_lihata(int ver_needed) { return 0; } + +void pplg_uninit_io_lihata(void) { } -pcb_uninit_t hid_io_lihata_init(void) +int pplg_init_io_lihata(void) { /* register the IO hook */ @@ -75,6 +77,6 @@ conf_reg_field(conf_io_lihata, field,isarray,type_name,cpath,cname,desc,flags); #include "lht_conf_fields.h" - return hid_io_lihata_uninit; + return 0; } Index: trunk/src_plugins/io_pcb/io_pcb.c =================================================================== --- trunk/src_plugins/io_pcb/io_pcb.c (revision 8242) +++ trunk/src_plugins/io_pcb/io_pcb.c (revision 8243) @@ -43,7 +43,9 @@ } extern void pcb_lex_destroy(void); -static void hid_io_pcb_uninit(void) +int pplg_check_ver_io_pcb(int ver_needed) { return 0; } + +void pplg_uninit_io_pcb(void) { int n; pcb_lex_destroy(); @@ -52,7 +54,7 @@ PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[n])); } -pcb_uninit_t hid_io_pcb_init(void) +int pplg_init_io_pcb(void) { memset(&io_pcb, 0, sizeof(io_pcb)); @@ -104,5 +106,5 @@ io_pcb[2].mime_type = "application/x-pcb-layout"; PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[2])); - return hid_io_pcb_uninit; + return 0; } Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 8242) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 8243) @@ -105,14 +105,16 @@ PCB_REGISTER_ACTIONS(tedax_action_list, tedax_cookie) -static void hid_tedax_uninit() +int pplg_check_ver_io_tedax(int ver_needed) { return 0; } + +void pplg_uninit_io_tedax(void) { pcb_hid_remove_actions_by_cookie(tedax_cookie); } #include "dolists.h" -pcb_uninit_t hid_io_tedax_init() +int pplg_init_io_tedax(void) { PCB_REGISTER_ACTIONS(tedax_action_list, tedax_cookie) - return hid_tedax_uninit; + return 0; } Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 8242) +++ trunk/src_plugins/jostle/jostle.c (revision 8243) @@ -549,14 +549,16 @@ PCB_REGISTER_ACTIONS(jostle_action_list, jostle_cookie) -static void hid_jostle_uninit(void) +int pplg_check_ver_jostle(int ver_needed) { return 0; } + +void pplg_uninit_jostle(void) { pcb_hid_remove_actions_by_cookie(jostle_cookie); } #include "dolists.h" -pcb_uninit_t hid_jostle_init() +int pplg_init_jostle(void) { PCB_REGISTER_ACTIONS(jostle_action_list, jostle_cookie); - return hid_jostle_uninit; + return 0; } Index: trunk/src_plugins/lib_gensexpr/lib_gensexpr.c =================================================================== --- trunk/src_plugins/lib_gensexpr/lib_gensexpr.c (revision 8242) +++ trunk/src_plugins/lib_gensexpr/lib_gensexpr.c (revision 8243) @@ -1,7 +1,13 @@ #include #include "plugins.h" -pcb_uninit_t hid_lib_gensexpr_init(void) +int pplg_check_ver_lib_gensexpr(int ver_needed) { return 0; } + +void pplg_uninit_lib_gensexpr(void) { - return NULL; } + +int pplg_init_lib_gensexpr(void) +{ + return 0; +} Index: trunk/src_plugins/lib_gtk_common/lib_gtk_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_common.c (revision 8242) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_common.c (revision 8243) @@ -27,8 +27,14 @@ #include #include "plugins.h" -pcb_uninit_t hid_lib_gtk_common_init(void) +int pplg_check_ver_lib_gtk_common(int ver_needed) { return 0; } + +void pplg_uninit_lib_gtk_common(void) { - return NULL; } +int pplg_init_lib_gtk_common(void) +{ + return 0; +} + Index: trunk/src_plugins/lib_gtk_config/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_config/lib_gtk_config.c (revision 8242) +++ trunk/src_plugins/lib_gtk_config/lib_gtk_config.c (revision 8243) @@ -40,8 +40,14 @@ ghid_conf_id = conf_hid_reg(lib_gtk_config_cookie, NULL); } -pcb_uninit_t hid_lib_gtk_config_init(void) +int pplg_check_ver_lib_gtk_config(int ver_needed) { return 0; } + +void pplg_uninit_lib_gtk_config(void) { +} + +int pplg_init_lib_gtk_config(void) +{ pcb_gtk_conf_init(); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ @@ -48,6 +54,6 @@ conf_reg_field(conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags); #include "../src_plugins/lib_gtk_config/hid_gtk_conf_fields.h" - return NULL; + return 0; } Index: trunk/src_plugins/lib_gtk_hid/lib_gtk_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/lib_gtk_hid.c (revision 8242) +++ trunk/src_plugins/lib_gtk_hid/lib_gtk_hid.c (revision 8243) @@ -32,8 +32,14 @@ static const char *lib_gtk_hid_cookie = "lib_gtk_hid"; -pcb_uninit_t hid_lib_gtk_hid_init(void) +int pplg_check_ver_lib_gtk_hid(int ver_needed) { return 0; } + +void pplg_uninit_lib_gtk_hid(void) { - return NULL; } +int pplg_init_lib_gtk_hid(void) +{ + return 0; +} + Index: trunk/src_plugins/lib_legacy_func/lib_legacy_func.c =================================================================== --- trunk/src_plugins/lib_legacy_func/lib_legacy_func.c (revision 8242) +++ trunk/src_plugins/lib_legacy_func/lib_legacy_func.c (revision 8243) @@ -132,8 +132,14 @@ } -pcb_uninit_t hid_lib_legacy_func_init(void) +int pplg_check_ver_lib_legacy_func(int ver_needed) { return 0; } + +void pplg_uninit_lib_legacy_func(void) { - return NULL; } +int pplg_init_lib_legacy_func(void) +{ + return 0; +} + Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 8242) +++ trunk/src_plugins/loghid/loghid.c (revision 8243) @@ -100,7 +100,9 @@ #include "dolists.h" -static void hid_loghid_uninit(void) +int pplg_check_ver_loghid(int ver_needed) { return 0; } + +void pplg_uninit_loghid(void) { } @@ -107,7 +109,7 @@ static pcb_hid_t loghid_gui; static pcb_hid_t loghid_exp; -pcb_uninit_t hid_loghid_init(void) +int pplg_init_loghid(void) { memset(&loghid_gui, 0, sizeof(pcb_hid_t)); memset(&loghid_exp, 0, sizeof(pcb_hid_t)); @@ -134,5 +136,5 @@ pcb_hid_register_hid(&loghid_exp); - return hid_loghid_uninit; + return 0; } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 8242) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 8243) @@ -396,13 +396,15 @@ shorts = NULL; } -void hid_mincut_uninit(void) +int pplg_check_ver_mincut(int ver_needed) { return 0; } + +void pplg_uninit_mincut(void) { conf_unreg_fields("plugins/mincut/"); } #include "stub_mincut.h" -pcb_uninit_t hid_mincut_init(void) +int pplg_init_mincut(void) { pcb_stub_rat_found_short = rat_found_short; pcb_stub_rat_proc_shorts = rat_proc_shorts; @@ -409,5 +411,5 @@ #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_mincut, field,isarray,type_name,cpath,cname,desc,flags); #include "rats_mincut_conf_fields.h" - return hid_mincut_uninit; + return 0; } Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 8242) +++ trunk/src_plugins/oldactions/oldactions.c (revision 8243) @@ -306,14 +306,16 @@ PCB_REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie) -static void hid_oldactions_uninit(void) +int pplg_check_ver_oldactions(int ver_needed) { return 0; } + +void pplg_uninit_oldactions(void) { pcb_hid_remove_actions_by_cookie(oldactions_cookie); } #include "dolists.h" -pcb_uninit_t hid_oldactions_init(void) +int pplg_init_oldactions(void) { PCB_REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie) - return hid_oldactions_uninit; + return 0; } Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 8242) +++ trunk/src_plugins/polycombine/polycombine.c (revision 8243) @@ -348,14 +348,16 @@ PCB_REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie) -static void hid_polycombine_uninit(void) +int pplg_check_ver_polycombine(int ver_needed) { return 0; } + +void pplg_uninit_polycombine(void) { pcb_hid_remove_actions_by_cookie(polycombine_cookie); } #include "dolists.h" -pcb_uninit_t hid_polycombine_init() +int pplg_init_polycombine(void) { PCB_REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie); - return hid_polycombine_uninit; + return 0; } Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 8242) +++ trunk/src_plugins/polystitch/polystitch.c (revision 8243) @@ -248,14 +248,16 @@ PCB_REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie) -static void hid_polystitch_uninit(void) +int pplg_check_ver_polystitch(int ver_needed) { return 0; } + +void pplg_uninit_polystitch(void) { pcb_hid_remove_actions_by_cookie(polystitch_cookie); } #include "dolists.h" -pcb_uninit_t hid_polystitch_init() +int pplg_init_polystitch(void) { PCB_REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie); - return hid_polystitch_uninit; + return 0; } Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 8242) +++ trunk/src_plugins/propedit/propedit.c (revision 8243) @@ -81,14 +81,16 @@ PCB_REGISTER_ACTIONS(propedit_action_list, propedit_cookie) -static void hid_propedit_uninit(void) +int pplg_check_ver_propedit(int ver_needed) { return 0; } + +void pplg_uninit_propedit(void) { pcb_hid_remove_actions_by_cookie(propedit_cookie); } #include "dolists.h" -pcb_uninit_t hid_propedit_init(void) +int pplg_init_propedit(void) { PCB_REGISTER_ACTIONS(propedit_action_list, propedit_cookie) - return hid_propedit_uninit; + return 0; } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 8242) +++ trunk/src_plugins/puller/puller.c (revision 8243) @@ -2392,14 +2392,16 @@ PCB_REGISTER_ACTIONS(puller_action_list, puller_cookie) -static void hid_puller_uninit(void) +int pplg_check_ver_puller(int ver_needed) { return 0; } + +void pplg_uninit_puller(void) { pcb_hid_remove_actions_by_cookie(puller_cookie); } #include "dolists.h" -pcb_uninit_t hid_puller_init(void) +int pplg_init_puller(void) { PCB_REGISTER_ACTIONS(puller_action_list, puller_cookie) - return hid_puller_uninit; + return 0; } Index: trunk/src_plugins/query/query.c =================================================================== --- trunk/src_plugins/query/query.c (revision 8242) +++ trunk/src_plugins/query/query.c (revision 8243) @@ -278,7 +278,9 @@ static const char *query_cookie = "query plugin"; -static void hid_query_uninit(void) +int pplg_check_ver_query(int ver_needed) { return 0; } + +void pplg_uninit_query(void) { pcb_hid_remove_actions_by_cookie(query_cookie); } @@ -285,9 +287,9 @@ void pcb_qry_basic_fnc_init(void); -pcb_uninit_t hid_query_init(void) +int pplg_init_query(void) { pcb_qry_basic_fnc_init(); query_action_reg(query_cookie); - return hid_query_uninit; + return 0; } Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 8242) +++ trunk/src_plugins/renumber/renumber.c (revision 8243) @@ -367,7 +367,9 @@ NULL, NULL} }; -static void hid_renumber_uninit(void) +int pplg_check_ver_renumber(int ver_needed) { return 0; } + +void pplg_uninit_renumber(void) { pcb_hid_remove_actions_by_cookie(renumber_cookie); } @@ -375,8 +377,8 @@ PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie) #include "dolists.h" -pcb_uninit_t hid_renumber_init(void) +int pplg_init_renumber(void) { PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie) - return hid_renumber_uninit; + return 0; } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 8242) +++ trunk/src_plugins/report/report.c (revision 8243) @@ -904,17 +904,19 @@ PCB_REGISTER_ACTIONS(report_action_list, report_cookie) -static void hid_report_uninit(void) +int pplg_check_ver_report(int ver_needed) { return 0; } + +void pplg_uninit_report(void) { pcb_hid_remove_actions_by_cookie(report_cookie); } #include "dolists.h" -pcb_uninit_t hid_report_init(void) +int pplg_init_report(void) { PCB_REGISTER_ACTIONS(report_action_list, report_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_report, field,isarray,type_name,cpath,cname,desc,flags); #include "report_conf_fields.h" - return hid_report_uninit; + return 0; } Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 8242) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 8243) @@ -1047,8 +1047,14 @@ pcb_event_unbind_allcookie(rubber_cookie); } -pcb_uninit_t hid_rubberband_orig_init(void) +int pplg_check_ver_rubberband_orig(int ver_needed) { return 0; } + +void pplg_uninit_rubberband_orig(void) { +} + +int pplg_init_rubberband_orig(void) +{ void *ctx = &rubber_band_state; pcb_event_bind(PCB_EVENT_RUBBER_RESET, rbe_reset, ctx, rubber_cookie); pcb_event_bind(PCB_EVENT_RUBBER_REMOVE_ELEMENT, rbe_remove_element, ctx, rubber_cookie); @@ -1061,6 +1067,5 @@ pcb_event_bind(PCB_EVENT_RUBBER_FIT_CROSSHAIR, rbe_fit_crosshair, ctx, rubber_cookie); pcb_event_bind(PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE, rbe_constrain_main_line, ctx, rubber_cookie); - return rb_uninit; + return 0; } - Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 8242) +++ trunk/src_plugins/shand_cmd/command.c (revision 8243) @@ -400,14 +400,16 @@ PCB_REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie) -static void hid_shand_cmd_uninit(void) +int pplg_check_ver_shand_cmd(int ver_needed) { return 0; } + +void pplg_uninit_shand_cmd(void) { pcb_hid_remove_actions_by_cookie(shand_cmd_cookie); } #include "dolists.h" -pcb_uninit_t hid_shand_cmd_init(void) +int pplg_init_shand_cmd(void) { PCB_REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie) - return hid_shand_cmd_uninit; + return 0; } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 8242) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 8243) @@ -270,14 +270,16 @@ PCB_REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie) -static void hid_smartdisperse_uninit(void) +int pplg_check_ver_smartdisperse(int ver_needed) { return 0; } + +void pplg_uninit_smartdisperse(void) { pcb_hid_remove_actions_by_cookie(smartdisperse_cookie); } #include "dolists.h" -pcb_uninit_t hid_smartdisperse_init() +int pplg_init_smartdisperse(void) { PCB_REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie); - return hid_smartdisperse_uninit; + return 0; } Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 8242) +++ trunk/src_plugins/stroke/stroke.c (revision 8243) @@ -156,12 +156,18 @@ StrokeBox.Y1 = pcb_crosshair.Y; } -pcb_uninit_t hid_stroke_init(void) +int pplg_check_ver_stroke(int ver_needed) { return 0; } + +int pplg_uninit_stroke(void) { +} + +int pplg_init_stroke(void) +{ stroke_init(); pcb_stub_stroke_record = real_stroke_record; pcb_stub_stroke_start = real_stroke_start; pcb_stub_stroke_finish = real_stroke_finish; - return NULL; + return 0; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 8242) +++ trunk/src_plugins/teardrops/teardrops.c (revision 8243) @@ -322,14 +322,16 @@ PCB_REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie) -static void hid_teardrops_uninit(void) +int pplg_check_ver_teardrops(int ver_needed) { return 0; } + +void pplg_uninit_teardrops(void) { pcb_hid_remove_actions_by_cookie(teardrops_cookie); } #include "dolists.h" -pcb_uninit_t hid_teardrops_init() +int pplg_init_teardrops(void) { PCB_REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie); - return hid_teardrops_uninit; + return 0; } Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 8242) +++ trunk/src_plugins/vendordrill/vendor.c (revision 8243) @@ -679,7 +679,9 @@ cached_drill = -1; } -static void hid_vendordrill_uninit(void) +int pplg_check_ver_vendordrill(int ver_needed) { return 0; } + +void pplg_uninit_vendordrill(void) { pcb_hid_remove_actions_by_cookie(vendor_cookie); vendor_free_all(); @@ -687,7 +689,7 @@ } #include "dolists.h" -pcb_uninit_t hid_vendordrill_init(void) +int pplg_init_vendordrill(void) { #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_vendor, field,isarray,type_name,cpath,cname,desc,flags); @@ -697,5 +699,5 @@ pcb_stub_vendor_is_element_mappable = vendorIsElementMappable; PCB_REGISTER_ACTIONS(vendor_action_list, vendor_cookie) - return hid_vendordrill_uninit; + return 0; }