Commit fdc31ec7 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

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...
parent 536747c2
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
......
......@@ -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);
......
......@@ -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);
......
......@@ -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,
......
......@@ -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
......
......@@ -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",
......
......@@ -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",
......
......@@ -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);
......
......@@ -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",
......
......@@ -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",
......
......@@ -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",
......
......@@ -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);
......
......@@ -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",
......
......@@ -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",
......
......@@ -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);
......
......@@ -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);
......
......@@ -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",
......
......@@ -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",
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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",
......
......@@ -358,11 +358,12 @@ gauss_rle_dialog (void)
GTK_WIN_POS_MOUSE,
TRUE, FALSE, TRUE,
GTK_STOCK_OK, gauss_ok_callback,