Index: AlienMap.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/AlienMap.c,v
retrieving revision 1.5
diff -u -p -r1.5 AlienMap.c
--- AlienMap.c  2001/08/03 19:51:31     1.5
+++ AlienMap.c  2001/11/28 18:44:53
@@ -1396,10 +1396,10 @@ alienmap_dialog (void)
 
                     _("About..."), alienmap_logo_dialog,
                     NULL, NULL, NULL, FALSE, FALSE,
-                    GTK_STOCK_OK, dialog_ok_callback,
-                    NULL, NULL, NULL, TRUE, FALSE,
                     GTK_STOCK_CANCEL, gtk_widget_destroy,
                     NULL, 1, NULL, FALSE, TRUE,
+                    GTK_STOCK_OK, dialog_ok_callback,
+                    NULL, NULL, NULL, TRUE, FALSE,
 
                     NULL);
 
Index: AlienMap2.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/AlienMap2.c,v
retrieving revision 1.5
diff -u -p -r1.5 AlienMap2.c
--- AlienMap2.c 2001/08/03 19:51:31     1.5
+++ AlienMap2.c 2001/11/28 18:45:14
@@ -1388,10 +1388,10 @@ alienmap2_dialog (void)
 
                     _("About..."), alienmap2_logo_dialog,
                     NULL, NULL, NULL, FALSE, FALSE,
-                    GTK_STOCK_OK, dialog_ok_callback,
-                    NULL, NULL, NULL, TRUE, FALSE,
                     GTK_STOCK_CANCEL, gtk_widget_destroy,
                     NULL, 1, NULL, FALSE, TRUE,
+                    GTK_STOCK_OK, dialog_ok_callback,
+                    NULL, NULL, NULL, TRUE, FALSE,
 
                     NULL);
 
Index: aa.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/aa.c,v
retrieving revision 1.20
diff -u -p -r1.20 aa.c
--- aa.c        2001/08/03 19:51:31     1.20
+++ aa.c        2001/11/28 18:45:16
@@ -341,10 +341,10 @@ type_dialog (int selected) 
                         GTK_WIN_POS_MOUSE,
                         FALSE, TRUE, FALSE,
 
-                        GTK_STOCK_OK, gtk_widget_destroy,
-                        NULL, 1, NULL, TRUE, FALSE,
                         GTK_STOCK_CANCEL, type_dialog_cancel_callback,
                         NULL, NULL, NULL, FALSE, TRUE,
+                        GTK_STOCK_OK, gtk_widget_destroy,
+                        NULL, 1, NULL, TRUE, FALSE,
 
                         NULL);
 
Index: align_layers.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/align_layers.c,v
retrieving revision 1.28
diff -u -p -r1.28 align_layers.c
--- align_layers.c      2001/08/03 19:51:31     1.28
+++ align_layers.c      2001/11/28 18:45:17
@@ -422,10 +422,10 @@ align_layers_dialog (void)
                         GTK_WIN_POS_MOUSE,
                         FALSE, TRUE, FALSE,
 
-                        GTK_STOCK_OK, align_layers_ok_callback,
-                        NULL, NULL, NULL, TRUE, FALSE,
                         GTK_STOCK_CANCEL, gtk_widget_destroy,
                         NULL, 1, NULL, FALSE, TRUE,
+                        GTK_STOCK_OK, align_layers_ok_callback,
+                        NULL, NULL, NULL, TRUE, FALSE,
 
                         NULL);
 
Index: apply_lens.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/apply_lens.c,v
retrieving revision 1.24
diff -u -p -r1.24 apply_lens.c
--- apply_lens.c        2001/10/07 02:13:04     1.24
+++ apply_lens.c        2001/11/28 18:45:17
@@ -393,10 +393,10 @@ lens_dialog (GimpDrawable *drawable)
                         GTK_WIN_POS_MOUSE,
                         FALSE, TRUE, FALSE,
 
-                        GTK_STOCK_OK, lens_ok_callback,
-                        NULL, NULL, NULL, TRUE, FALSE,
                         GTK_STOCK_CANCEL, gtk_widget_destroy,
                         NULL, 1, NULL, FALSE, TRUE,
+                        GTK_STOCK_OK, lens_ok_callback,
+                        NULL, NULL, NULL, TRUE, FALSE,
 
                         NULL);
 
