Index: trunk/src/brave.c
===================================================================
--- trunk/src/brave.c	(revision 25529)
+++ trunk/src/brave.c	(revision 25530)
@@ -54,6 +54,7 @@
 	{PCB_BRAVE_NOXOR, "noxor", "avoid xor drawing", "use alternative rendering instead of xor draw", 0},
 	{PCB_BRAVE_CLIPBATCH, "clipbatch", "batch poly clipping", "batch polygon clipping in some expensive user operations", 0},
 	{PCB_BRAVE_LESSTIF_TREETABLE, "lesstifttbl", "lesstif tree table", "enable experimental lesstif tree table support", 0},
+	{PCB_BRAVE_OLD_LIBWIN, "oldlibwin", "old library window", "use the old library window instead of the new, DAD based", 0},
 	{0, NULL, NULL, NULL}
 };
 
Index: trunk/src/brave.h
===================================================================
--- trunk/src/brave.h	(revision 25529)
+++ trunk/src/brave.h	(revision 25530)
@@ -5,6 +5,7 @@
 	PCB_BRAVE_NOXOR = 1,
 	PCB_BRAVE_CLIPBATCH = 2,
 	PCB_BRAVE_LESSTIF_TREETABLE = 4,
+	PCB_BRAVE_OLD_LIBWIN = 8,
 	PCB_BRAVE_max
 } pcb_brave_t;
 
Index: trunk/src/pcb-menu-default.lht
===================================================================
--- trunk/src/pcb-menu-default.lht	(revision 25529)
+++ trunk/src/pcb-menu-default.lht	(revision 25530)
@@ -549,7 +549,7 @@
 
 		ha:Window {
 			li:submenu {
-				ha:Library        = { a={<Key>w;<Key>l}; action=DoWindows(Library) }
+				ha:Library        = { a={<Key>w;<Key>l}; action=LibraryDialog() }
 				ha:Message Log    = { a={<Key>w;<Key>m}; action=LogDialog() }
 				ha:DRC Check      = { a={<Key>w;<Key>d}; action=DRC() }
 				ha:Netlist        = { a={<Key>w;<Key>n}; action=DoWindows(Netlist) }
Index: trunk/src_plugins/dialogs/dlg_library.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_library.c	(revision 25529)
+++ trunk/src_plugins/dialogs/dlg_library.c	(revision 25530)
@@ -49,6 +49,9 @@
 
 #include "dlg_library.h"
 
+TODO("Remove:")
+#include "brave.h"
+
 #define MAX_PARAMS 128
 
 typedef struct{
@@ -614,6 +617,9 @@
 const char pcb_acth_LibraryDialog[] = "Open the library dialog.";
 fgw_error_t pcb_act_LibraryDialog(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv)
 {
-	pcb_dlg_library();
+	if (pcb_brave & PCB_BRAVE_OLD_LIBWIN)
+		pcb_actionl("dowindows", "Library", NULL);
+	else
+		pcb_dlg_library();
 	return 0;
 }