Index: src_plugins/dialogs/dialogs.c =================================================================== --- src_plugins/dialogs/dialogs.c (revision 644) +++ src_plugins/dialogs/dialogs.c (revision 645) @@ -70,8 +70,8 @@ {"LayerDialog", camv_act_LayerDialog, camv_acth_LayerDialog, camv_acts_LayerDialog} }; -extern int pcb_dlg_pref_tab; -extern void (*pcb_dlg_pref_first_init)(pref_ctx_t *ctx, int tab); +extern int camv_dlg_pref_tab; +extern void (*camv_dlg_pref_first_init)(pref_ctx_t *ctx, int tab); int pplg_check_ver_dialogs(int ver_needed) { return 0; } @@ -87,7 +87,7 @@ RND_API_CHK_VER; RND_REGISTER_ACTIONS(camv_dialogs_action_list, camv_dialogs_cookie); - rnd_dlg_pref_init(pcb_dlg_pref_tab, pcb_dlg_pref_first_init); + rnd_dlg_pref_init(camv_dlg_pref_tab, camv_dlg_pref_first_init); rnd_event_bind(CAMV_EVENT_LAYERS_CHANGED, camv_dialogs_layer_chg_ev, NULL, camv_dialogs_cookie); rnd_event_bind(CAMV_EVENT_LAYER_SELECTED, camv_dialogs_layer_selected_ev, NULL, camv_dialogs_cookie); Index: src_plugins/dialogs/dlg_pref_apptab.c =================================================================== --- src_plugins/dialogs/dlg_pref_apptab.c (revision 644) +++ src_plugins/dialogs/dlg_pref_apptab.c (revision 645) @@ -34,6 +34,6 @@ #define PREF_TAB 0 #include "dlg_pref_general.c" -int pcb_dlg_pref_tab = PREF_TAB; -void (*pcb_dlg_pref_first_init)(pref_ctx_t *ctx, int tab) = PREF_INIT_FUNC; +int camv_dlg_pref_tab = PREF_TAB; +void (*camv_dlg_pref_first_init)(pref_ctx_t *ctx, int tab) = PREF_INIT_FUNC; Index: src_plugins/dialogs/dlg_pref_general.c =================================================================== --- src_plugins/dialogs/dlg_pref_general.c (revision 644) +++ src_plugins/dialogs/dlg_pref_general.c (revision 645) @@ -56,13 +56,13 @@ rnd_pref_dlg2conf_post(hl, ctx); } -void pcb_dlg_pref_general_close(pref_ctx_t *ctx, rnd_design_t *dsg) +void camv_dlg_pref_general_close(pref_ctx_t *ctx, rnd_design_t *dsg) { rnd_pref_conflist_remove(ctx, perf_backup); rnd_pref_conflist_remove(ctx, perf_cli); } -void pcb_dlg_pref_general_create(pref_ctx_t *ctx, rnd_design_t *dsg) +void camv_dlg_pref_general_create(pref_ctx_t *ctx, rnd_design_t *dsg) { RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); @@ -83,14 +83,14 @@ static const rnd_pref_tab_hook_t pref_general = { "General", RND_PREFTAB_AUTO_FREE_DATA | RND_PREFTAB_NEEDS_ROLE, - NULL, pcb_dlg_pref_general_close, - pcb_dlg_pref_general_create, + NULL, camv_dlg_pref_general_close, + camv_dlg_pref_general_create, NULL, NULL }; -static void pcb_dlg_pref_general_init(pref_ctx_t *ctx, int tab) +static void camv_dlg_pref_general_init(pref_ctx_t *ctx, int tab) { PREF_INIT(ctx, &pref_general); } #undef PREF_INIT_FUNC -#define PREF_INIT_FUNC pcb_dlg_pref_general_init +#define PREF_INIT_FUNC camv_dlg_pref_general_init