From fdc31ec7d0891b6a9c0d312ea71b3bbad466d657 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 29 Nov 2001 13:23:44 +0000 Subject: [PATCH] use gimptool-1.3. 2001-11-29 Sven Neumann * 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 | 13 +++++++++++++ app/display/gimpdisplayshell-draw.c | 9 ++++++--- app/display/gimpdisplayshell.c | 9 ++++++--- app/gui/gui.c | 2 +- m4macros/gimp-1.4.m4 | 24 ++++++++++++------------ plug-ins/common/AlienMap.c | 8 +++++--- plug-ins/common/AlienMap2.c | 8 +++++--- plug-ins/common/CML_explorer.c | 8 ++++---- plug-ins/common/aa.c | 5 +++-- plug-ins/common/align_layers.c | 5 +++-- plug-ins/common/apply_lens.c | 5 +++-- plug-ins/common/blinds.c | 4 ++-- plug-ins/common/blur.c | 5 +++-- plug-ins/common/borderaverage.c | 5 +++-- plug-ins/common/bumpmap.c | 4 ++-- plug-ins/common/checkerboard.c | 4 ++-- plug-ins/common/colorify.c | 5 +++-- plug-ins/common/colortoalpha.c | 5 +++-- plug-ins/common/compose.c | 4 ++-- plug-ins/common/convmatrix.c | 4 ++-- plug-ins/common/csource.c | 4 ++-- plug-ins/common/cubism.c | 4 ++-- plug-ins/common/curve_bend.c | 4 ++-- plug-ins/common/decompose.c | 4 ++-- plug-ins/common/deinterlace.c | 4 ++-- plug-ins/common/depthmerge.c | 4 ++-- plug-ins/common/despeckle.c | 4 ++-- plug-ins/common/destripe.c | 4 ++-- plug-ins/common/diffraction.c | 4 ++-- plug-ins/common/displace.c | 4 ++-- plug-ins/common/edge.c | 4 ++-- plug-ins/common/emboss.c | 4 ++-- plug-ins/common/engrave.c | 4 ++-- plug-ins/common/exchange.c | 4 ++-- plug-ins/common/film.c | 4 ++-- plug-ins/common/flarefx.c | 4 ++-- plug-ins/common/fractaltrace.c | 4 ++-- plug-ins/common/gauss_iir.c | 10 ++++++---- plug-ins/common/gauss_rle.c | 10 ++++++---- plug-ins/common/gbr.c | 4 ++-- plug-ins/common/gicon.c | 4 ++-- plug-ins/common/gif.c | 8 ++++---- plug-ins/common/gih.c | 4 ++-- plug-ins/common/glasstile.c | 4 ++-- plug-ins/common/gqbist.c | 4 ++-- plug-ins/common/grid.c | 4 ++-- plug-ins/common/gtm.c | 4 ++-- plug-ins/common/hot.c | 1 + plug-ins/common/hrz.c | 4 ++-- plug-ins/common/illusion.c | 4 ++-- plug-ins/common/iwarp.c | 4 ++-- plug-ins/common/jigsaw.c | 4 ++-- plug-ins/common/jpeg.c | 4 ++-- plug-ins/common/lic.c | 4 ++-- plug-ins/common/mail.c | 4 ++-- plug-ins/common/mapcolor.c | 4 ++-- plug-ins/common/max_rgb.c | 5 +++-- plug-ins/common/mblur.c | 5 +++-- plug-ins/common/newsprint.c | 4 ++-- plug-ins/common/nlfilt.c | 4 ++-- plug-ins/common/noisify.c | 4 ++-- plug-ins/common/nova.c | 4 ++-- plug-ins/common/oilify.c | 4 ++-- plug-ins/common/papertile.c | 4 ++-- plug-ins/common/pat.c | 4 ++-- plug-ins/common/pixelize.c | 5 +++-- plug-ins/common/plasma.c | 4 ++-- plug-ins/common/plugin-browser.c | 4 ++-- plug-ins/common/plugindetails.c | 4 ++-- plug-ins/common/png.c | 4 ++-- plug-ins/common/pnm.c | 4 ++-- plug-ins/common/polar.c | 4 ++-- plug-ins/common/postscript.c | 8 ++++---- plug-ins/common/ps.c | 8 ++++---- plug-ins/common/psp.c | 4 ++-- plug-ins/common/randomize.c | 4 ++-- plug-ins/common/ripple.c | 4 ++-- plug-ins/common/sample_colorize.c | 4 ++-- plug-ins/common/scatter_hsv.c | 4 ++-- plug-ins/common/screenshot.c | 4 ++-- plug-ins/common/sel_gauss.c | 5 +++-- plug-ins/common/sharpen.c | 4 ++-- plug-ins/common/shift.c | 4 ++-- plug-ins/common/sinus.c | 4 ++-- plug-ins/common/smooth_palette.c | 5 +++-- plug-ins/common/snoise.c | 4 ++-- plug-ins/common/sobel.c | 4 ++-- plug-ins/common/sparkle.c | 4 ++-- plug-ins/common/spheredesigner.c | 4 ++-- plug-ins/common/spread.c | 4 ++-- plug-ins/common/struc.c | 4 ++-- plug-ins/common/sunras.c | 4 ++-- plug-ins/common/tga.c | 4 ++-- plug-ins/common/threshold_alpha.c | 4 ++-- plug-ins/common/tiff.c | 4 ++-- plug-ins/common/tile.c | 4 ++-- plug-ins/common/tileit.c | 4 ++-- plug-ins/common/video.c | 4 ++-- plug-ins/common/vpropagate.c | 6 ++++-- plug-ins/common/warp.c | 4 ++-- plug-ins/common/waves.c | 4 ++-- plug-ins/common/whirlpinch.c | 4 ++-- plug-ins/common/wind.c | 4 ++-- plug-ins/common/wmf.c | 4 ++-- plug-ins/common/xbm.c | 4 ++-- plug-ins/common/xpm.c | 4 ++-- plug-ins/dbbrowser/plugin-browser.c | 4 ++-- plug-ins/jpeg/jpeg-load.c | 4 ++-- plug-ins/jpeg/jpeg-load.h | 4 ++-- plug-ins/jpeg/jpeg-save.c | 4 ++-- plug-ins/jpeg/jpeg-save.h | 4 ++-- plug-ins/jpeg/jpeg.c | 4 ++-- plug-ins/jpeg/jpeg.h | 4 ++-- plug-ins/script-fu/script-fu-interface.c | 17 +++++++++-------- plug-ins/script-fu/script-fu-scripts.c | 17 +++++++++-------- 115 files changed, 307 insertions(+), 263 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf523b4d6d..88391e23fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-11-29 Sven Neumann + + * 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 * base/pixel-region.c base/tile-manager.c: a couple more diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 3fe4f10753..54531ee564 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/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 = - g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), image_name); + warning_buf = g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), + 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); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 3fe4f10753..54531ee564 100644 --- a/app/display/gimpdisplayshell.c +++ b/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 = - g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), image_name); + warning_buf = g_strdup_printf (_("Changes were made to %s.\nClose anyway?"), + 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); diff --git a/app/gui/gui.c b/app/gui/gui.c index 38651cc2f9..3359865f50 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -369,7 +369,7 @@ gui_really_quit_dialog (GCallback quit_func) gimp_menu_item_set_sensitive ("/File/Quit", FALSE); gimp_menu_item_set_sensitive ("/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, diff --git a/m4macros/gimp-1.4.m4 b/m4macros/gimp-1.4.m4 index ea9aa21d47..72c38b4d07 100644 --- a/m4macros/gimp-1.4.m4 +++ b/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("*** of GIMP required is %d.%d.%d. If gimptool-1.4 is correct, then it is\n", major, minor, micro); + 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.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("*** to point to the correct copy of gimptool-1.4, and remove the file\n"); + printf("*** If gimptool-1.3 was wrong, set the environment variable GIMPTOOL\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 diff --git a/plug-ins/common/AlienMap.c b/plug-ins/common/AlienMap.c index fb91dce836..edc479b85b 100644 --- a/plug-ins/common/AlienMap.c +++ b/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", diff --git a/plug-ins/common/AlienMap2.c b/plug-ins/common/AlienMap2.c index 840b1e2dc1..1e30083354 100644 --- a/plug-ins/common/AlienMap2.c +++ b/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", diff --git a/plug-ins/common/CML_explorer.c b/plug-ins/common/CML_explorer.c index ea08d88544..500d458183 100644 --- a/plug-ins/common/CML_explorer.c +++ b/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); diff --git a/plug-ins/common/aa.c b/plug-ins/common/aa.c index 3d08316e61..af46d89249 100644 --- a/plug-ins/common/aa.c +++ b/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", diff --git a/plug-ins/common/align_layers.c b/plug-ins/common/align_layers.c index bb452bdd9e..022d7b3954 100644 --- a/plug-ins/common/align_layers.c +++ b/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", diff --git a/plug-ins/common/apply_lens.c b/plug-ins/common/apply_lens.c index 563142680a..0efee7ec73 100644 --- a/plug-ins/common/apply_lens.c +++ b/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", diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index 5dec52c259..753fad764e 100644 --- a/plug-ins/common/blinds.c +++ b/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); diff --git a/plug-ins/common/blur.c b/plug-ins/common/blur.c index 492d457029..702d209d75 100644 --- a/plug-ins/common/blur.c +++ b/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", diff --git a/plug-ins/common/borderaverage.c b/plug-ins/common/borderaverage.c index f83950f738..df1325a8d3 100644 --- a/plug-ins/common/borderaverage.c +++ b/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", diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index 3bfd351423..385c930684 100644 --- a/plug-ins/common/bumpmap.c +++ b/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); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index ba6e1a055b..8c11514dff 100644 --- a/plug-ins/common/checkerboard.c +++ b/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); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index fa25303d86..8b8e6f99e3 100644 --- a/plug-ins/common/colorify.c +++ b/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", diff --git a/plug-ins/common/colortoalpha.c b/plug-ins/common/colortoalpha.c index a3107ecb60..96bc87c622 100644 --- a/plug-ins/common/colortoalpha.c +++ b/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", diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 2e3f73c497..4bd5e31c47 100644 --- a/plug-ins/common/compose.c +++ b/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); diff --git a/plug-ins/common/convmatrix.c b/plug-ins/common/convmatrix.c index 85b43b08d0..b9d298766b 100644 --- a/plug-ins/common/convmatrix.c +++ b/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); diff --git a/plug-ins/common/csource.c b/plug-ins/common/csource.c index b4de0ddac7..ba996dd65c 100644 --- a/plug-ins/common/csource.c +++ b/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); diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index 0c2a59c113..845f76d5fa 100644 --- a/plug-ins/common/cubism.c +++ b/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); diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index 6f9c6196f2..c2b0e05449 100644 --- a/plug-ins/common/curve_bend.c +++ b/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); diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 503fce794c..d0efa01c96 100644 --- a/plug-ins/common/decompose.c +++ b/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); diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index 74293e07cc..5c59e39209 100644 --- a/plug-ins/common/deinterlace.c +++ b/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); diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index f16e96004d..ec0010d549 100644 --- a/plug-ins/common/depthmerge.c +++ b/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); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index acfaf27f25..2d8efcf07f 100644 --- a/plug-ins/common/despeckle.c +++ b/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); diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index ce73fe7d35..a7a5a89e11 100644 --- a/plug-ins/common/destripe.c +++ b/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); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index b5a693e795..51ac98ac5d 100644 --- a/plug-ins/common/diffraction.c +++ b/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); diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index fd87c700b4..7e4aaada0f 100644 --- a/plug-ins/common/displace.c +++ b/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); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index d697c934a3..47f48a4ae3 100644 --- a/plug-ins/common/edge.c +++ b/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); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 20f61e3502..bcd682b850 100644 --- a/plug-ins/common/emboss.c +++ b/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); diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index 09f1e82d45..dfc2b297b1 100644 --- a/plug-ins/common/engrave.c +++ b/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); diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c index 4a80a38d59..b99199e442 100644 --- a/plug-ins/common/exchange.c +++ b/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); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index c61d7e05ce..4555b3c87c 100644 --- a/plug-ins/common/film.c +++ b/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); diff --git a/plug-ins/common/flarefx.c b/plug-ins/common/flarefx.c index 7ebb856aed..d0ade387a8 100644 --- a/plug-ins/common/flarefx.c +++ b/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); diff --git a/plug-ins/common/fractaltrace.c b/plug-ins/common/fractaltrace.c index 611fedf1cb..ace9834e48 100644 --- a/plug-ins/common/fractaltrace.c +++ b/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); diff --git a/plug-ins/common/gauss_iir.c b/plug-ins/common/gauss_iir.c index d75428591d..050a5e0a50 100644 --- a/plug-ins/common/gauss_iir.c +++ b/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", diff --git a/plug-ins/common/gauss_rle.c b/plug-ins/common/gauss_rle.c index 8eb05bc02d..6593a74494 100644 --- a/plug-ins/common/gauss_rle.c +++ b/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", diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index fe99308c6c..2bcecade3d 100644 --- a/plug-ins/common/gbr.c +++ b/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); diff --git a/plug-ins/common/gicon.c b/plug-ins/common/gicon.c index dd0eb724fe..8b5a7fb079 100644 --- a/plug-ins/common/gicon.c +++ b/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); diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 8c294b414b..6bcdbd813c 100644 --- a/plug-ins/common/gif.c +++ b/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); diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index ed39d8806c..0b063ec8db 100644 --- a/plug-ins/common/gih.c +++ b/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); diff --git a/plug-ins/common/glasstile.c b/plug-ins/common/glasstile.c index f76171e115..ecbfe05298 100644 --- a/plug-ins/common/glasstile.c +++ b/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); diff --git a/plug-ins/common/gqbist.c b/plug-ins/common/gqbist.c index 12ae0f2458..2c9e1fb09d 100644 --- a/plug-ins/common/gqbist.c +++ b/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); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 652555ab2c..a0bc7e1e6d 100644 --- a/plug-ins/common/grid.c +++ b/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); diff --git a/plug-ins/common/gtm.c b/plug-ins/common/gtm.c index dd915a752c..086ca37242 100644 --- a/plug-ins/common/gtm.c +++ b/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); diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 81e5f76c29..e7c40972b8 100644 --- a/plug-ins/common/hot.c +++ b/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, diff --git a/plug-ins/common/hrz.c b/plug-ins/common/hrz.c index 89e84e3525..19a3dd0ea6 100644 --- a/plug-ins/common/hrz.c +++ b/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); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index d4579f1dcc..ea78144cd4 100644 --- a/plug-ins/common/illusion.c +++ b/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); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 32261854b5..143ee9f8a1 100644 --- a/plug-ins/common/iwarp.c +++ b/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); diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index a78709bec0..1146081566 100644 --- a/plug-ins/common/jigsaw.c +++ b/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); diff --git a/plug-ins/common/jpeg.c b/plug-ins/common/jpeg.c index 01a098563f..40f08b0e14 100644 --- a/plug-ins/common/jpeg.c +++ b/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); diff --git a/plug-ins/common/lic.c b/plug-ins/common/lic.c index 678fd2a43e..1d40455e77 100644 --- a/plug-ins/common/lic.c +++ b/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); diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index 9c40054b1b..3103ab4af2 100644 --- a/plug-ins/common/mail.c +++ b/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); diff --git a/plug-ins/common/mapcolor.c b/plug-ins/common/mapcolor.c index b42a2a48ac..55b13cf4dc 100644 --- a/plug-ins/common/mapcolor.c +++ b/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); diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c index 731539b8c8..cd66191530 100644 --- a/plug-ins/common/max_rgb.c +++ b/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", diff --git a/plug-ins/common/mblur.c b/plug-ins/common/mblur.c index 909f85dd13..b14d366ff3 100644 --- a/plug-ins/common/mblur.c +++ b/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", diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 9ff905bc93..1f118595eb 100644 --- a/plug-ins/common/newsprint.c +++ b/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); diff --git a/plug-ins/common/nlfilt.c b/plug-ins/common/nlfilt.c index dbd4cbf92c..e2a8f2d5db 100644 --- a/plug-ins/common/nlfilt.c +++ b/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); diff --git a/plug-ins/common/noisify.c b/plug-ins/common/noisify.c index 48dd7185c7..8e015226b8 100644 --- a/plug-ins/common/noisify.c +++ b/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); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index 8c5c9bcaa7..b250172cc8 100644 --- a/plug-ins/common/nova.c +++ b/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); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index d1d2165fdc..d2c8791320 100644 --- a/plug-ins/common/oilify.c +++ b/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); diff --git a/plug-ins/common/papertile.c b/plug-ins/common/papertile.c index c4bf2e5751..9468819870 100644 --- a/plug-ins/common/papertile.c +++ b/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); diff --git a/plug-ins/common/pat.c b/plug-ins/common/pat.c index 819e3bf074..db78cdd5be 100644 --- a/plug-ins/common/pat.c +++ b/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); diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index 875f903797..d2c9b6ca4d 100644 --- a/plug-ins/common/pixelize.c +++ b/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", diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index d36d67391e..14c925d94a 100644 --- a/plug-ins/common/plasma.c +++ b/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); diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index 01babd28f6..735cc6c8b9 100644 --- a/plug-ins/common/plugin-browser.c +++ b/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); diff --git a/plug-ins/common/plugindetails.c b/plug-ins/common/plugindetails.c index 01babd28f6..735cc6c8b9 100644 --- a/plug-ins/common/plugindetails.c +++ b/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); diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index 8d1aa1ef2d..a2af7de32b 100644 --- a/plug-ins/common/png.c +++ b/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); diff --git a/plug-ins/common/pnm.c b/plug-ins/common/pnm.c index 97486ea5ee..5b76e616e1 100644 --- a/plug-ins/common/pnm.c +++ b/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); diff --git a/plug-ins/common/polar.c b/plug-ins/common/polar.c index 091b8ac017..fa061b4825 100644 --- a/plug-ins/common/polar.c +++ b/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); diff --git a/plug-ins/common/postscript.c b/plug-ins/common/postscript.c index 58aa738f7f..93ca934040 100644 --- a/plug-ins/common/postscript.c +++ b/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); diff --git a/plug-ins/common/ps.c b/plug-ins/common/ps.c index 58aa738f7f..93ca934040 100644 --- a/plug-ins/common/ps.c +++ b/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); diff --git a/plug-ins/common/psp.c b/plug-ins/common/psp.c index 5c7064942b..2b9173734b 100644 --- a/plug-ins/common/psp.c +++ b/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); diff --git a/plug-ins/common/randomize.c b/plug-ins/common/randomize.c index 242373838d..56b1a68651 100644 --- a/plug-ins/common/randomize.c +++ b/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); diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index e1b02fb54b..f1130c5ac7 100644 --- a/plug-ins/common/ripple.c +++ b/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); diff --git a/plug-ins/common/sample_colorize.c b/plug-ins/common/sample_colorize.c index c5086b6cbb..659aa0ed95 100644 --- a/plug-ins/common/sample_colorize.c +++ b/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); diff --git a/plug-ins/common/scatter_hsv.c b/plug-ins/common/scatter_hsv.c index d8e4c1b45c..c9cd97f92c 100644 --- a/plug-ins/common/scatter_hsv.c +++ b/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); diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c index 1c72be1e0e..69393a4d26 100644 --- a/plug-ins/common/screenshot.c +++ b/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); diff --git a/plug-ins/common/sel_gauss.c b/plug-ins/common/sel_gauss.c index 7284242bf8..96f5fab85d 100644 --- a/plug-ins/common/sel_gauss.c +++ b/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", diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index 0097a566d6..e8af716672 100644 --- a/plug-ins/common/sharpen.c +++ b/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); diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index 6dce30c842..0c37be257c 100644 --- a/plug-ins/common/shift.c +++ b/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); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index f7a060772f..5d5d9db701 100644 --- a/plug-ins/common/sinus.c +++ b/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); diff --git a/plug-ins/common/smooth_palette.c b/plug-ins/common/smooth_palette.c index 1e0ad96af8..edab58c889 100644 --- a/plug-ins/common/smooth_palette.c +++ b/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", diff --git a/plug-ins/common/snoise.c b/plug-ins/common/snoise.c index 40273cd600..8bbe983773 100644 --- a/plug-ins/common/snoise.c +++ b/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); diff --git a/plug-ins/common/sobel.c b/plug-ins/common/sobel.c index 6153c7c4bc..153e19706c 100644 --- a/plug-ins/common/sobel.c +++ b/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); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index e2a1cd8414..9e5add6677 100644 --- a/plug-ins/common/sparkle.c +++ b/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); diff --git a/plug-ins/common/spheredesigner.c b/plug-ins/common/spheredesigner.c index 763b94ac56..cf8fe9f55d 100644 --- a/plug-ins/common/spheredesigner.c +++ b/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); diff --git a/plug-ins/common/spread.c b/plug-ins/common/spread.c index bd4dc34778..3b273a665f 100644 --- a/plug-ins/common/spread.c +++ b/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); diff --git a/plug-ins/common/struc.c b/plug-ins/common/struc.c index b058485c01..90c3538883 100644 --- a/plug-ins/common/struc.c +++ b/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); diff --git a/plug-ins/common/sunras.c b/plug-ins/common/sunras.c index 49a7607500..3c3c38bcd1 100644 --- a/plug-ins/common/sunras.c +++ b/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); diff --git a/plug-ins/common/tga.c b/plug-ins/common/tga.c index 11a0211d37..f0b2242fe3 100644 --- a/plug-ins/common/tga.c +++ b/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); diff --git a/plug-ins/common/threshold_alpha.c b/plug-ins/common/threshold_alpha.c index afff449331..ce9697d181 100644 --- a/plug-ins/common/threshold_alpha.c +++ b/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); diff --git a/plug-ins/common/tiff.c b/plug-ins/common/tiff.c index 75b687060f..ea84b6163b 100644 --- a/plug-ins/common/tiff.c +++ b/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); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index c92a8d0579..6091e1571b 100644 --- a/plug-ins/common/tile.c +++ b/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); diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c index 73423f9a9e..50c85fbe1a 100644 --- a/plug-ins/common/tileit.c +++ b/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); diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index 599d1123d0..55e2a874ff 100644 --- a/plug-ins/common/video.c +++ b/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); diff --git a/plug-ins/common/vpropagate.c b/plug-ins/common/vpropagate.c index 1ea88ffbef..273a51592a 100644 --- a/plug-ins/common/vpropagate.c +++ b/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", diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index d82c175ce9..c586bdf47a 100644 --- a/plug-ins/common/warp.c +++ b/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); diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 54ac0e5763..33141c57f2 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -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); diff --git a/plug-ins/common/whirlpinch.c b/plug-ins/common/whirlpinch.c index 3988bfa3cd..6feaf7d523 100644 --- a/plug-ins/common/whirlpinch.c +++ b/plug-ins/common/whirlpinch.c @@ -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); diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index 0a53b41aa3..8b090542d3 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -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); diff --git a/plug-ins/common/wmf.c b/plug-ins/common/wmf.c index d8f17f188a..13eb161fa9 100644 --- a/plug-ins/common/wmf.c +++ b/plug-ins/common/wmf.c @@ -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); diff --git a/plug-ins/common/xbm.c b/plug-ins/common/xbm.c index 1bdbef995e..4635537337 100644 --- a/plug-ins/common/xbm.c +++ b/plug-ins/common/xbm.c @@ -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); diff --git a/plug-ins/common/xpm.c b/plug-ins/common/xpm.c index 1b358b8b7f..8aeaad90f4 100644 --- a/plug-ins/common/xpm.c +++ b/plug-ins/common/xpm.c @@ -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); diff --git a/plug-ins/dbbrowser/plugin-browser.c b/plug-ins/dbbrowser/plugin-browser.c index 01babd28f6..735cc6c8b9 100644 --- a/plug-ins/dbbrowser/plugin-browser.c +++ b/plug-ins/dbbrowser/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); diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c index 01a098563f..40f08b0e14 100644 --- a/plug-ins/jpeg/jpeg-load.c +++ b/plug-ins/jpeg/jpeg-load.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); diff --git a/plug-ins/jpeg/jpeg-load.h b/plug-ins/jpeg/jpeg-load.h index 01a098563f..40f08b0e14 100644 --- a/plug-ins/jpeg/jpeg-load.h +++ b/plug-ins/jpeg/jpeg-load.h @@ -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); diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 01a098563f..40f08b0e14 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.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); diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h index 01a098563f..40f08b0e14 100644 --- a/plug-ins/jpeg/jpeg-save.h +++ b/plug-ins/jpeg/jpeg-save.h @@ -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); diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c index 01a098563f..40f08b0e14 100644 --- a/plug-ins/jpeg/jpeg.c +++ b/plug-ins/jpeg/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); diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h index 01a098563f..40f08b0e14 100644 --- a/plug-ins/jpeg/jpeg.h +++ b/plug-ins/jpeg/jpeg.h @@ -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); diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index 42b7c46bcf..6830ccf2dd 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -1538,6 +1538,15 @@ script_fu_interface (SFScript *script) gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_container_add (GTK_CONTAINER (bbox), button); + gtk_widget_show (button); + + g_signal_connect_swapped (G_OBJECT (button), "clicked", + G_CALLBACK (script_fu_interface_quit), + script); + button = gtk_button_new_from_stock (GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); @@ -1548,14 +1557,6 @@ script_fu_interface (SFScript *script) G_CALLBACK (script_fu_ok_callback), script); - button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_container_add (GTK_CONTAINER (bbox), button); - gtk_widget_show (button); - - g_signal_connect_swapped (G_OBJECT (button), "clicked", - G_CALLBACK (script_fu_interface_quit), - script); /* The statusbar (well it's a faked statusbar...) */ hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/script-fu/script-fu-scripts.c b/plug-ins/script-fu/script-fu-scripts.c index 42b7c46bcf..6830ccf2dd 100644 --- a/plug-ins/script-fu/script-fu-scripts.c +++ b/plug-ins/script-fu/script-fu-scripts.c @@ -1538,6 +1538,15 @@ script_fu_interface (SFScript *script) gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_container_add (GTK_CONTAINER (bbox), button); + gtk_widget_show (button); + + g_signal_connect_swapped (G_OBJECT (button), "clicked", + G_CALLBACK (script_fu_interface_quit), + script); + button = gtk_button_new_from_stock (GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); @@ -1548,14 +1557,6 @@ script_fu_interface (SFScript *script) G_CALLBACK (script_fu_ok_callback), script); - button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_container_add (GTK_CONTAINER (bbox), button); - gtk_widget_show (button); - - g_signal_connect_swapped (G_OBJECT (button), "clicked", - G_CALLBACK (script_fu_interface_quit), - script); /* The statusbar (well it's a faked statusbar...) */ hbox = gtk_hbox_new (FALSE, 0);