use gimptool-1.3.

2001-11-29  Sven Neumann  <sven@gimp.org>

	* m4macros/gimp-1.4.m4: use gimptool-1.3.

	* app/display/gimpdisplayshell.c
	* app/gui/gui.c: cosmetic changes from Guillermo S. Romero.

	* plug-ins/common/*.c
	* plug-ins/script-fu/script-fu-scripts.c: applied patches from
	Guillermo S. Romero that change the button ordering. I had to redo
	some of the changes by hand since the patches didn't apply cleanly.
	Hopefully got it all right...

ChangeLog

@@ -1,3 +1,16 @@
+2001-11-29  Sven Neumann  <sven@gimp.org>
+
+	* m4macros/gimp-1.4.m4: use gimptool-1.3.
+
+	* app/display/gimpdisplayshell.c
+	* app/gui/gui.c: cosmetic changes from Guillermo S. Romero.
+
+	* plug-ins/common/*.c
+	* plug-ins/script-fu/script-fu-scripts.c: applied patches from
+	Guillermo S. Romero that change the button ordering. I had to redo
+	some of the changes by hand since the patches didn't apply cleanly.
+	Hopefully got it all right...
+
 2001-11-28  Kelly Martin  <kmartin@pyrzqxgl.org>
 
 	* base/pixel-region.c base/tile-manager.c: a couple more

app/display/gimpdisplayshell-draw.c

@@ -2333,6 +2333,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
                                          const gchar      *image_name)
 {
   GtkWidget *mbox;
+  gchar     *title_buf;
   gchar     *warning_buf;
 
   if (shell->warning_dialog)
@@ -2341,11 +2342,12 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
       return;
     }
 
-  warning_buf =
+  warning_buf = g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), 
-    g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), image_name);
+                                 image_name);
+  title_buf = g_strdup_printf (_("Close %s?"), image_name);
 
   shell->warning_dialog = mbox =
-    gimp_query_boolean_box (image_name,
+    gimp_query_boolean_box (title_buf,
 			    gimp_standard_help_func,
 			    "dialogs/really_close.html",
 			    FALSE,
@@ -2355,6 +2357,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
 			    gimp_display_shell_close_warning_callback,
 			    shell);
 
+  g_free (title_buf);
   g_free (warning_buf);
 
   gtk_widget_show (mbox);

app/display/gimpdisplayshell.c

@@ -2333,6 +2333,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
                                          const gchar      *image_name)
 {
   GtkWidget *mbox;
+  gchar     *title_buf;
   gchar     *warning_buf;
 
   if (shell->warning_dialog)
@@ -2341,11 +2342,12 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
       return;
     }
 
-  warning_buf =
+  warning_buf = g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), 
-    g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), image_name);
+                                 image_name);
+  title_buf = g_strdup_printf (_("Close %s?"), image_name);
 
   shell->warning_dialog = mbox =
-    gimp_query_boolean_box (image_name,
+    gimp_query_boolean_box (title_buf,
 			    gimp_standard_help_func,
 			    "dialogs/really_close.html",
 			    FALSE,
@@ -2355,6 +2357,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
 			    gimp_display_shell_close_warning_callback,
 			    shell);
 
+  g_free (title_buf);
   g_free (warning_buf);
 
   gtk_widget_show (mbox);

app/gui/gui.c

@@ -369,7 +369,7 @@ gui_really_quit_dialog (GCallback quit_func)
   gimp_menu_item_set_sensitive ("<Toolbox>/File/Quit", FALSE);
   gimp_menu_item_set_sensitive ("<Image>/File/Quit", FALSE);
 
-  dialog = gimp_query_boolean_box (_("Really Quit?"),
+  dialog = gimp_query_boolean_box (_("Quit the GIMP?"),
 				   gimp_standard_help_func,
 				   "dialogs/really_quit.html",
 				   TRUE,

m4macros/gimp-1.4.m4

@@ -7,7 +7,7 @@ dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
 dnl
 AC_DEFUN(AM_PATH_GIMP_1_4,
 [dnl 
-dnl Get the cflags and libraries from the gimptool-1.4 script
+dnl Get the cflags and libraries from the gimptool-1.3 script
 dnl
 AC_ARG_WITH(gimp-prefix,[  --with-gimp-prefix=PFX  Prefix where GIMP is installed (optional)],
             gimptool_prefix="$withval", gimptool_prefix="")
@@ -19,17 +19,17 @@ AC_ARG_ENABLE(gimptest, [  --disable-gimptest      Do not try to compile and run
   if test x$gimptool_exec_prefix != x ; then
      gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix"
      if test x${GIMPTOOL+set} != xset ; then
-        GIMPTOOL=$gimptool_exec_prefix/bin/gimptool-1.4
+        GIMPTOOL=$gimptool_exec_prefix/bin/gimptool-1.3
      fi
   fi
   if test x$gimptool_prefix != x ; then
      gimptool_args="$gimptool_args --prefix=$gimptool_prefix"
      if test x${GIMPTOOL+set} != xset ; then
-        GIMPTOOL=$gimptool_prefix/bin/gimptool-1.4
+        GIMPTOOL=$gimptool_prefix/bin/gimptool-1.3
      fi
   fi
 
-  AC_PATH_PROG(GIMPTOOL, gimptool-1.4, no)
+  AC_PATH_PROG(GIMPTOOL, gimptool-1.3, no)
   min_gimp_version=ifelse([$1], ,1.3.0,$1)
   AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
   no_gimp=""
@@ -69,7 +69,7 @@ AC_ARG_ENABLE(gimptest, [  --disable-gimptest      Do not try to compile and run
       LIBS="$LIBS $GIMP_LIBS"
 dnl
 dnl Now check if the installed GIMP is sufficiently new. (Also sanity
-dnl checks the results of gimptool-1.4 to some extent
+dnl checks the results of gimptool-1.3 to some extent
 dnl
       rm -f conf.gimptest
       AC_TRY_RUN([
@@ -108,11 +108,11 @@ int main ()
     }
   else
     {
-      printf("\n*** 'gimptool-1.4 --version' returned %d.%d.%d, but the minimum version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version);
+      printf("\n*** 'gimptool-1.3 --version' returned %d.%d.%d, but the minimum version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version);
-      printf("*** of GIMP required is %d.%d.%d. If gimptool-1.4 is correct, then it is\n", major, minor, micro);
+      printf("*** of GIMP required is %d.%d.%d. If gimptool-1.3 is correct, then it is\n", major, minor, micro);
       printf("*** best to upgrade to the required version.\n");
-      printf("*** If gimptool-1.4 was wrong, set the environment variable GIMPTOOL\n");
+      printf("*** If gimptool-1.3 was wrong, set the environment variable GIMPTOOL\n");
-      printf("*** to point to the correct copy of gimptool-1.4, and remove the file\n");
+      printf("*** to point to the correct copy of gimptool-1.3, and remove the file\n");
       printf("*** config.cache before re-running configure\n");
       return 1;
     }
@@ -129,10 +129,10 @@ int main ()
   else
      AC_MSG_RESULT(no)
      if test "$GIMPTOOL" = "no" ; then
-       echo "*** The gimptool-1.4 script installed by GIMP could not be found"
+       echo "*** The gimptool-1.3 script installed by GIMP could not be found"
        echo "*** If GIMP was installed in PREFIX, make sure PREFIX/bin is in"
        echo "*** your path, or set the GIMPTOOL environment variable to the"
-       echo "*** full path to gimptool-1.4."
+       echo "*** full path to gimptool-1.3."
      else
        if test -f conf.gimptest ; then
         :
@@ -164,7 +164,7 @@ GimpPlugInInfo PLUG_IN_INFO =
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GIMP was incorrectly installed"
           echo "*** or that you have moved GIMP since it was installed. In the latter case, you"
-          echo "*** may want to edit the gimptool-1.4 script: $GIMPTOOL" ])
+          echo "*** may want to edit the gimptool-1.3 script: $GIMPTOOL" ])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi

plug-ins/common/AlienMap.c

@@ -1394,13 +1394,15 @@ alienmap_dialog (void)
 		     GTK_WIN_POS_MOUSE,
 		     FALSE, TRUE, FALSE,
 
-		     _("About..."), alienmap_logo_dialog,
+		     _("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);
 
   gtk_signal_connect (GTK_OBJECT (dialog), "destroy",

plug-ins/common/AlienMap2.c

@@ -1386,13 +1386,15 @@ alienmap2_dialog (void)
 		     GTK_WIN_POS_MOUSE,
 		     FALSE, TRUE, FALSE,
 
-		     _("About..."), alienmap2_logo_dialog,
+		     _("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);
 
   gtk_signal_connect (GTK_OBJECT (dialog), "destroy",

plug-ins/common/CML_explorer.c

@@ -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);
 

plug-ins/common/aa.c

@@ -341,11 +341,12 @@ 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);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/align_layers.c

@@ -422,11 +422,12 @@ 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);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/apply_lens.c

@@ -393,11 +393,12 @@ 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);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/blinds.c

@@ -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);
 

plug-ins/common/blur.c

@@ -610,11 +610,12 @@ blur_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, blur_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, blur_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/borderaverage.c

@@ -372,11 +372,12 @@ borderaverage_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, borderaverage_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, borderaverage_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/bumpmap.c

@@ -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);
 

plug-ins/common/checkerboard.c

@@ -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);
 

plug-ins/common/colorify.c

@@ -308,11 +308,12 @@ colorify_dialog (GimpRGB *color)
 			    GTK_WIN_POS_MOUSE,
 			    FALSE, TRUE, FALSE,
 
-			    GTK_STOCK_OK, colorify_ok_callback,
-			    NULL, NULL, NULL, TRUE, FALSE,
 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
 			    NULL, 1, NULL, FALSE, TRUE,
 
+			    GTK_STOCK_OK, colorify_ok_callback,
+			    NULL, NULL, NULL, TRUE, FALSE,
+
 			    NULL);
 
   gtk_signal_connect (GTK_OBJECT (dialog), "destroy",

plug-ins/common/colortoalpha.c

@@ -418,11 +418,12 @@ colortoalpha_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, colortoalpha_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, colortoalpha_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/compose.c

@@ -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);
 

plug-ins/common/convmatrix.c

@@ -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);
 

plug-ins/common/csource.c

@@ -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);
 

plug-ins/common/cubism.c

@@ -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);
 

plug-ins/common/curve_bend.c

@@ -1366,10 +1366,10 @@ bender_new_dialog (GimpDrawable *drawable)
 			       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);
 

plug-ins/common/decompose.c

@@ -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);
 

plug-ins/common/deinterlace.c

@@ -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);
 

plug-ins/common/depthmerge.c

@@ -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);
 

plug-ins/common/despeckle.c

@@ -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);
 

plug-ins/common/destripe.c

@@ -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);
 

plug-ins/common/diffraction.c

@@ -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);
 

plug-ins/common/displace.c

@@ -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);
 

plug-ins/common/edge.c

@@ -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);
 

plug-ins/common/emboss.c

@@ -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);
 

plug-ins/common/engrave.c

@@ -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);
 

plug-ins/common/exchange.c

@@ -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);
 

plug-ins/common/film.c

@@ -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);
 

plug-ins/common/flarefx.c

@@ -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);
 

plug-ins/common/fractaltrace.c

@@ -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);
 

plug-ins/common/gauss_iir.c

@@ -363,11 +363,12 @@ gauss_iir_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, gauss_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, gauss_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
@@ -446,11 +447,12 @@ gauss_iir2_dialog (gint32        image_ID,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, gauss_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, gauss_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/gauss_rle.c

@@ -358,11 +358,12 @@ gauss_rle_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 TRUE, FALSE, TRUE,
 
-			 GTK_STOCK_OK, gauss_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, gauss_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
@@ -441,11 +442,12 @@ gauss_rle2_dialog (gint32        image_ID,
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, gauss_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, gauss_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/gbr.c

@@ -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);
 

plug-ins/common/gicon.c

@@ -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);
 

plug-ins/common/gif.c

@@ -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);
 

plug-ins/common/gih.c

@@ -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);
 

plug-ins/common/glasstile.c

@@ -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);
 

plug-ins/common/gqbist.c

@@ -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);
 

plug-ins/common/grid.c

@@ -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);
 

plug-ins/common/gtm.c

@@ -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);
 

plug-ins/common/hot.c

@@ -588,6 +588,7 @@ pluginCoreIA (struct piArgs *argp)
 
 			 GTK_STOCK_OK, hot_ok_callback,
 			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 

plug-ins/common/hrz.c

@@ -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);
 

plug-ins/common/illusion.c

@@ -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);
 

plug-ins/common/iwarp.c

@@ -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);
 

plug-ins/common/jigsaw.c

@@ -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);
 

plug-ins/common/jpeg.c

@@ -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);
 

plug-ins/common/lic.c

@@ -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);
 

plug-ins/common/mail.c

@@ -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);
 

plug-ins/common/mapcolor.c

@@ -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);
 

plug-ins/common/max_rgb.c

@@ -345,11 +345,12 @@ dialog (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);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/mblur.c

@@ -759,11 +759,12 @@ mblur_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);
 
   gtk_signal_connect (GTK_OBJECT (dialog), "destroy",

plug-ins/common/newsprint.c

@@ -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);
 

plug-ins/common/nlfilt.c

@@ -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);
 

plug-ins/common/noisify.c

@@ -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);
 

plug-ins/common/nova.c

@@ -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);
 

plug-ins/common/oilify.c

@@ -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);
 

plug-ins/common/papertile.c

@@ -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);
 

plug-ins/common/pat.c

@@ -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);
 

plug-ins/common/pixelize.c

@@ -322,11 +322,12 @@ pixelize_dialog (GimpDrawable *drawable)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, pixelize_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, pixelize_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/plasma.c

@@ -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);
 

plug-ins/common/plugin-browser.c

@@ -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);
 

plug-ins/common/plugindetails.c

@@ -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);
 

plug-ins/common/png.c

@@ -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);
 

plug-ins/common/pnm.c

@@ -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);
 

plug-ins/common/polar.c

@@ -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);
 

plug-ins/common/postscript.c

@@ -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);
 

plug-ins/common/ps.c

@@ -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);
 

plug-ins/common/psp.c

@@ -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);
 

plug-ins/common/randomize.c

@@ -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);
 

plug-ins/common/ripple.c

@@ -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);
 

plug-ins/common/sample_colorize.c

@@ -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);
 

plug-ins/common/scatter_hsv.c

@@ -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);
 

plug-ins/common/screenshot.c

@@ -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);
 

plug-ins/common/sel_gauss.c

@@ -239,11 +239,12 @@ sel_gauss_dialog (void)
 			 GTK_WIN_POS_MOUSE,
 			 FALSE, TRUE, FALSE,
 
-			 GTK_STOCK_OK, sel_gauss_ok_callback,
-			 NULL, NULL, NULL, TRUE, FALSE,
 			 GTK_STOCK_CANCEL, gtk_widget_destroy,
 			 NULL, 1, NULL, FALSE, TRUE,
 
+			 GTK_STOCK_OK, sel_gauss_ok_callback,
+			 NULL, NULL, NULL, TRUE, FALSE,
+
 			 NULL);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/sharpen.c

@@ -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);
 

plug-ins/common/shift.c

@@ -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);
 

plug-ins/common/sinus.c

@@ -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);
 

plug-ins/common/smooth_palette.c

@@ -400,11 +400,12 @@ 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);
 
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",

plug-ins/common/snoise.c

@@ -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);
 

plug-ins/common/sobel.c

@@ -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);
 

plug-ins/common/sparkle.c

@@ -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);
 

plug-ins/common/spheredesigner.c

@@ -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);
 

plug-ins/common/spread.c

@@ -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);
 

plug-ins/common/struc.c

@@ -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);
 

plug-ins/common/sunras.c

@@ -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);
 

plug-ins/common/tga.c

@@ -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);
 

plug-ins/common/threshold_alpha.c

@@ -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);
 

plug-ins/common/tiff.c

@@ -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);
 

plug-ins/common/tile.c

@@ -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);
 

plug-ins/common/tileit.c

@@ -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);
 

plug-ins/common/video.c

@@ -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);
 

plug-ins/common/vpropagate.c

@@ -938,10 +938,12 @@ vpropagate_dialog (GimpImageBaseType image_type)
 			 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",

plug-ins/common/warp.c

@@ -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);