Index: blinds.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/blinds.c,v
retrieving revision 1.30
diff -u -p -r1.30 blinds.c
--- blinds.c	2001/08/03 19:51:31	1.30
+++ blinds.c	2001/11/28 19:10:40
@@ -320,10 +320,10 @@ blinds_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, blinds_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, blinds_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: bumpmap.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/bumpmap.c,v
retrieving revision 1.35
diff -u -p -r1.35 bumpmap.c
--- bumpmap.c	2001/08/03 19:51:31	1.35
+++ bumpmap.c	2001/11/28 19:10:46
@@ -854,10 +854,10 @@ bumpmap_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: checkerboard.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/checkerboard.c,v
retrieving revision 1.23
diff -u -p -r1.23 checkerboard.c
--- checkerboard.c	2001/08/03 19:51:31	1.23
+++ checkerboard.c	2001/11/28 19:09:25
@@ -358,10 +358,10 @@ check_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, check_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, check_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: compose.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/compose.c,v
retrieving revision 1.28
diff -u -p -r1.28 compose.c
--- compose.c	2001/08/29 17:48:20	1.28
+++ compose.c	2001/11/28 19:09:40
@@ -773,10 +773,10 @@ compose_dialog (gchar  *compose_type,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, compose_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, compose_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: convmatrix.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/convmatrix.c,v
retrieving revision 1.22
diff -u -p -r1.22 convmatrix.c
--- convmatrix.c	2001/11/11 18:35:24	1.22
+++ convmatrix.c	2001/11/28 19:09:42
@@ -853,12 +853,12 @@ dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, &my_widgets.ok, TRUE, FALSE,
 			 _("Reset"), defaults_callback,
 			 NULL, 1, NULL, FALSE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, &my_widgets.ok, TRUE, FALSE,
 
 			 NULL);
 
Index: csource.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/csource.c,v
retrieving revision 1.26
diff -u -p -r1.26 csource.c
--- csource.c	2001/09/26 12:52:12	1.26
+++ csource.c	2001/11/28 19:09:52
@@ -653,10 +653,10 @@ run_save_dialog	(Config *config)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, save_dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, save_dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: cubism.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/cubism.c,v
retrieving revision 1.29
diff -u -p -r1.29 cubism.c
--- cubism.c	2001/08/03 19:51:31	1.29
+++ cubism.c	2001/11/28 19:09:56
@@ -318,10 +318,10 @@ cubism_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, cubism_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, cubism_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: curve_bend.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/curve_bend.c,v
retrieving revision 1.31
diff -u -p -r1.31 curve_bend.c
--- curve_bend.c	2001/11/11 18:35:24	1.31
+++ curve_bend.c	2001/11/28 19:10:08
@@ -1366,10 +1366,10 @@ bender_new_dialog (GimpDrawable *drawabl
 			       cd, NULL, NULL, FALSE, FALSE,
 			       _("Swap"), bender_swap_callback,
 			       cd, NULL, NULL, FALSE, FALSE,
-			       GTK_STOCK_OK, bender_ok_callback,
-			       cd, NULL, NULL, TRUE, FALSE,
 			       GTK_STOCK_CANCEL, bender_cancel_callback,
 			       cd, NULL, NULL, FALSE, TRUE,
+			       GTK_STOCK_OK, bender_ok_callback,
+			       cd, NULL, NULL, TRUE, FALSE,
 
 			       NULL);
 
Index: CML_explorer.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/CML_explorer.c,v
retrieving revision 1.46
diff -u -p -r1.46 CML_explorer.c
--- CML_explorer.c	2001/08/03 19:51:31	1.46
+++ CML_explorer.c	2001/11/28 19:10:22
@@ -1173,10 +1173,10 @@ CML_explorer_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, CML_explorer_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, CML_explorer_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
@@ -2254,10 +2254,10 @@ force_overwrite (const gchar *filename)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, FALSE, FALSE,
 
-			 GTK_STOCK_OK, CML_overwrite_ok_callback,
-			 NULL, NULL, NULL, FALSE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, TRUE, TRUE,
+			 GTK_STOCK_OK, CML_overwrite_ok_callback,
+			 NULL, NULL, NULL, FALSE, FALSE,
 
 			 NULL);
 
