Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26802)
+++ trunk/src/hid.h	(revision 26803)
@@ -546,10 +546,10 @@
 	void (*set_mouse_cursor)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx);
 
 	/* change top window title any time the after the GUI_INIT event */
-	void (*set_top_title)(pcb_hidlib_t *hidlib, const char *title);
+	void (*set_top_title)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, const char *title);
 
 	/* OPTIONAL: override the mouse cursor to indicate busy state */
-	void (*busy)(pcb_hidlib_t *hidlib, pcb_bool busy);
+	void (*busy)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool busy);
 
 	/* this field is used by that HID implementation to store its data */
 	void *hid_data;
@@ -629,7 +629,7 @@
 do { \
 	pcb_event(&pcb->hidlib, PCB_EVENT_BUSY, "i", is_busy, NULL); \
 	if ((pcb_gui != NULL) && (pcb_gui->busy != NULL)) \
-		pcb_gui->busy(&pcb->hidlib, is_busy); \
+		pcb_gui->busy(pcb_gui, &pcb->hidlib, is_busy); \
 } while(0)
 
 #endif
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 26802)
+++ trunk/src/hid_nogui.c	(revision 26803)
@@ -466,7 +466,7 @@
 {
 }
 
-static void nogui_set_top_title(pcb_hidlib_t *hidlib, const char *title)
+static void nogui_set_top_title(pcb_hid_t *hid, pcb_hidlib_t *hidlib, const char *title)
 {
 }
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26802)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26803)
@@ -372,7 +372,7 @@
 }
 
 /* Called from the core when it's busy doing something and we need to indicate that to the user.  */
-static void ltf_busy(pcb_hidlib_t *hidlib, pcb_bool busy)
+static void ltf_busy(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool busy)
 {
 	static Cursor busy_cursor = 0;
 	if (!lesstif_active)
@@ -3007,7 +3007,7 @@
 {
 }
 
-static void ltf_set_top_title(pcb_hidlib_t *hidlib, const char *title)
+static void ltf_set_top_title(pcb_hid_t *hid, pcb_hidlib_t *hidlib, const char *title)
 {
 	stdarg_n = 0;
 	stdarg(XmNtitle, title);
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26802)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26803)
@@ -533,12 +533,12 @@
 	ghid_port_set_mouse_cursor(ghidgui, idx);
 }
 
-static void ghid_set_top_title(pcb_hidlib_t *hidlib, const char *title)
+static void ghid_set_top_title(pcb_hid_t *hid, pcb_hidlib_t *hidlib, const char *title)
 {
 	pcb_gtk_tw_set_title(&ghidgui->topwin, title);
 }
 
-static void ghid_busy(pcb_hidlib_t *hidlib, pcb_bool busy)
+static void ghid_busy(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool busy)
 {
 	if ((ghidgui == NULL) || (!ghidgui->hid_active))
 		return;
Index: trunk/src_plugins/lib_hid_pcbui/title.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/title.c	(revision 26802)
+++ trunk/src_plugins/lib_hid_pcbui/title.c	(revision 26803)
@@ -53,7 +53,7 @@
 
 	title_buf.used = 0;
 	pcb_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board");
-	pcb_gui->set_top_title(&PCB->hidlib, title_buf.array);
+	pcb_gui->set_top_title(pcb_gui, &PCB->hidlib, title_buf.array);
 }
 
 static void pcb_title_board_changed_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])