Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 21474)
+++ trunk/src/gui_act.c	(revision 21475)
@@ -1705,7 +1705,7 @@
 	pcb_hid_t *printer = pcb_hid_find_printer();
 	printer->calibrate(0.0, 0.0);
 
-	if (pcb_attribute_dialog(printer_calibrate_attrs, 3, printer_calibrate_values, "Printer Calibration Values", "Enter calibration values for your printer", NULL))
+	if (pcb_attribute_dialog(printer_calibrate_attrs, 3, printer_calibrate_values, "Printer Calibration Values", NULL))
 		return 1;
 	printer->calibrate(printer_calibrate_values[1].real_value, printer_calibrate_values[2].real_value);
 	PCB_ACT_IRES(0);
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 21474)
+++ trunk/src/hid.h	(revision 21475)
@@ -393,7 +393,7 @@
 	   may use it for a tooltip or text in a dialog box, or a help
 	   string.
 	 */
-	int (*attribute_dialog)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
+	int (*attribute_dialog)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data);
 
 	/* The same API in 3 stages: */
 	void *(*attr_dlg_new)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev)); /* returns hid_ctx */
Index: trunk/src/hid_attrib.c
===================================================================
--- trunk/src/hid_attrib.c	(revision 21474)
+++ trunk/src/hid_attrib.c	(revision 21475)
@@ -326,9 +326,9 @@
 	return cnt;
 }
 
-int pcb_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data)
+int pcb_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data)
 {
 	if ((pcb_gui == NULL) || (pcb_gui->attribute_dialog == NULL))
 		return -1;
-	return pcb_gui->attribute_dialog(attrs, n_attrs, results, title, descr, caller_data);
+	return pcb_gui->attribute_dialog(attrs, n_attrs, results, title, caller_data);
 }
Index: trunk/src/hid_attrib.h
===================================================================
--- trunk/src/hid_attrib.h	(revision 21474)
+++ trunk/src/hid_attrib.h	(revision 21475)
@@ -177,7 +177,7 @@
 int pcb_hid_attrdlg_num_children(pcb_hid_attribute_t *attrs, int start_from, int n_attrs);
 
 /* Invoke a simple modal attribute dialog if GUI is available */
-int pcb_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
+int pcb_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data);
 
 /* Convert between compflag bit value and name */
 const char *pcb_hid_compflag_bit2name(pcb_hatt_compflags_t bit);
Index: trunk/src/hid_dad.h
===================================================================
--- trunk/src/hid_dad.h	(revision 21474)
+++ trunk/src/hid_dad.h	(revision 21475)
@@ -79,13 +79,13 @@
 #define PCB_DAD_RUN(table) pcb_hid_dad_run(table ## _hid_ctx, &table ## _ret_override)
 
 /* failed is non-zero on cancel */