Index: decompose.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/decompose.c,v
retrieving revision 1.25
diff -u -p -r1.25 decompose.c
--- decompose.c	2001/08/29 17:48:20	1.25
+++ decompose.c	2001/11/28 19:13:32
@@ -871,10 +871,10 @@ decompose_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, decompose_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, decompose_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: deinterlace.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/deinterlace.c,v
retrieving revision 1.22
diff -u -p -r1.22 deinterlace.c
--- deinterlace.c	2001/08/03 19:51:32	1.22
+++ deinterlace.c	2001/11/28 19:13:33
@@ -268,10 +268,10 @@ deinterlace_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, deinterlace_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, deinterlace_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: depthmerge.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/depthmerge.c,v
retrieving revision 1.21
diff -u -p -r1.21 depthmerge.c
--- depthmerge.c	2001/08/03 19:51:32	1.21
+++ depthmerge.c	2001/11/28 19:13:35
@@ -640,10 +640,10 @@ DepthMerge_dialog (DepthMerge *dm)
 		     GTK_WIN_POS_MOUSE,
 		     FALSE, TRUE, FALSE,
 
-		     GTK_STOCK_OK, dialogOkCallback,
-		     dm, NULL, NULL, TRUE, FALSE,
 		     GTK_STOCK_CANCEL, dialogCancelCallback,
 		     dm, NULL, NULL, FALSE, TRUE,
+		     GTK_STOCK_OK, dialogOkCallback,
+		     dm, NULL, NULL, TRUE, FALSE,
 
 		     NULL);
 
Index: despeckle.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/despeckle.c,v
retrieving revision 1.39
diff -u -p -r1.39 despeckle.c
--- despeckle.c	2001/08/03 19:51:32	1.39
+++ despeckle.c	2001/11/28 19:13:45
@@ -619,10 +619,10 @@ despeckle_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: destripe.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/destripe.c,v
retrieving revision 1.25
diff -u -p -r1.25 destripe.c
--- destripe.c	2001/08/03 19:51:32	1.25
+++ destripe.c	2001/11/28 19:13:46
@@ -549,10 +549,10 @@ destripe_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: diffraction.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/diffraction.c,v
retrieving revision 1.21
diff -u -p -r1.21 diffraction.c
--- diffraction.c	2001/11/11 18:35:24	1.21
+++ diffraction.c	2001/11/28 19:13:48
@@ -531,10 +531,10 @@ diffraction_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: displace.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/displace.c,v
retrieving revision 1.21
diff -u -p -r1.21 displace.c
--- displace.c	2001/08/03 19:51:32	1.21
+++ displace.c	2001/11/28 19:13:50
@@ -295,10 +295,10 @@ displace_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, displace_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, displace_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: edge.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/edge.c,v
retrieving revision 1.20
diff -u -p -r1.20 edge.c
--- edge.c	2001/08/03 19:51:32	1.20
+++ edge.c	2001/11/28 19:31:18
@@ -647,10 +647,10 @@ edge_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, edge_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, edge_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: emboss.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/emboss.c,v
retrieving revision 1.25
diff -u -p -r1.25 emboss.c
--- emboss.c	2001/08/03 19:51:32	1.25
+++ emboss.c	2001/11/28 19:31:19
@@ -519,10 +519,10 @@ pluginCoreIA (struct piArgs *argp)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, emboss_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, emboss_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: engrave.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/engrave.c,v
retrieving revision 1.20
diff -u -p -r1.20 engrave.c
--- engrave.c	2001/08/03 19:51:32	1.20
+++ engrave.c	2001/11/28 19:31:20
@@ -221,10 +221,10 @@ engrave_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, engrave_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, engrave_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: exchange.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/exchange.c,v
retrieving revision 1.35
diff -u -p -r1.35 exchange.c
--- exchange.c	2001/08/03 19:51:32	1.35
+++ exchange.c	2001/11/28 19:31:22
@@ -319,10 +319,10 @@ exchange_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: film.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/film.c,v
retrieving revision 1.32
diff -u -p -r1.32 film.c
--- film.c	2001/11/11 18:35:24	1.32
+++ film.c	2001/11/28 19:29:52
@@ -1168,10 +1168,10 @@ film_dialog (gint32 image_ID)
 			 GTK_WIN_POS_NONE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, film_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, film_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: flarefx.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/flarefx.c,v
