Index: gtkhid-main.c =================================================================== --- gtkhid-main.c (revision 26860) +++ gtkhid-main.c (revision 26861) @@ -9,7 +9,6 @@ #include "../src_plugins/lib_gtk_common/glue_hid.h" const char *ghid_cairo_cookie = "gtk3 hid, cairo"; -const char *ghid_cairo_menu_cookie = "gtk3 hid menu, cairo"; pcb_hid_t gtk3_cairo_hid; @@ -25,18 +24,14 @@ void pplg_uninit_hid_gtk3_cairo(void) { - pcb_event_unbind_allcookie(ghid_cairo_cookie); - conf_hid_unreg(ghid_cairo_cookie); - conf_hid_unreg(ghid_cairo_menu_cookie); + ghid_glue_common_uninit(ghid_cookie); } int pplg_init_hid_gtk3_cairo(void) { PCB_API_CHK_VER; - ghid_win32_init(); ghid_glue_hid_init(>k3_cairo_hid); - ghid_glue_common_init(); gtk3_cairo_hid.parse_arguments = gtk3_cairo_parse_arguments; ghid_cairo_install(NULL, >k3_cairo_hid); @@ -44,10 +39,6 @@ gtk3_cairo_hid.name = "gtk3_cairo"; gtk3_cairo_hid.description = "Gtk3 - The Gimp Toolkit, with cairo rendering"; - ghidgui->topwin.menu.ghid_menuconf_id = conf_hid_reg(ghid_cairo_menu_cookie, NULL); - ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox; - ghid_conf_regs(ghid_cairo_cookie); - pcb_hid_register_hid(>k3_cairo_hid); return 0;