callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug that was introduced by the latest portability changes

Browse Source 
Tue Jul 27 22:47:33 MEST 1999  Sven Neumann <sven@gimp.org>

        * plug-ins/script-fu/script-fu-scripts.c: fixed a bug that was
        introduced by the latest portability changes
This commit is contained in:
MEST 1999 Sven Neumann
1999-07-27 20:49:55 +00:00
committed by Sven Neumann
parent 5d06b76d4b
commit 0a2a24c1e5
3 changed files with 123 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jul 27 22:47:33 MEST 1999 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-scripts.c: fixed a bug that was
introduced by the latest portability changes
Tue Jul 27 01:21:02 1999 Jay Cox (jaycox@earthlink.net) Tue Jul 27 01:21:02 1999 Jay Cox (jaycox@earthlink.net)
* app/clone.c: more cursor support. * app/clone.c: more cursor support.

114
plug-ins/script-fu/script-fu-interface.c
View File

@ -163,22 +163,22 @@ extern long nlength (LISP obj);
* Local Functions * Local Functions
*/ */
static void script_fu_script_proc (char *name, static void script_fu_script_proc (char *name,
int nparams, int nparams,
GParam *params, GParam *params,
int *nreturn_vals, int *nreturn_vals,
GParam **return_vals); GParam **return_vals);
static SFScript *script_fu_find_script (gchar *script_name); static SFScript *script_fu_find_script (gchar *script_name);
static void script_fu_free_script (SFScript *script); static void script_fu_free_script (SFScript *script);
static void script_fu_enable_cc (void); static void script_fu_enable_cc (void);
static void script_fu_disable_cc (gint err_msg); static void script_fu_disable_cc (gint err_msg);
static void script_fu_interface (SFScript *script); static void script_fu_interface (SFScript *script);
static void script_fu_color_preview (GtkWidget *preview, static void script_fu_color_preview (GtkWidget *preview,
gdouble *color); gdouble *color);
static void script_fu_font_preview (GtkWidget *preview, static void script_fu_font_preview (GtkWidget *preview,
gchar *fontname); gchar *fontname);
static void script_fu_cleanup_widgets (SFScript *script); static void script_fu_cleanup_widgets (SFScript *script);
static void script_fu_ok_callback (GtkWidget *widget, static void script_fu_ok_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void script_fu_close_callback (GtkWidget *widget, static void script_fu_close_callback (GtkWidget *widget,
@ -216,19 +216,19 @@ static void script_fu_about_dialog_close (GtkWidget *widget,
static gint script_fu_about_dialog_delete (GtkWidget *widget, static gint script_fu_about_dialog_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
static void script_fu_pattern_preview (gchar *name, static void script_fu_pattern_preview (gchar *name,
gint width, gint width,
gint height, gint height,
gint bytes, gint bytes,
gchar * mask_data, gchar *mask_data,
gint closing, gint closing,
gpointer udata); gpointer udata);
static void script_fu_gradient_preview (gchar *name, static void script_fu_gradient_preview (gchar *name,
gint width, gint width,
gdouble * mask_data, gdouble *mask_data,
gint closing, gint closing,
gpointer udata); gpointer udata);
static void script_fu_brush_preview (char *, /* Name */ static void script_fu_brush_preview (char *, /* Name */
gdouble, /* opacity */ gdouble, /* opacity */
@ -1436,12 +1436,12 @@ script_fu_color_preview (GtkWidget *preview,
static void static void
script_fu_pattern_preview (gchar *name, script_fu_pattern_preview (gchar *name,
gint width, gint width,
gint height, gint height,
gint bytes, gint bytes,
gchar * mask_data, gchar *mask_data,
gint closing, gint closing,
gpointer udata) gpointer udata)
{ {
gchar ** pname = (gchar **) udata; gchar ** pname = (gchar **) udata;
g_free(*pname); g_free(*pname);
@ -1450,10 +1450,10 @@ script_fu_pattern_preview (gchar *name,
static void static void
script_fu_gradient_preview(gchar *name, script_fu_gradient_preview(gchar *name,
gint width, gint width,
gdouble * mask_data, gdouble *mask_data,
gint closing, gint closing,
gpointer udata) gpointer udata)
{ {
gchar ** pname = (gchar **) udata; gchar ** pname = (gchar **) udata;
g_free(*pname); g_free(*pname);
@ -1461,15 +1461,15 @@ script_fu_gradient_preview(gchar *name,
} }
static void static void
script_fu_brush_preview(char * name, /* Name */ script_fu_brush_preview(char *name, /* Name */
gdouble opacity, /* opacity */ gdouble opacity, /* opacity */
gint spacing, /* spacing */ gint spacing, /* spacing */
gint paint_mode, /* paint_mode */ gint paint_mode, /* paint_mode */
gint width, /* width */ gint width, /* width */
gint height, /* height */ gint height, /* height */
gchar * mask_data, /* mask data */ gchar *mask_data, /* mask data */
gint closing, /* dialog closing */ gint closing, /* dialog closing */
gpointer udata/* user data */) gpointer udata) /* user data */
{ {
SFBrush *brush = (SFBrush *)udata; SFBrush *brush = (SFBrush *)udata;
g_free(brush->name); g_free(brush->name);
@ -1675,7 +1675,7 @@ script_fu_ok_callback (GtkWidget *widget,
case SF_STRING: case SF_STRING:
text = gtk_entry_get_text (GTK_ENTRY (script->args_widgets[i])); text = gtk_entry_get_text (GTK_ENTRY (script->args_widgets[i]));
g_free (script->arg_values[i].sfa_value); g_free (script->arg_values[i].sfa_value);
script->arg_values[i].sfa_value = text; script->arg_values[i].sfa_value = g_strdup (text);
escaped = g_strescape (text); escaped = g_strescape (text);
g_snprintf (buffer, MAX_STRING_LENGTH, "\"%s\"", escaped); g_snprintf (buffer, MAX_STRING_LENGTH, "\"%s\"", escaped);
g_free (escaped); g_free (escaped);
@ -1690,8 +1690,10 @@ script_fu_ok_callback (GtkWidget *widget,
text = buffer; text = buffer;
break; break;
case SF_SPINNER: case SF_SPINNER:
script->arg_values[i].sfa_adjustment.value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (script->args_widgets[i])); script->arg_values[i].sfa_adjustment.value =
g_snprintf (buffer, 24, "%f", script->arg_values[i].sfa_adjustment.value); text = buffer; gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (script->args_widgets[i]));
g_snprintf (buffer, 24, "%f", script->arg_values[i].sfa_adjustment.value);
text = buffer;
break; break;
default: default:
break; break;
@ -2051,7 +2053,7 @@ script_fu_color_preview_callback (GtkWidget *widget,
static void static void
script_fu_color_preview_changed (GtkWidget *widget, script_fu_color_preview_changed (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFColor *color; SFColor *color;
@ -2063,7 +2065,7 @@ script_fu_color_preview_changed (GtkWidget *widget,
static void static void
script_fu_color_preview_cancel (GtkWidget *widget, script_fu_color_preview_cancel (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFColor *color; SFColor *color;
@ -2080,8 +2082,8 @@ script_fu_color_preview_cancel (GtkWidget *widget,
static gint static gint
script_fu_color_preview_delete (GtkWidget *widget, script_fu_color_preview_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
script_fu_color_preview_cancel (widget, data); script_fu_color_preview_cancel (widget, data);
return TRUE; return TRUE;
@ -2136,7 +2138,7 @@ script_fu_font_preview_callback (GtkWidget *widget,
static void static void
script_fu_font_dialog_ok (GtkWidget *widget, script_fu_font_dialog_ok (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFFont *font; SFFont *font;
gchar *fontname; gchar *fontname;
@ -2157,7 +2159,7 @@ script_fu_font_dialog_ok (GtkWidget *widget,
static void static void
script_fu_font_dialog_cancel (GtkWidget *widget, script_fu_font_dialog_cancel (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFFont *font; SFFont *font;
@ -2168,8 +2170,8 @@ script_fu_font_dialog_cancel (GtkWidget *widget,
static gint static gint
script_fu_font_dialog_delete (GtkWidget *widget, script_fu_font_dialog_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
script_fu_font_dialog_cancel (widget, data); script_fu_font_dialog_cancel (widget, data);
return TRUE; return TRUE;
@ -2178,7 +2180,7 @@ script_fu_font_dialog_delete (GtkWidget *widget,
static void static void
script_fu_about_dialog_close (GtkWidget *widget, script_fu_about_dialog_close (GtkWidget *widget,
gpointer data) gpointer data)
{ {
if (data != NULL) if (data != NULL)
gtk_widget_hide (GTK_WIDGET (data)); gtk_widget_hide (GTK_WIDGET (data));
@ -2186,9 +2188,11 @@ script_fu_about_dialog_close (GtkWidget *widget,
static gint static gint
script_fu_about_dialog_delete (GtkWidget *widget, script_fu_about_dialog_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
script_fu_about_dialog_close (widget, data); script_fu_about_dialog_close (widget, data);
return TRUE; return TRUE;
} }

114
plug-ins/script-fu/script-fu-scripts.c
View File

@ -163,22 +163,22 @@ extern long nlength (LISP obj);
* Local Functions * Local Functions
*/ */
static void script_fu_script_proc (char *name, static void script_fu_script_proc (char *name,
int nparams, int nparams,
GParam *params, GParam *params,
int *nreturn_vals, int *nreturn_vals,
GParam **return_vals); GParam **return_vals);
static SFScript *script_fu_find_script (gchar *script_name); static SFScript *script_fu_find_script (gchar *script_name);
static void script_fu_free_script (SFScript *script); static void script_fu_free_script (SFScript *script);
static void script_fu_enable_cc (void); static void script_fu_enable_cc (void);
static void script_fu_disable_cc (gint err_msg); static void script_fu_disable_cc (gint err_msg);
static void script_fu_interface (SFScript *script); static void script_fu_interface (SFScript *script);
static void script_fu_color_preview (GtkWidget *preview, static void script_fu_color_preview (GtkWidget *preview,
gdouble *color); gdouble *color);
static void script_fu_font_preview (GtkWidget *preview, static void script_fu_font_preview (GtkWidget *preview,
gchar *fontname); gchar *fontname);
static void script_fu_cleanup_widgets (SFScript *script); static void script_fu_cleanup_widgets (SFScript *script);
static void script_fu_ok_callback (GtkWidget *widget, static void script_fu_ok_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void script_fu_close_callback (GtkWidget *widget, static void script_fu_close_callback (GtkWidget *widget,
@ -216,19 +216,19 @@ static void script_fu_about_dialog_close (GtkWidget *widget,
static gint script_fu_about_dialog_delete (GtkWidget *widget, static gint script_fu_about_dialog_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
static void script_fu_pattern_preview (gchar *name, static void script_fu_pattern_preview (gchar *name,
gint width, gint width,
gint height, gint height,
gint bytes, gint bytes,
gchar * mask_data, gchar *mask_data,
gint closing, gint closing,
gpointer udata); gpointer udata);
static void script_fu_gradient_preview (gchar *name, static void script_fu_gradient_preview (gchar *name,
gint width, gint width,
gdouble * mask_data, gdouble *mask_data,
gint closing, gint closing,
gpointer udata); gpointer udata);
static void script_fu_brush_preview (char *, /* Name */ static void script_fu_brush_preview (char *, /* Name */
gdouble, /* opacity */ gdouble, /* opacity */
@ -1436,12 +1436,12 @@ script_fu_color_preview (GtkWidget *preview,
static void static void
script_fu_pattern_preview (gchar *name, script_fu_pattern_preview (gchar *name,
gint width, gint width,
gint height, gint height,
gint bytes, gint bytes,
gchar * mask_data, gchar *mask_data,
gint closing, gint closing,
gpointer udata) gpointer udata)
{ {
gchar ** pname = (gchar **) udata; gchar ** pname = (gchar **) udata;
g_free(*pname); g_free(*pname);
@ -1450,10 +1450,10 @@ script_fu_pattern_preview (gchar *name,
static void static void
script_fu_gradient_preview(gchar *name, script_fu_gradient_preview(gchar *name,
gint width, gint width,
gdouble * mask_data, gdouble *mask_data,
gint closing, gint closing,
gpointer udata) gpointer udata)
{ {
gchar ** pname = (gchar **) udata; gchar ** pname = (gchar **) udata;
g_free(*pname); g_free(*pname);
@ -1461,15 +1461,15 @@ script_fu_gradient_preview(gchar *name,
} }
static void static void
script_fu_brush_preview(char * name, /* Name */ script_fu_brush_preview(char *name, /* Name */
gdouble opacity, /* opacity */ gdouble opacity, /* opacity */
gint spacing, /* spacing */ gint spacing, /* spacing */
gint paint_mode, /* paint_mode */ gint paint_mode, /* paint_mode */
gint width, /* width */ gint width, /* width */
gint height, /* height */ gint height, /* height */
gchar * mask_data, /* mask data */ gchar *mask_data, /* mask data */
gint closing, /* dialog closing */ gint closing, /* dialog closing */
gpointer udata/* user data */) gpointer udata) /* user data */
{ {
SFBrush *brush = (SFBrush *)udata; SFBrush *brush = (SFBrush *)udata;
g_free(brush->name); g_free(brush->name);
@ -1675,7 +1675,7 @@ script_fu_ok_callback (GtkWidget *widget,
case SF_STRING: case SF_STRING:
text = gtk_entry_get_text (GTK_ENTRY (script->args_widgets[i])); text = gtk_entry_get_text (GTK_ENTRY (script->args_widgets[i]));
g_free (script->arg_values[i].sfa_value); g_free (script->arg_values[i].sfa_value);
script->arg_values[i].sfa_value = text; script->arg_values[i].sfa_value = g_strdup (text);
escaped = g_strescape (text); escaped = g_strescape (text);
g_snprintf (buffer, MAX_STRING_LENGTH, "\"%s\"", escaped); g_snprintf (buffer, MAX_STRING_LENGTH, "\"%s\"", escaped);
g_free (escaped); g_free (escaped);
@ -1690,8 +1690,10 @@ script_fu_ok_callback (GtkWidget *widget,
text = buffer; text = buffer;
break; break;
case SF_SPINNER: case SF_SPINNER:
script->arg_values[i].sfa_adjustment.value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (script->args_widgets[i])); script->arg_values[i].sfa_adjustment.value =
g_snprintf (buffer, 24, "%f", script->arg_values[i].sfa_adjustment.value); text = buffer; gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (script->args_widgets[i]));
g_snprintf (buffer, 24, "%f", script->arg_values[i].sfa_adjustment.value);
text = buffer;
break; break;
default: default:
break; break;
@ -2051,7 +2053,7 @@ script_fu_color_preview_callback (GtkWidget *widget,
static void static void
script_fu_color_preview_changed (GtkWidget *widget, script_fu_color_preview_changed (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFColor *color; SFColor *color;
@ -2063,7 +2065,7 @@ script_fu_color_preview_changed (GtkWidget *widget,
static void static void
script_fu_color_preview_cancel (GtkWidget *widget, script_fu_color_preview_cancel (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFColor *color; SFColor *color;
@ -2080,8 +2082,8 @@ script_fu_color_preview_cancel (GtkWidget *widget,
static gint static gint
script_fu_color_preview_delete (GtkWidget *widget, script_fu_color_preview_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
script_fu_color_preview_cancel (widget, data); script_fu_color_preview_cancel (widget, data);
return TRUE; return TRUE;
@ -2136,7 +2138,7 @@ script_fu_font_preview_callback (GtkWidget *widget,
static void static void
script_fu_font_dialog_ok (GtkWidget *widget, script_fu_font_dialog_ok (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFFont *font; SFFont *font;
gchar *fontname; gchar *fontname;
@ -2157,7 +2159,7 @@ script_fu_font_dialog_ok (GtkWidget *widget,
static void static void
script_fu_font_dialog_cancel (GtkWidget *widget, script_fu_font_dialog_cancel (GtkWidget *widget,
gpointer data) gpointer data)
{ {
SFFont *font; SFFont *font;
@ -2168,8 +2170,8 @@ script_fu_font_dialog_cancel (GtkWidget *widget,
static gint static gint
script_fu_font_dialog_delete (GtkWidget *widget, script_fu_font_dialog_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
script_fu_font_dialog_cancel (widget, data); script_fu_font_dialog_cancel (widget, data);
return TRUE; return TRUE;
@ -2178,7 +2180,7 @@ script_fu_font_dialog_delete (GtkWidget *widget,
static void static void
script_fu_about_dialog_close (GtkWidget *widget, script_fu_about_dialog_close (GtkWidget *widget,
gpointer data) gpointer data)
{ {
if (data != NULL) if (data != NULL)
gtk_widget_hide (GTK_WIDGET (data)); gtk_widget_hide (GTK_WIDGET (data));
@ -2186,9 +2188,11 @@ script_fu_about_dialog_close (GtkWidget *widget,
static gint static gint
script_fu_about_dialog_delete (GtkWidget *widget, script_fu_about_dialog_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
script_fu_about_dialog_close (widget, data); script_fu_about_dialog_close (widget, data);
return TRUE; return TRUE;
} }