diff --git a/ChangeLog b/ChangeLog index 462f1ab839..2a9112b9b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Jan 6 14:17:02 PST 1998 Manish Singh + + * configure.in: make it *really* check for gtk >= 0.99.1 this + time + + * plug-ins/gbr/gbr.c: check image type before save to prevent + image corruption. Only allow saves to non-alpha grayscale images + + * app/install.c: reduce the size of the install info dialog so it + fits better on 640x480 screen + Mon Jan 5 19:30:38 PST 1998 Manish Singh * app/by_color_select.c: fix for indexed images diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 2ced5fbae9..b348202caa 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -104,7 +104,7 @@ install_help (InstallCallback callback) vsb = gtk_vscrollbar_new (vadj); text = gtk_text_new (NULL, vadj); gtk_text_set_editable (GTK_TEXT (text), FALSE); - gtk_widget_set_usize (text, 450, 512); + gtk_widget_set_usize (text, 450, 475); table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2); diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index 2ced5fbae9..b348202caa 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -104,7 +104,7 @@ install_help (InstallCallback callback) vsb = gtk_vscrollbar_new (vadj); text = gtk_text_new (NULL, vadj); gtk_text_set_editable (GTK_TEXT (text), FALSE); - gtk_widget_set_usize (text, 450, 512); + gtk_widget_set_usize (text, 450, 475); table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2); diff --git a/app/install.c b/app/install.c index 2ced5fbae9..b348202caa 100644 --- a/app/install.c +++ b/app/install.c @@ -104,7 +104,7 @@ install_help (InstallCallback callback) vsb = gtk_vscrollbar_new (vadj); text = gtk_text_new (NULL, vadj); gtk_text_set_editable (GTK_TEXT (text), FALSE); - gtk_widget_set_usize (text, 450, 512); + gtk_widget_set_usize (text, 450, 475); table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2); diff --git a/app/user_install.c b/app/user_install.c index 2ced5fbae9..b348202caa 100644 --- a/app/user_install.c +++ b/app/user_install.c @@ -104,7 +104,7 @@ install_help (InstallCallback callback) vsb = gtk_vscrollbar_new (vadj); text = gtk_text_new (NULL, vadj); gtk_text_set_editable (GTK_TEXT (text), FALSE); - gtk_widget_set_usize (text, 450, 512); + gtk_widget_set_usize (text, 450, 475); table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2); diff --git a/configure.in b/configure.in index a370356ee6..626a7066c9 100644 --- a/configure.in +++ b/configure.in @@ -69,9 +69,9 @@ AC_DEFUN(AC_GIMP_CHECK, dnl Dont cache this as it depends on CFLAGS, LDFLAGS, etc AC_MSG_CHECKING([for glib and gtk >= 0.99.1]) - AC_TRY_COMPILE( + AC_TRY_LINK( [#include ], -[gtk_pixmap_unref ();], +[GtkPixmap *pixmap; gdk_pixmap_unref (pixmap); gtk_button_new();], gtk_found=yes, gtk_found=no) AC_MSG_RESULT($gtk_found) diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/FractalExplorer/FractalExplorer.c index 6675eb5b80..7d506ec6e5 100644 --- a/plug-ins/FractalExplorer/FractalExplorer.c +++ b/plug-ins/FractalExplorer/FractalExplorer.c @@ -130,7 +130,7 @@ run(char *name, int *nreturn_vals, GParam ** return_vals) { - GParam *values; + static GParam values[1]; gint32 image_ID; GRunModeType run_mode; double xhsiz, @@ -142,8 +142,6 @@ run(char *name, gchar * filname=NULL; gchar load_buf[MAX_LOAD_LINE]; - values = g_new(GParam, 1); - run_mode = param[0].data.d_int32; values[0].type = PARAM_STATUS; diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index b2d1489120..64dbb1e074 100644 --- a/plug-ins/common/gbr.c +++ b/plug-ins/common/gbr.c @@ -111,7 +111,7 @@ query () "Tim Newsome", "1997", "/GBR", - "RGB*, GRAY*", + "GRAY", PROC_PLUG_IN, nsave_args, 0, save_args, NULL); @@ -271,6 +271,9 @@ static gint save_image (char *filename, gint32 image_ID, gint32 drawable_ID) { GPixelRgn pixel_rgn; char *temp; + if (gimp_drawable_type(drawable_ID) != GRAY_IMAGE) + return FALSE; + temp = g_malloc(strlen (filename) + 10); sprintf(temp, "Saving %s:", filename); gimp_progress_init(temp); diff --git a/plug-ins/gbr/gbr.c b/plug-ins/gbr/gbr.c index b2d1489120..64dbb1e074 100644 --- a/plug-ins/gbr/gbr.c +++ b/plug-ins/gbr/gbr.c @@ -111,7 +111,7 @@ query () "Tim Newsome", "1997", "/GBR", - "RGB*, GRAY*", + "GRAY", PROC_PLUG_IN, nsave_args, 0, save_args, NULL); @@ -271,6 +271,9 @@ static gint save_image (char *filename, gint32 image_ID, gint32 drawable_ID) { GPixelRgn pixel_rgn; char *temp; + if (gimp_drawable_type(drawable_ID) != GRAY_IMAGE) + return FALSE; + temp = g_malloc(strlen (filename) + 10); sprintf(temp, "Saving %s:", filename); gimp_progress_init(temp);