-#define PCB_DAD_AUTORUN(table, title, descr, caller_data, failed) \
+#define PCB_DAD_AUTORUN(table, title, caller_data, failed) \
 do { \
 	if (table ## _result == NULL) \
 		PCB_DAD_ALLOC_RESULT(table); \
 	table ## _ret_override.valid = 0; \
 	table ## _ret_override.already_freed = 0; \
-	failed = pcb_attribute_dialog(table, table ## _len, table ## _result, title, descr, caller_data); \
+	failed = pcb_attribute_dialog(table, table ## _len, table ## _result, title, caller_data); \
 	if (table ## _ret_override.valid) \
 		failed = table ## _ret_override.value; \
 } while(0)
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 21474)
+++ trunk/src/hid_nogui.c	(revision 21475)
@@ -401,7 +401,7 @@
 }
 
 
-static int nogui_attribute_dialog(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+static int nogui_attribute_dialog(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, void *caller_data)
 {
 	CRASH("attribute_dialog");
 }
Index: trunk/src_plugins/dialogs/dlg_comm_m.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_comm_m.c	(revision 21474)
+++ trunk/src_plugins/dialogs/dlg_comm_m.c	(revision 21475)
@@ -100,7 +100,7 @@
 	PCB_DAD_END(dlg);
 
 	res->type = FGW_INT;
-	PCB_DAD_AUTORUN(dlg, title, "", NULL, res->val.nat_int);
+	PCB_DAD_AUTORUN(dlg, title, NULL, res->val.nat_int);
 	PCB_DAD_FREE(dlg);
 
 	return 0;
Index: trunk/src_plugins/dialogs/dlg_layer_flags.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_layer_flags.c	(revision 21474)
+++ trunk/src_plugins/dialogs/dlg_layer_flags.c	(revision 21475)
@@ -21,7 +21,7 @@
 	attr[1].default_val.int_value = ly->comb & PCB_LYC_SUB;
 	attr[2].default_val.int_value = ly->comb & PCB_LYC_AUTO;
 
-	ar = pcb_attribute_dialog(attr,sizeof(attr)/sizeof(attr[0]), rv, "Edit layer properties", "Edit the properties of a logical layer", NULL);
+	ar = pcb_attribute_dialog(attr,sizeof(attr)/sizeof(attr[0]), rv, "Edit the properties of a logical layer", NULL);
 
 	if (ar == 0) {
 		pcb_layer_combining_t comb = 0;
@@ -92,7 +92,7 @@
 	}
 	orig_loc = attr[3].default_val.int_value;
 
-	ar = pcb_attribute_dialog(attr, sizeof(attr)/sizeof(attr[0]) - omit_loc, rv, "Edit group properties", "Edit the properties of a layer group (physical layer)", NULL);
+	ar = pcb_attribute_dialog(attr, sizeof(attr)/sizeof(attr[0]) - omit_loc, rv, "Edit the properties of a layer group (physical layer)", NULL);
 
 	if (ar == 0) {
 		if (strcmp(g->name, attr[0].default_val.str_value) != 0) {
Index: trunk/src_plugins/dialogs/dlg_test.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_test.c	(revision 21474)
+++ trunk/src_plugins/dialogs/dlg_test.c	(revision 21475)
@@ -186,7 +186,7 @@
 	PCB_DAD_BUTTON_CLOSES(ctx.dlg, clbtn);
 	PCB_DAD_END(ctx.dlg);
 
-	PCB_DAD_AUTORUN(ctx.dlg, "dlg_test", "attribute dialog test", &ctx, failed);
+	PCB_DAD_AUTORUN(ctx.dlg, "attribute dialog test", &ctx, failed);
 
 	if (failed)
 		pcb_message(PCB_MSG_WARNING, "Test dialog cancelled");
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 21474)
+++ trunk/src_plugins/export_ps/ps.c	(revision 21475)
@@ -1447,7 +1447,7 @@
 		ps_calib_attribute_list[0].default_val.str_value = pcb_strdup("lpr");
 	}
 
-	if (pcb_attribute_dialog(ps_calib_attribute_list, 1, vals, _("Print Calibration Page"), _("Generates a printer calibration page"), NULL))
+	if (pcb_attribute_dialog(ps_calib_attribute_list, 1, vals, _("Print Calibration Page"), NULL))
 		return;
 
 	if (use_command || strchr(vals[0].str_value, '|')) {
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 21474)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 21475)
@@ -286,7 +286,7 @@
 }
 
 static int
-batch_attribute_dialog(pcb_hid_attribute_t * attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data)
+batch_attribute_dialog(pcb_hid_attribute_t * attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data)
 {
 	return 0;
 }
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 21474)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 21475)
@@ -1042,7 +1042,7 @@
 		ctx->property[prop] = *val;
 }
 
-int lesstif_attribute_dialog(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+int lesstif_attribute_dialog(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, void *caller_data)
 {
 	int rv;
 	void *hid_ctx;
@@ -1144,7 +1144,7 @@
 	}
 	opts = printer->get_export_options(&n);
 	vals = (pcb_hid_attr_val_t *) calloc(n, sizeof(pcb_hid_attr_val_t));
-	if (lesstif_attribute_dialog(opts, n, vals, "Print", "", NULL)) {
+	if (lesstif_attribute_dialog(opts, n, vals, "Print", NULL)) {
 		free(vals);
 		PCB_ACT_IRES(1);
 		return 1;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 21474)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 21475)
@@ -3423,7 +3423,7 @@
 extern int lesstif_attr_dlg_run(void *hid_ctx);
 extern void lesstif_attr_dlg_free(void *hid_ctx);
 extern void lesstif_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val);
-extern int lesstif_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
+extern int lesstif_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data);
 extern int lesstif_attr_dlg_widget_state(void *hid_ctx, int idx, pcb_bool enabled);
 extern int lesstif_attr_dlg_widget_hide(void *hid_ctx, int idx, pcb_bool hide);
 extern int lesstif_attr_dlg_set_value(void *hid_ctx, int idx, const pcb_hid_attr_val_t *val);
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 21474)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 21475)
@@ -369,7 +369,7 @@
 {
 }
 
