Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 26800)
+++ trunk/src/board.c	(revision 26801)
@@ -341,7 +341,7 @@
 void pcb_board_changed(int reverted)
 {
 	if ((pcb_gui != NULL) && (pcb_gui->set_hidlib != NULL))
-		pcb_gui->set_hidlib(&PCB->hidlib);
+		pcb_gui->set_hidlib(pcb_gui, &PCB->hidlib);
 	pcb_event(&PCB->hidlib, PCB_EVENT_BOARD_CHANGED, "i", reverted);
 }
 
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 26800)
+++ trunk/src/file_act.c	(revision 26801)
@@ -148,7 +148,7 @@
 		if (PCB->Changed && conf_core.editor.save_in_tmp)
 			pcb_save_in_tmp();
 		if (pcb_gui->set_hidlib != NULL)
-			pcb_gui->set_hidlib(NULL);
+			pcb_gui->set_hidlib(pcb_gui, NULL);
 		pcb_board_remove(PCB);
 		PCB = pcb_board_new(1);
 		pcb_board_new_postproc(PCB, 1);
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26800)
+++ trunk/src/hid.h	(revision 26801)
@@ -538,7 +538,7 @@
 
 	/* optional: called by core when the global hidlib context changes
 	   (e.g. board changed) */
-	void (*set_hidlib)(pcb_hidlib_t *hidlib);
+	void (*set_hidlib)(pcb_hid_t *hid, pcb_hidlib_t *hidlib);
 
 	/* Change the mouse cursor to a named cursor e.g. after the tool has changed.
 	   The list of cursors names available may depend on the HID. */
Index: trunk/src/hid_init.c
===================================================================
--- trunk/src/hid_init.c	(revision 26800)
+++ trunk/src/hid_init.c	(revision 26801)
@@ -571,7 +571,7 @@
 	if (is_empty)
 		pcb_message(PCB_MSG_WARNING, "Exporting empty board (nothing loaded or drawn).\n");
 	if (pcb_gui->set_hidlib != NULL)
-		pcb_gui->set_hidlib(hidlib);
+		pcb_gui->set_hidlib(pcb_gui, hidlib);
 	pcb_gui->do_export(pcb_gui, hidlib, 0);
 	pcbhl_log_print_uninit_errs("Exporting");
 	return 1;
@@ -580,7 +580,7 @@
 void pcbhl_mainloop_interactive(pcbhl_main_args_t *ga, pcb_hidlib_t *hidlib)
 {
 	if (pcb_gui->set_hidlib != NULL)
-		pcb_gui->set_hidlib(hidlib);
+		pcb_gui->set_hidlib(pcb_gui, hidlib);
 	pcb_gui->do_export(pcb_gui, hidlib, 0);
 }
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26800)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26801)
@@ -407,7 +407,7 @@
 extern void LesstifLibraryChanged(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 
-static void ltf_set_hidlib(pcb_hidlib_t *hidlib)
+static void ltf_set_hidlib(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
 {
 	ltf_hidlib = hidlib;
 	if ((work_area == 0) || (hidlib == NULL))
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26800)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26801)
@@ -501,7 +501,7 @@
 	return 0;
 }
 
-static void ghid_set_hidlib(pcb_hidlib_t *hidlib)
+static void ghid_set_hidlib(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
 {
 	ghidgui->hidlib = hidlib;