retrieving revision 1.29
diff -u -p -r1.29 flarefx.c
--- flarefx.c	2001/08/03 19:51:32	1.29
+++ flarefx.c	2001/11/28 19:29:54
@@ -331,10 +331,10 @@ flare_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, flare_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, flare_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: fractaltrace.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/fractaltrace.c,v
retrieving revision 1.25
diff -u -p -r1.25 fractaltrace.c
--- fractaltrace.c	2001/08/03 19:51:32	1.25
+++ fractaltrace.c	2001/11/28 19:29:55
@@ -722,10 +722,10 @@ dialog_show (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: gbr.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gbr.c,v
retrieving revision 1.28
diff -u -p -r1.28 gbr.c
--- gbr.c	2001/11/11 18:35:24	1.28
+++ gbr.c	2001/11/28 19:24:08
@@ -565,10 +565,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: gicon.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gicon.c,v
retrieving revision 1.20
diff -u -p -r1.20 gicon.c
--- gicon.c	2001/11/11 18:35:24	1.20
+++ gicon.c	2001/11/28 19:24:09
@@ -438,10 +438,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: gif.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gif.c,v
retrieving revision 1.62
diff -u -p -r1.62 gif.c
--- gif.c	2001/11/20 14:46:44	1.62
+++ gif.c	2001/11/28 19:24:15
@@ -1152,10 +1152,10 @@ badbounds_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, FALSE, FALSE,
 
-			 GTK_STOCK_OK, cropok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, cropok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
@@ -1224,10 +1224,10 @@ save_dialog (gint32 image_ID)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: gih.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gih.c,v
retrieving revision 1.11
diff -u -p -r1.11 gih.c
--- gih.c	2001/11/11 18:35:24	1.11
+++ gih.c	2001/11/28 19:24:18
@@ -851,10 +851,10 @@ gih_save_dialog (gint32 image_ID)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 			 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 			 
 			 NULL);
 