-static int remote_attribute_dialog(pcb_hid_attribute_t * attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data)
+static int remote_attribute_dialog(pcb_hid_attribute_t * attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data)
 {
 	return 0;
 }
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 21474)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 21475)
@@ -805,7 +805,7 @@
 }
 
 
-int ghid_attribute_dialog(pcb_gtk_common_t *com, pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+int ghid_attribute_dialog(pcb_gtk_common_t *com, pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, void *caller_data)
 {
 	void *hid_ctx;
 	int rc;
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 21474)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 21475)
@@ -7,7 +7,7 @@
 void ghid_attr_dlg_free(void *hid_ctx);
 void ghid_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val);
 
-int ghid_attribute_dialog(pcb_gtk_common_t *com, pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data);
+int ghid_attribute_dialog(pcb_gtk_common_t *com, pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, void *caller_data);
 
 int ghid_attr_dlg_widget_state(void *hid_ctx, int idx, pcb_bool enabled);
 int ghid_attr_dlg_widget_hide(void *hid_ctx, int idx, pcb_bool hide);
Index: trunk/src_plugins/lib_gtk_common/dlg_library_param.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_library_param.c	(revision 21474)
+++ trunk/src_plugins/lib_gtk_common/dlg_library_param.c	(revision 21475)
@@ -453,7 +453,7 @@
 	if (dirty) /* had to replace the filter text, make it effective */
 		attr_change_cb(NULL, NULL, &attrs[0]);
 
-	if (ghid_attribute_dialog(com, attrs, numattr, res, "Parametric footprint edition", descr, NULL) == 0)
+	if (ghid_attribute_dialog(com, attrs, numattr, res, descr, NULL) == 0)
 		sres = gen_cmd(entry->name, attrs, res, numattr, ctx.first_optional);
 	else
 		sres = NULL; /* cancel */
Index: trunk/src_plugins/lib_gtk_common/dlg_print.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_print.c	(revision 21474)
+++ trunk/src_plugins/lib_gtk_common/dlg_print.c	(revision 21475)
@@ -63,7 +63,7 @@
 		}
 
 		/* non-zero means cancel was picked */
-		if (ghid_attribute_dialog(com, attr, n, results, _("PCB Print Layout"), pcb_exporter->description, NULL))
+		if (ghid_attribute_dialog(com, attr, n, results, pcb_exporter->description, NULL))
 			return;
 
 	}
Index: trunk/src_plugins/lib_gtk_hid/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 21474)
+++ trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 21475)
@@ -354,9 +354,9 @@
 	return pcb_gtk_fileselect(ghid_port.top_window, title, descr, default_file, default_ext, history_tag, flags);
 }
 
-static int ghid_attribute_dialog_(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+static int ghid_attribute_dialog_(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, void *caller_data)
 {
-	return ghid_attribute_dialog(&ghidgui->common, attrs, n_attrs, results, title, descr, caller_data);
+	return ghid_attribute_dialog(&ghidgui->common, attrs, n_attrs, results, title, caller_data);
 }
 
 static void *ghid_attr_dlg_new_(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
Index: trunk/src_plugins/lib_polyhelp/polyhelp.c
===================================================================
--- trunk/src_plugins/lib_polyhelp/polyhelp.c	(revision 21474)
+++ trunk/src_plugins/lib_polyhelp/polyhelp.c	(revision 21475)
@@ -409,7 +409,7 @@
 		attrs[4].type = PCB_HATT_BOOL;
 		attrs[4].default_val.int_value = results[4].int_value;
 
-		if (pcb_attribute_dialog(attrs, nattr, results, "Polygon hatch", "Hatch a polygon", NULL) != 0)
+		if (pcb_attribute_dialog(attrs, nattr, results, "Polygon hatch", NULL) != 0)
 			return 1;
 
 		period = results[0].coord_value;
Index: trunk/src_plugins/script/script_act.c
===================================================================
--- trunk/src_plugins/script/script_act.c	(revision 21474)
+++ trunk/src_plugins/script/script_act.c	(revision 21475)
@@ -197,7 +197,7 @@
 	PCB_DAD_END(idlang.dlg);
 
 
-	PCB_DAD_AUTORUN(idlang.dlg, "load script", "", NULL, failed);
+	PCB_DAD_AUTORUN(idlang.dlg, "load script", NULL, failed);
 
 	if ((!failed) && (script_load(idlang.dlg_result[idlang.wid].str_value, fn, idlang.dlg_result[idlang.wlang].str_value) == 0))
 		script_dlg_s2d(ctx);