Index: glasstile.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/glasstile.c,v
retrieving revision 1.24
diff -u -p -r1.24 glasstile.c
--- glasstile.c	2001/08/03 19:51:32	1.24
+++ glasstile.c	2001/11/28 19:24:19
@@ -257,10 +257,10 @@ glass_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, glass_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, glass_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: gqbist.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gqbist.c,v
retrieving revision 1.26
diff -u -p -r1.26 gqbist.c
--- gqbist.c	2001/09/03 00:26:06	1.26
+++ gqbist.c	2001/11/28 19:24:21
@@ -802,10 +802,10 @@ dialog_create (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: grid.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/grid.c,v
retrieving revision 1.49
diff -u -p -r1.49 grid.c
--- grid.c	2001/10/24 17:34:43	1.49
+++ grid.c	2001/11/28 19:24:23
@@ -652,10 +652,10 @@ dialog (gint32        image_ID,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: gtm.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gtm.c,v
retrieving revision 1.22
diff -u -p -r1.22 gtm.c
--- gtm.c	2001/11/11 18:35:24	1.22
+++ gtm.c	2001/11/28 19:24:25
@@ -372,10 +372,10 @@ save_dialog (image_ID)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: hot.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/hot.c,v
retrieving revision 1.20
diff -u -p -r1.20 hot.c
--- hot.c	2001/08/03 19:51:33	1.20
+++ hot.c	2001/11/28 19:37:48
@@ -586,10 +586,10 @@ pluginCoreIA (struct piArgs *argp)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, hot_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, hot_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: hrz.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/hrz.c,v
retrieving revision 1.22
diff -u -p -r1.22 hrz.c
--- hrz.c	2001/08/03 19:51:33	1.22
+++ hrz.c	2001/11/28 19:37:49
@@ -522,10 +522,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: illusion.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/illusion.c,v
retrieving revision 1.30
diff -u -p -r1.30 illusion.c
--- illusion.c	2001/10/19 10:40:47	1.30
+++ illusion.c	2001/11/28 19:43:14
@@ -567,10 +567,10 @@ dialog (GimpDrawable *mangle)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 			 
-			 GTK_STOCK_OK, dialog_ok_handler,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, dialog_ok_handler,
+			 NULL, NULL, NULL, TRUE, FALSE,
 			 
 			 NULL);
 
Index: iwarp.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/iwarp.c,v
retrieving revision 1.32
diff -u -p -r1.32 iwarp.c
--- iwarp.c	2001/08/03 19:51:33	1.32
+++ iwarp.c	2001/11/28 19:43:17
@@ -1146,12 +1146,12 @@ iwarp_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, iwarp_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 _("Reset"), iwarp_reset_callback,
 			 NULL, NULL, NULL, FALSE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, iwarp_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: jigsaw.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/jigsaw.c,v
retrieving revision 1.20
diff -u -p -r1.20 jigsaw.c
--- jigsaw.c	2001/08/03 19:51:33	1.20
+++ jigsaw.c	2001/11/28 19:48:01
@@ -2483,10 +2483,10 @@ dialog_box (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, run_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, run_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: jpeg.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/jpeg.c,v
retrieving revision 1.60
diff -u -p -r1.60 jpeg.c
--- jpeg.c	2001/11/20 14:46:44	1.60
+++ jpeg.c	2001/11/28 19:48:06
@@ -1578,10 +1578,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: lic.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/lic.c,v
retrieving revision 1.25
diff -u -p -r1.25 lic.c
--- lic.c	2001/08/03 19:51:33	1.25
+++ lic.c	2001/11/28 19:49:28
@@ -1018,10 +1018,10 @@ create_main_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, ok_button_clicked,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_main_quit,
 			    NULL, NULL, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, ok_button_clicked,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: mapcolor.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/mapcolor.c,v
retrieving revision 1.25
diff -u -p -r1.25 mapcolor.c
--- mapcolor.c	2001/08/03 19:51:33	1.25
+++ mapcolor.c	2001/11/28 19:53:57
@@ -556,10 +556,10 @@ dialog (gint32 drawable_ID)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, mapcolor_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, mapcolor_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: mail.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/mail.c,v
retrieving revision 1.36
diff -u -p -r1.36 mail.c
--- mail.c	2001/11/20 14:46:44	1.36
+++ mail.c	2001/11/28 19:53:59
@@ -464,10 +464,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: newsprint.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/newsprint.c,v
retrieving revision 1.33
diff -u -p -r1.33 newsprint.c
--- newsprint.c	2001/08/03 19:51:33	1.33
+++ newsprint.c	2001/11/28 19:56:22
@@ -1215,10 +1215,10 @@ newsprint_dialog (GimpDrawable *drawable
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, newsprint_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, newsprint_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: nlfilt.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/nlfilt.c,v
retrieving revision 1.31
diff -u -p -r1.31 nlfilt.c
--- nlfilt.c	2001/10/28 17:43:21	1.31
+++ nlfilt.c	2001/11/28 19:56:26
@@ -365,10 +365,10 @@ pluginCoreIA (struct piArgs *argp)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, nlfilt_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, nlfilt_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: noisify.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/noisify.c,v
retrieving revision 1.24
diff -u -p -r1.24 noisify.c
--- noisify.c	2001/08/03 19:51:33	1.24
+++ noisify.c	2001/11/28 19:56:28
@@ -486,10 +486,10 @@ noisify_dialog (GimpDrawable *drawable, 
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, noisify_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, noisify_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: nova.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/nova.c,v
retrieving revision 1.36
diff -u -p -r1.36 nova.c
--- nova.c	2001/08/03 19:51:33	1.36
+++ nova.c	2001/11/28 19:56:30
@@ -481,10 +481,10 @@ nova_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, nova_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, nova_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: oilify.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/oilify.c,v
retrieving revision 1.26
diff -u -p -r1.26 oilify.c
--- oilify.c	2001/08/03 19:51:33	1.26
+++ oilify.c	2001/11/28 20:36:22
@@ -455,10 +455,10 @@ oilify_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, oilify_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, oilify_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: papertile.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/papertile.c,v
retrieving revision 1.33
diff -u -p -r1.33 papertile.c
--- papertile.c	2001/08/03 19:51:33	1.33
+++ papertile.c	2001/11/28 20:35:39
@@ -247,10 +247,10 @@ open_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, FALSE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_clicked,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_clicked,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: pat.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/pat.c,v
retrieving revision 1.25
diff -u -p -r1.25 pat.c
--- pat.c	2001/11/11 18:35:24	1.25
+++ pat.c	2001/11/28 20:35:40
@@ -452,10 +452,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: plasma.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/plasma.c,v
retrieving revision 1.30
diff -u -p -r1.30 plasma.c
--- plasma.c	2001/08/03 19:51:33	1.30
+++ plasma.c	2001/11/28 20:35:42
@@ -308,10 +308,10 @@ plasma_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, plasma_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, plasma_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: plugindetails.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/plugindetails.c,v
retrieving revision 1.21
diff -u -p -r1.21 plugindetails.c
--- plugindetails.c	2001/11/11 18:35:25	1.21
+++ plugindetails.c	2001/11/28 20:35:44
@@ -998,10 +998,10 @@ gimp_plugin_desc (void)
 		     GTK_WIN_POS_MOUSE,
 		     FALSE, TRUE, TRUE,
 
-		     _("Search by Name"), dialog_search_callback,
-		     plugindesc, NULL, NULL, FALSE, FALSE,
 		     GTK_STOCK_CLOSE, dialog_close_callback,
 		     plugindesc, NULL, NULL, TRUE, TRUE,
+		     _("Search by Name"), dialog_search_callback,
+		     plugindesc, NULL, NULL, FALSE, FALSE,
 
 		     NULL);
 
Index: png.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/png.c,v
retrieving revision 1.67
diff -u -p -r1.67 png.c
--- png.c	2001/11/11 18:35:25	1.67
+++ png.c	2001/11/28 20:35:47
@@ -1049,10 +1049,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: pnm.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/pnm.c,v
retrieving revision 1.28
diff -u -p -r1.28 pnm.c
--- pnm.c	2001/08/03 19:51:34	1.28
+++ pnm.c	2001/11/28 20:35:49
@@ -927,10 +927,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: polar.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/polar.c,v
retrieving revision 1.29
diff -u -p -r1.29 polar.c
--- polar.c	2001/08/03 19:51:34	1.29
+++ polar.c	2001/11/28 20:35:51
@@ -915,10 +915,10 @@ polarize_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: ps.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/ps.c,v
retrieving revision 1.47
diff -u -p -r1.47 ps.c
--- ps.c	2001/11/22 23:46:01	1.47
+++ ps.c	2001/11/28 20:35:57
@@ -2607,10 +2607,10 @@ load_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, load_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, load_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
@@ -2790,10 +2790,10 @@ save_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, save_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, save_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: psp.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/psp.c,v
retrieving revision 1.37
diff -u -p -r1.37 psp.c
--- psp.c	2001/08/03 19:51:34	1.37
+++ psp.c	2001/11/28 20:36:02
@@ -425,10 +425,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: randomize.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/randomize.c,v
retrieving revision 1.36
diff -u -p -r1.36 randomize.c
--- randomize.c	2001/08/03 19:51:34	1.36
+++ randomize.c	2001/11/28 20:37:34
@@ -699,10 +699,10 @@ randomize_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, randomize_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, randomize_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: ripple.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/ripple.c,v
retrieving revision 1.21
diff -u -p -r1.21 ripple.c
--- ripple.c	2001/08/03 19:51:34	1.21
+++ ripple.c	2001/11/28 20:37:35
@@ -577,10 +577,10 @@ ripple_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ripple_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ripple_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: sample_colorize.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sample_colorize.c,v
retrieving revision 1.26
diff -u -p -r1.26 sample_colorize.c
--- sample_colorize.c	2001/11/11 18:35:25	1.26
+++ sample_colorize.c	2001/11/28 20:42:19
@@ -1365,14 +1365,14 @@ p_smp_dialog (void)
 		     GTK_WIN_POS_MOUSE,
 		     FALSE, TRUE, FALSE,
 
-		     _("Apply"), p_smp_apply_callback,
-		     NULL, NULL, NULL, FALSE, FALSE,
 		     _("Get Sample Colors"), p_smp_get_colors_callback,
 		     NULL, NULL, NULL, TRUE, FALSE,
 		     _("Reset"), p_smp_reset_callback,
 		     NULL, NULL, NULL, FALSE, FALSE,
 		     GTK_STOCK_CLOSE, gtk_widget_destroy,
 		     NULL, 1, NULL, FALSE, TRUE,
+		     _("Apply"), p_smp_apply_callback,
+		     NULL, NULL, NULL, FALSE, FALSE,
 
 		     NULL);
 
Index: scatter_hsv.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/scatter_hsv.c,v
retrieving revision 1.27
diff -u -p -r1.27 scatter_hsv.c
--- scatter_hsv.c	2001/08/03 19:51:34	1.27
+++ scatter_hsv.c	2001/11/28 20:42:21
@@ -372,10 +372,10 @@ scatter_hsv_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, scatter_hsv_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, scatter_hsv_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: screenshot.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/screenshot.c,v
retrieving revision 1.31
diff -u -p -r1.31 screenshot.c
--- screenshot.c	2001/08/03 19:51:34	1.31
+++ screenshot.c	2001/11/28 20:42:22
@@ -368,10 +368,10 @@ shoot_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, shoot_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, shoot_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: sharpen.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sharpen.c,v
retrieving revision 1.26
diff -u -p -r1.26 sharpen.c
--- sharpen.c	2001/08/03 19:51:34	1.26
+++ sharpen.c	2001/11/28 20:42:24
@@ -524,10 +524,10 @@ sharpen_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: shift.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/shift.c,v
retrieving revision 1.20
diff -u -p -r1.20 shift.c
--- shift.c	2001/08/03 19:51:34	1.20
+++ shift.c	2001/11/28 20:42:24
@@ -373,10 +373,10 @@ shift_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, shift_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, shift_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: sinus.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sinus.c,v
retrieving revision 1.10
diff -u -p -r1.10 sinus.c
--- sinus.c	2001/11/11 18:35:25	1.10
+++ sinus.c	2001/11/28 20:42:30
@@ -1691,10 +1691,10 @@ sinus_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, sinus_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, sinus_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: snoise.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/snoise.c,v
retrieving revision 1.25
diff -u -p -r1.25 snoise.c
--- snoise.c	2001/08/03 19:51:34	1.25
+++ snoise.c	2001/11/28 20:42:33
@@ -512,10 +512,10 @@ solid_noise_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, dialog_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, dialog_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: sobel.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sobel.c,v
retrieving revision 1.19
diff -u -p -r1.19 sobel.c
--- sobel.c	2001/10/02 09:39:56	1.19
+++ sobel.c	2001/11/28 20:42:33
@@ -248,10 +248,10 @@ sobel_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, sobel_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, sobel_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: sparkle.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sparkle.c,v
retrieving revision 1.40
diff -u -p -r1.40 sparkle.c
--- sparkle.c	2001/08/03 19:51:34	1.40
+++ sparkle.c	2001/11/28 20:42:35
@@ -347,10 +347,10 @@ sparkle_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, sparkle_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, sparkle_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: spheredesigner.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/spheredesigner.c,v
retrieving revision 1.31
diff -u -p -r1.31 spheredesigner.c
--- spheredesigner.c	2001/11/11 18:35:25	1.31
+++ spheredesigner.c	2001/11/28 20:42:41
@@ -2205,12 +2205,12 @@ GtkWidget* makewindow (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, sphere_ok,
-			    NULL, NULL, &okbutton, TRUE, FALSE,
 			    _("Reset"), sphere_reset,
 			    NULL, NULL, &resetbutton, FALSE, FALSE,
 			    GTK_STOCK_CANCEL, sphere_cancel,
 			    NULL, NULL, &cancelbutton, FALSE, TRUE,
+			    GTK_STOCK_OK, sphere_ok,
+			    NULL, NULL, &okbutton, TRUE, FALSE,
 
 			    NULL);
 
Index: spread.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/spread.c,v
retrieving revision 1.26
diff -u -p -r1.26 spread.c
--- spread.c	2001/08/03 19:51:34	1.26
+++ spread.c	2001/11/28 20:42:43
@@ -379,10 +379,10 @@ spread_dialog (gint32        image_ID,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, spread_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, spread_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: struc.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/struc.c,v
retrieving revision 1.4
diff -u -p -r1.4 struc.c
--- struc.c	2001/08/03 19:51:34	1.4
+++ struc.c	2001/11/28 20:42:52
@@ -1278,10 +1278,10 @@ struc_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, struc_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, struc_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: sunras.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sunras.c,v
retrieving revision 1.27
diff -u -p -r1.27 sunras.c
--- sunras.c	2001/08/03 19:51:34	1.27
+++ sunras.c	2001/11/28 20:42:55
@@ -1587,10 +1587,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: tga.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/tga.c,v
retrieving revision 1.26
diff -u -p -r1.26 tga.c
--- tga.c	2001/08/03 19:51:34	1.26
+++ tga.c	2001/11/28 20:45:55
@@ -1172,10 +1172,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: threshold_alpha.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/threshold_alpha.c,v
retrieving revision 1.24
diff -u -p -r1.24 threshold_alpha.c
--- threshold_alpha.c	2001/08/03 19:51:34	1.24
+++ threshold_alpha.c	2001/11/28 20:45:55
@@ -268,10 +268,10 @@ threshold_alpha_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, threshold_alpha_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, threshold_alpha_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: tiff.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/tiff.c,v
retrieving revision 1.59
diff -u -p -r1.59 tiff.c
--- tiff.c	2001/09/17 18:11:15	1.59
+++ tiff.c	2001/11/28 20:45:59
@@ -1558,10 +1558,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: tile.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/tile.c,v
retrieving revision 1.22
diff -u -p -r1.22 tile.c
--- tile.c	2001/08/03 19:51:34	1.22
+++ tile.c	2001/11/28 20:46:00
@@ -402,10 +402,10 @@ tile_dialog (gint32 image_ID,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, tile_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, tile_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: tileit.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/tileit.c,v
retrieving revision 1.26
diff -u -p -r1.26 tileit.c
--- tileit.c	2001/11/11 18:35:25	1.26
+++ tileit.c	2001/11/28 20:46:02
@@ -384,10 +384,10 @@ tileit_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, tileit_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, tileit_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: video.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/video.c,v
retrieving revision 1.16
diff -u -p -r1.16 video.c
--- video.c	2001/08/03 19:51:34	1.16
+++ video.c	2001/11/28 20:48:49
@@ -2152,10 +2152,10 @@ video_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, video_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, video_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: vpropagate.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/vpropagate.c,v
retrieving revision 1.25
diff -u -p -r1.25 vpropagate.c
--- vpropagate.c	2001/08/03 19:51:34	1.25
+++ vpropagate.c	2001/11/28 20:48:51
@@ -938,10 +938,12 @@ vpropagate_dialog (GimpImageBaseType ima
 			 gimp_standard_help_func, "filters/vpropagate.html",
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
-			 GTK_STOCK_OK, vpropagate_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, vpropagate_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
Index: warp.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/warp.c,v
retrieving revision 1.25
diff -u -p -r1.25 warp.c
--- warp.c	2001/08/03 19:51:34	1.25
+++ warp.c	2001/11/28 20:51:52
@@ -426,10 +426,10 @@ warp_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, warp_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, warp_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: waves.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/waves.c,v
retrieving revision 1.20
diff -u -p -r1.20 waves.c
--- waves.c	2001/08/03 19:51:34	1.20
+++ waves.c	2001/11/28 20:51:54
@@ -346,10 +346,10 @@ pluginCoreIA (struct piArgs *argp,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, waves_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, waves_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: whirlpinch.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/whirlpinch.c,v
retrieving revision 1.26
diff -u -p -r1.26 whirlpinch.c
--- whirlpinch.c	2001/08/03 19:51:34	1.26
+++ whirlpinch.c	2001/11/28 20:51:56
@@ -802,10 +802,10 @@ whirl_pinch_dialog (void)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, dialog_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
+			    GTK_STOCK_OK, dialog_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
 
 			    NULL);
 
Index: wind.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/wind.c,v
retrieving revision 1.28
diff -u -p -r1.28 wind.c
--- wind.c	2001/08/03 19:51:34	1.28
+++ wind.c	2001/11/28 20:51:58
@@ -1009,10 +1009,10 @@ dialog_box (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: wmf.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/wmf.c,v
retrieving revision 1.20
diff -u -p -r1.20 wmf.c
--- wmf.c	2001/09/26 12:52:12	1.20
+++ wmf.c	2001/11/28 20:52:04
@@ -934,10 +934,10 @@ load_dialog (gchar *file_name)
 				  GTK_WIN_POS_MOUSE,
 				  FALSE, TRUE, FALSE,
 
-				  GTK_STOCK_OK, load_ok_callback,
-				  vals, NULL, NULL, TRUE, FALSE,
 				  GTK_STOCK_CANCEL, gtk_widget_destroy,
 				  NULL, 1, NULL, FALSE, TRUE,
+				  GTK_STOCK_OK, load_ok_callback,
+				  vals, NULL, NULL, TRUE, FALSE,
 
 				  NULL);
 
Index: xbm.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/xbm.c,v
retrieving revision 1.31
diff -u -p -r1.31 xbm.c
--- xbm.c	2001/11/11 18:35:25	1.31
+++ xbm.c	2001/11/28 20:49:36
@@ -1152,10 +1152,10 @@ save_dialog (gint32 drawable_ID)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
Index: xpm.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/xpm.c,v
retrieving revision 1.29
diff -u -p -r1.29 xpm.c
--- xpm.c	2001/08/03 19:51:34	1.29
+++ xpm.c	2001/11/28 20:49:37
@@ -797,10 +797,10 @@ save_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, save_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
+			 GTK_STOCK_OK, save_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
 
 			 NULL);
 
