dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed further COMPAT_CRUFT. 

removed further COMPAT_CRUFT.
This commit is contained in:
Daniel Egger 2000-08-22 00:13:56 +00:00
parent ceee83f6e4
commit f219503a23
10 changed files with 183 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Aug 22 02:12:36 CEST 2000 Daniel Egger <egger@suse.de>
* plug-ins/AlienMap/AlienMap.c:
* plug-ins/dbbrowser/dbbrowser.c:
* plug-ins/dbbrowser/dbbrowser_utils.c: removed further
COMPAT_CRUFT.
Tue Aug 22 01:02:41 CEST 2000 Daniel Egger <egger@suse.de> Tue Aug 22 01:02:41 CEST 2000 Daniel Egger <egger@suse.de>
* plugins/AlienMap/AlienMap.c: removed COMPAT_CRUFT. * plugins/AlienMap/AlienMap.c: removed COMPAT_CRUFT.

50
libgimp/gimpprocbrowserdialog.c
View File

@ -108,7 +108,7 @@ static void dialog_select (dbbrowser_t *dbbrowser,
static void dialog_close_callback (GtkWidget *widget, static void dialog_close_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void convert_string (gchar *str); static void convert_string (gchar *str);
static gchar * GParamType2char (GParamType t); static gchar * GParamType2char (GimpPDBArgType t);
GList * proc_table = NULL; GList * proc_table = NULL;
@ -757,33 +757,33 @@ convert_string (gchar *str)
} }
static gchar * static gchar *
GParamType2char (GParamType t) GParamType2char (GimpPDBArgType t)
{ {
switch (t) switch (t)
{ {
case PARAM_INT32: return "INT32"; case GIMP_PDB_INT32: return "INT32";
case PARAM_INT16: return "INT16"; case GIMP_PDB_INT16: return "INT16";
case PARAM_INT8: return "INT8"; case GIMP_PDB_INT8: return "INT8";
case PARAM_FLOAT: return "FLOAT"; case GIMP_PDB_FLOAT: return "FLOAT";
case PARAM_STRING: return "STRING"; case GIMP_PDB_STRING: return "STRING";
case PARAM_INT32ARRAY: return "INT32ARRAY"; case GIMP_PDB_INT32ARRAY: return "INT32ARRAY";
case PARAM_INT16ARRAY: return "INT16ARRAY"; case GIMP_PDB_INT16ARRAY: return "INT16ARRAY";
case PARAM_INT8ARRAY: return "INT8ARRAY"; case GIMP_PDB_INT8ARRAY: return "INT8ARRAY";
case PARAM_FLOATARRAY: return "FLOATARRAY"; case GIMP_PDB_FLOATARRAY: return "FLOATARRAY";
case PARAM_STRINGARRAY: return "STRINGARRAY"; case GIMP_PDB_STRINGARRAY: return "STRINGARRAY";
case PARAM_COLOR: return "COLOR"; case GIMP_PDB_COLOR: return "COLOR";
case PARAM_REGION: return "REGION"; case GIMP_PDB_REGION: return "REGION";
case PARAM_DISPLAY: return "DISPLAY"; case GIMP_PDB_DISPLAY: return "DISPLAY";
case PARAM_IMAGE: return "IMAGE"; case GIMP_PDB_IMAGE: return "IMAGE";
case PARAM_LAYER: return "LAYER"; case GIMP_PDB_LAYER: return "LAYER";
case PARAM_CHANNEL: return "CHANNEL"; case GIMP_PDB_CHANNEL: return "CHANNEL";
case PARAM_DRAWABLE: return "DRAWABLE"; case GIMP_PDB_DRAWABLE: return "DRAWABLE";
case PARAM_SELECTION: return "SELECTION"; case GIMP_PDB_SELECTION: return "SELECTION";
case PARAM_BOUNDARY: return "BOUNDARY"; case GIMP_PDB_BOUNDARY: return "BOUNDARY";
case PARAM_PATH: return "PATH"; case GIMP_PDB_PATH: return "PATH";
case PARAM_PARASITE: return "PARASITE"; case GIMP_PDB_PARASITE: return "PARASITE";
case PARAM_STATUS: return "STATUS"; case GIMP_PDB_STATUS: return "STATUS";
case PARAM_END: return "END"; case GIMP_PDB_END: return "END";
default: return "UNKNOWN?"; default: return "UNKNOWN?";
} }
} }

50
libgimp/gimpprocview.c
View File

@ -108,7 +108,7 @@ static void dialog_select (dbbrowser_t *dbbrowser,
static void dialog_close_callback (GtkWidget *widget, static void dialog_close_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void convert_string (gchar *str); static void convert_string (gchar *str);
static gchar * GParamType2char (GParamType t); static gchar * GParamType2char (GimpPDBArgType t);
GList * proc_table = NULL; GList * proc_table = NULL;
@ -757,33 +757,33 @@ convert_string (gchar *str)
} }
static gchar * static gchar *
GParamType2char (GParamType t) GParamType2char (GimpPDBArgType t)
{ {
switch (t) switch (t)
{ {
case PARAM_INT32: return "INT32"; case GIMP_PDB_INT32: return "INT32";
case PARAM_INT16: return "INT16"; case GIMP_PDB_INT16: return "INT16";
case PARAM_INT8: return "INT8"; case GIMP_PDB_INT8: return "INT8";
case PARAM_FLOAT: return "FLOAT"; case GIMP_PDB_FLOAT: return "FLOAT";
case PARAM_STRING: return "STRING"; case GIMP_PDB_STRING: return "STRING";
case PARAM_INT32ARRAY: return "INT32ARRAY"; case GIMP_PDB_INT32ARRAY: return "INT32ARRAY";
case PARAM_INT16ARRAY: return "INT16ARRAY"; case GIMP_PDB_INT16ARRAY: return "INT16ARRAY";
case PARAM_INT8ARRAY: return "INT8ARRAY"; case GIMP_PDB_INT8ARRAY: return "INT8ARRAY";
case PARAM_FLOATARRAY: return "FLOATARRAY"; case GIMP_PDB_FLOATARRAY: return "FLOATARRAY";
case PARAM_STRINGARRAY: return "STRINGARRAY"; case GIMP_PDB_STRINGARRAY: return "STRINGARRAY";
case PARAM_COLOR: return "COLOR"; case GIMP_PDB_COLOR: return "COLOR";
case PARAM_REGION: return "REGION"; case GIMP_PDB_REGION: return "REGION";
case PARAM_DISPLAY: return "DISPLAY"; case GIMP_PDB_DISPLAY: return "DISPLAY";
case PARAM_IMAGE: return "IMAGE"; case GIMP_PDB_IMAGE: return "IMAGE";
case PARAM_LAYER: return "LAYER"; case GIMP_PDB_LAYER: return "LAYER";
case PARAM_CHANNEL: return "CHANNEL"; case GIMP_PDB_CHANNEL: return "CHANNEL";
case PARAM_DRAWABLE: return "DRAWABLE"; case GIMP_PDB_DRAWABLE: return "DRAWABLE";
case PARAM_SELECTION: return "SELECTION"; case GIMP_PDB_SELECTION: return "SELECTION";
case PARAM_BOUNDARY: return "BOUNDARY"; case GIMP_PDB_BOUNDARY: return "BOUNDARY";
case PARAM_PATH: return "PATH"; case GIMP_PDB_PATH: return "PATH";
case PARAM_PARASITE: return "PARASITE"; case GIMP_PDB_PARASITE: return "PARASITE";
case PARAM_STATUS: return "STATUS"; case GIMP_PDB_STATUS: return "STATUS";
case PARAM_END: return "END"; case GIMP_PDB_END: return "END";
default: return "UNKNOWN?"; default: return "UNKNOWN?";
} }
} }

51
plug-ins/AlienMap/AlienMap.c
View File

@ -155,15 +155,15 @@ query (void)
{ {
static GimpParamDef args[] = static GimpParamDef args[] =
{ {
{ PARAM_INT32, "run_mode", "Interactive, non-interactive" }, { GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" },
{ PARAM_IMAGE, "image", "Input image" }, { GIMP_PDB_IMAGE, "image", "Input image" },
{ PARAM_DRAWABLE, "drawable", "Input drawable" }, { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" },
{ PARAM_INT8, "redstretch", "Red component stretching factor (0-128)" }, { GIMP_PDB_INT8, "redstretch", "Red component stretching factor (0-128)" },
{ PARAM_INT8, "greenstretch", "Green component stretching factor (0-128)" }, { GIMP_PDB_INT8, "greenstretch", "Green component stretching factor (0-128)" },
{ PARAM_INT8, "bluestretch", "Blue component stretching factor (0-128)" }, { GIMP_PDB_INT8, "bluestretch", "Blue component stretching factor (0-128)" },
{ PARAM_INT8, "redmode", "Red application mode (0:SIN;1:COS;2:NONE)" }, { GIMP_PDB_INT8, "redmode", "Red application mode (0:SIN;1:COS;2:NONE)" },
{ PARAM_INT8, "greenmode", "Green application mode (0:SIN;1:COS;2:NONE)" }, { GIMP_PDB_INT8, "greenmode", "Green application mode (0:SIN;1:COS;2:NONE)" },
{ PARAM_INT8, "bluemode", "Blue application mode (0:SIN;1:COS;2:NONE)" }, { GIMP_PDB_INT8, "bluemode", "Blue application mode (0:SIN;1:COS;2:NONE)" },
}; };
static GimpParamDef *return_vals = NULL; static GimpParamDef *return_vals = NULL;
static int nargs = sizeof (args) / sizeof (args[0]); static int nargs = sizeof (args) / sizeof (args[0]);
@ -179,7 +179,7 @@ query (void)
"1th May 1997", "1th May 1997",
N_("<Image>/Filters/Colors/Map/Alien Map..."), N_("<Image>/Filters/Colors/Map/Alien Map..."),
"RGB*", "RGB*",
PROC_PLUG_IN, GIMP_PLUGIN,
nargs, nreturn_vals, nargs, nreturn_vals,
args, return_vals); args, return_vals);
} }
@ -264,16 +264,16 @@ run (char *name,
static GimpParam values[1]; static GimpParam values[1];
/* GDrawable *drawable; */ /* GDrawable *drawable; */
/* gint32 image_ID; */ /* gint32 image_ID; */
GimpRunModeType run_mode; GimpRunModeType run_mode;
double xhsiz, yhsiz; double xhsiz, yhsiz;
int pwidth, pheight; int pwidth, pheight;
GStatusType status = STATUS_SUCCESS; GimpPDBStatusType status = GIMP_PDB_SUCCESS;
INIT_I18N_UI (); INIT_I18N_UI ();
run_mode = param[0].data.d_int32; run_mode = param[0].data.d_int32;
values[0].type = PARAM_STATUS; values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status; values[0].data.d_status = status;
*nreturn_vals = 1; *nreturn_vals = 1;
@ -334,7 +334,7 @@ run (char *name,
/* See how we will run */ /* See how we will run */
switch (run_mode) switch (run_mode)
{ {
case RUN_INTERACTIVE: case GIMP_RUN_INTERACTIVE:
/* Possibly retrieve data */ /* Possibly retrieve data */
gimp_get_data("plug_in_alienmap", &wvals); gimp_get_data("plug_in_alienmap", &wvals);
@ -344,12 +344,12 @@ run (char *name,
break; break;
case RUN_NONINTERACTIVE: case GIMP_RUN_NONINTERACTIVE:
/* Make sure all the arguments are present */ /* Make sure all the arguments are present */
if (nparams != 9) if (nparams != 9)
status = STATUS_CALLING_ERROR; status = GIMP_PDB_CALLING_ERROR;
if (status == STATUS_SUCCESS) if (status == GIMP_PDB_SUCCESS)
{ {
wvals.redstretch = param[3].data.d_int8; wvals.redstretch = param[3].data.d_int8;
wvals.greenstretch = param[4].data.d_int8; wvals.greenstretch = param[4].data.d_int8;
@ -361,7 +361,7 @@ run (char *name,
break; break;
case RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
/* Possibly retrieve data */ /* Possibly retrieve data */
gimp_get_data ("plug_in_alienmap", &wvals); gimp_get_data ("plug_in_alienmap", &wvals);
break; break;
@ -370,7 +370,7 @@ run (char *name,
break; break;
} }
if (status == STATUS_SUCCESS) if (status == GIMP_PDB_SUCCESS)
{ {
/* Make sure that the drawable is indexed or RGB color */ /* Make sure that the drawable is indexed or RGB color */
if (gimp_drawable_is_rgb (drawable->id)) if (gimp_drawable_is_rgb (drawable->id))
@ -382,20 +382,17 @@ run (char *name,
/* Run! */ /* Run! */
/* gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width ()
+ 1));*/
alienmap (drawable); alienmap (drawable);
if (run_mode != RUN_NONINTERACTIVE) if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_displays_flush(); gimp_displays_flush();
/* Store data */ /* Store data */
if (run_mode == RUN_INTERACTIVE) if (run_mode == GIMP_RUN_INTERACTIVE)
gimp_set_data("plug_in_alienmap", &wvals, sizeof(alienmap_vals_t)); gimp_set_data("plug_in_alienmap", &wvals, sizeof(alienmap_vals_t));
} }
else else
{ {
/* gimp_message("This filter only applies on RGB-images"); */ status = GIMP_PDB_EXECUTION_ERROR;
status = STATUS_EXECUTION_ERROR;
} }
} }

18
plug-ins/common/procedure-browser.c
View File

@ -77,7 +77,7 @@ query (void)
{ {
static GimpParamDef args[] = static GimpParamDef args[] =
{ {
{ PARAM_INT32, "run_mode", "Interactive, [non-interactive]" } { GIMP_PDB_INT32, "run_mode", "Interactive, [non-interactive]" }
}; };
static gint nargs = sizeof (args) / sizeof (args[0]); static gint nargs = sizeof (args) / sizeof (args[0]);
@ -89,7 +89,7 @@ query (void)
"23th june 1997", "23th june 1997",
N_("<Toolbox>/Xtns/DB Browser..."), N_("<Toolbox>/Xtns/DB Browser..."),
"", "",
PROC_EXTENSION, GIMP_EXTENSION,
nargs, 0, nargs, 0,
args, NULL); args, NULL);
} }
@ -102,18 +102,18 @@ run (gchar *name,
GimpParam **return_vals) GimpParam **return_vals)
{ {
static GimpParam values[1]; static GimpParam values[1];
GRunModeType run_mode; GimpRunModeType run_mode;
run_mode = param[0].data.d_int32; run_mode = param[0].data.d_int32;
*nreturn_vals = 1; *nreturn_vals = 1;
*return_vals = values; *return_vals = values;
values[0].type = PARAM_STATUS; values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = STATUS_SUCCESS; values[0].data.d_status = GIMP_PDB_SUCCESS;
switch (run_mode) switch (run_mode)
{ {
case RUN_INTERACTIVE: case GIMP_RUN_INTERACTIVE:
{ {
INIT_I18N_UI(); INIT_I18N_UI();
@ -126,10 +126,10 @@ run (gchar *name,
} }
break; break;
case RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
case RUN_NONINTERACTIVE: case GIMP_RUN_NONINTERACTIVE:
g_warning ("dbbrowser allows only interactive invocation"); g_warning ("dbbrowser allows only interactive invocation");
values[0].data.d_status = STATUS_CALLING_ERROR; values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
break; break;
default: default:

18
plug-ins/dbbrowser/dbbrowser.c
View File

@ -77,7 +77,7 @@ query (void)
{ {
static GimpParamDef args[] = static GimpParamDef args[] =
{ {
{ PARAM_INT32, "run_mode", "Interactive, [non-interactive]" } { GIMP_PDB_INT32, "run_mode", "Interactive, [non-interactive]" }
}; };
static gint nargs = sizeof (args) / sizeof (args[0]); static gint nargs = sizeof (args) / sizeof (args[0]);
@ -89,7 +89,7 @@ query (void)
"23th june 1997", "23th june 1997",
N_("<Toolbox>/Xtns/DB Browser..."), N_("<Toolbox>/Xtns/DB Browser..."),
"", "",
PROC_EXTENSION, GIMP_EXTENSION,
nargs, 0, nargs, 0,
args, NULL); args, NULL);
} }
@ -102,18 +102,18 @@ run (gchar *name,
GimpParam **return_vals) GimpParam **return_vals)
{ {
static GimpParam values[1]; static GimpParam values[1];
GRunModeType run_mode; GimpRunModeType run_mode;
run_mode = param[0].data.d_int32; run_mode = param[0].data.d_int32;
*nreturn_vals = 1; *nreturn_vals = 1;
*return_vals = values; *return_vals = values;
values[0].type = PARAM_STATUS; values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = STATUS_SUCCESS; values[0].data.d_status = GIMP_PDB_SUCCESS;
switch (run_mode) switch (run_mode)
{ {
case RUN_INTERACTIVE: case GIMP_RUN_INTERACTIVE:
{ {
INIT_I18N_UI(); INIT_I18N_UI();
@ -126,10 +126,10 @@ run (gchar *name,
} }
break; break;
case RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
case RUN_NONINTERACTIVE: case GIMP_RUN_NONINTERACTIVE:
g_warning ("dbbrowser allows only interactive invocation"); g_warning ("dbbrowser allows only interactive invocation");
values[0].data.d_status = STATUS_CALLING_ERROR; values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
break; break;
default: default:

50
plug-ins/dbbrowser/dbbrowser_utils.c
View File

@ -108,7 +108,7 @@ static void dialog_select (dbbrowser_t *dbbrowser,
static void dialog_close_callback (GtkWidget *widget, static void dialog_close_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void convert_string (gchar *str); static void convert_string (gchar *str);
static gchar * GParamType2char (GParamType t); static gchar * GParamType2char (GimpPDBArgType t);
GList * proc_table = NULL; GList * proc_table = NULL;
@ -757,33 +757,33 @@ convert_string (gchar *str)
} }
static gchar * static gchar *
GParamType2char (GParamType t) GParamType2char (GimpPDBArgType t)
{ {
switch (t) switch (t)
{ {
case PARAM_INT32: return "INT32"; case GIMP_PDB_INT32: return "INT32";
case PARAM_INT16: return "INT16"; case GIMP_PDB_INT16: return "INT16";
case PARAM_INT8: return "INT8"; case GIMP_PDB_INT8: return "INT8";
case PARAM_FLOAT: return "FLOAT"; case GIMP_PDB_FLOAT: return "FLOAT";
case PARAM_STRING: return "STRING"; case GIMP_PDB_STRING: return "STRING";
case PARAM_INT32ARRAY: return "INT32ARRAY"; case GIMP_PDB_INT32ARRAY: return "INT32ARRAY";
case PARAM_INT16ARRAY: return "INT16ARRAY"; case GIMP_PDB_INT16ARRAY: return "INT16ARRAY";
case PARAM_INT8ARRAY: return "INT8ARRAY"; case GIMP_PDB_INT8ARRAY: return "INT8ARRAY";
case PARAM_FLOATARRAY: return "FLOATARRAY"; case GIMP_PDB_FLOATARRAY: return "FLOATARRAY";
case PARAM_STRINGARRAY: return "STRINGARRAY"; case GIMP_PDB_STRINGARRAY: return "STRINGARRAY";
case PARAM_COLOR: return "COLOR"; case GIMP_PDB_COLOR: return "COLOR";
case PARAM_REGION: return "REGION"; case GIMP_PDB_REGION: return "REGION";
case PARAM_DISPLAY: return "DISPLAY"; case GIMP_PDB_DISPLAY: return "DISPLAY";
case PARAM_IMAGE: return "IMAGE"; case GIMP_PDB_IMAGE: return "IMAGE";
case PARAM_LAYER: return "LAYER"; case GIMP_PDB_LAYER: return "LAYER";
case PARAM_CHANNEL: return "CHANNEL"; case GIMP_PDB_CHANNEL: return "CHANNEL";
case PARAM_DRAWABLE: return "DRAWABLE"; case GIMP_PDB_DRAWABLE: return "DRAWABLE";
case PARAM_SELECTION: return "SELECTION"; case GIMP_PDB_SELECTION: return "SELECTION";
case PARAM_BOUNDARY: return "BOUNDARY"; case GIMP_PDB_BOUNDARY: return "BOUNDARY";
case PARAM_PATH: return "PATH"; case GIMP_PDB_PATH: return "PATH";
case PARAM_PARASITE: return "PARASITE"; case GIMP_PDB_PARASITE: return "PARASITE";
case PARAM_STATUS: return "STATUS"; case GIMP_PDB_STATUS: return "STATUS";
case PARAM_END: return "END"; case GIMP_PDB_END: return "END";
default: return "UNKNOWN?"; default: return "UNKNOWN?";
} }
} }

50
plug-ins/dbbrowser/gimpprocbrowser.c
View File

@ -108,7 +108,7 @@ static void dialog_select (dbbrowser_t *dbbrowser,
static void dialog_close_callback (GtkWidget *widget, static void dialog_close_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void convert_string (gchar *str); static void convert_string (gchar *str);
static gchar * GParamType2char (GParamType t); static gchar * GParamType2char (GimpPDBArgType t);
GList * proc_table = NULL; GList * proc_table = NULL;
@ -757,33 +757,33 @@ convert_string (gchar *str)
} }
static gchar * static gchar *
GParamType2char (GParamType t) GParamType2char (GimpPDBArgType t)
{ {
switch (t) switch (t)
{ {
case PARAM_INT32: return "INT32"; case GIMP_PDB_INT32: return "INT32";
case PARAM_INT16: return "INT16"; case GIMP_PDB_INT16: return "INT16";
case PARAM_INT8: return "INT8"; case GIMP_PDB_INT8: return "INT8";
case PARAM_FLOAT: return "FLOAT"; case GIMP_PDB_FLOAT: return "FLOAT";
case PARAM_STRING: return "STRING"; case GIMP_PDB_STRING: return "STRING";
case PARAM_INT32ARRAY: return "INT32ARRAY"; case GIMP_PDB_INT32ARRAY: return "INT32ARRAY";
case PARAM_INT16ARRAY: return "INT16ARRAY"; case GIMP_PDB_INT16ARRAY: return "INT16ARRAY";
case PARAM_INT8ARRAY: return "INT8ARRAY"; case GIMP_PDB_INT8ARRAY: return "INT8ARRAY";
case PARAM_FLOATARRAY: return "FLOATARRAY"; case GIMP_PDB_FLOATARRAY: return "FLOATARRAY";
case PARAM_STRINGARRAY: return "STRINGARRAY"; case GIMP_PDB_STRINGARRAY: return "STRINGARRAY";
case PARAM_COLOR: return "COLOR"; case GIMP_PDB_COLOR: return "COLOR";
case PARAM_REGION: return "REGION"; case GIMP_PDB_REGION: return "REGION";
case PARAM_DISPLAY: return "DISPLAY"; case GIMP_PDB_DISPLAY: return "DISPLAY";
case PARAM_IMAGE: return "IMAGE"; case GIMP_PDB_IMAGE: return "IMAGE";
case PARAM_LAYER: return "LAYER"; case GIMP_PDB_LAYER: return "LAYER";
case PARAM_CHANNEL: return "CHANNEL"; case GIMP_PDB_CHANNEL: return "CHANNEL";
case PARAM_DRAWABLE: return "DRAWABLE"; case GIMP_PDB_DRAWABLE: return "DRAWABLE";
case PARAM_SELECTION: return "SELECTION"; case GIMP_PDB_SELECTION: return "SELECTION";
case PARAM_BOUNDARY: return "BOUNDARY"; case GIMP_PDB_BOUNDARY: return "BOUNDARY";
case PARAM_PATH: return "PATH"; case GIMP_PDB_PATH: return "PATH";
case PARAM_PARASITE: return "PARASITE"; case GIMP_PDB_PARASITE: return "PARASITE";
case PARAM_STATUS: return "STATUS"; case GIMP_PDB_STATUS: return "STATUS";
case PARAM_END: return "END"; case GIMP_PDB_END: return "END";
default: return "UNKNOWN?"; default: return "UNKNOWN?";
} }
} }

50
plug-ins/dbbrowser/gimpprocview.c
View File

@ -108,7 +108,7 @@ static void dialog_select (dbbrowser_t *dbbrowser,
static void dialog_close_callback (GtkWidget *widget, static void dialog_close_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void convert_string (gchar *str); static void convert_string (gchar *str);
static gchar * GParamType2char (GParamType t); static gchar * GParamType2char (GimpPDBArgType t);
GList * proc_table = NULL; GList * proc_table = NULL;
@ -757,33 +757,33 @@ convert_string (gchar *str)
} }
static gchar * static gchar *
GParamType2char (GParamType t) GParamType2char (GimpPDBArgType t)
{ {
switch (t) switch (t)
{ {
case PARAM_INT32: return "INT32"; case GIMP_PDB_INT32: return "INT32";
case PARAM_INT16: return "INT16"; case GIMP_PDB_INT16: return "INT16";
case PARAM_INT8: return "INT8"; case GIMP_PDB_INT8: return "INT8";
case PARAM_FLOAT: return "FLOAT"; case GIMP_PDB_FLOAT: return "FLOAT";
case PARAM_STRING: return "STRING"; case GIMP_PDB_STRING: return "STRING";
case PARAM_INT32ARRAY: return "INT32ARRAY"; case GIMP_PDB_INT32ARRAY: return "INT32ARRAY";
case PARAM_INT16ARRAY: return "INT16ARRAY"; case GIMP_PDB_INT16ARRAY: return "INT16ARRAY";
case PARAM_INT8ARRAY: return "INT8ARRAY"; case GIMP_PDB_INT8ARRAY: return "INT8ARRAY";
case PARAM_FLOATARRAY: return "FLOATARRAY"; case GIMP_PDB_FLOATARRAY: return "FLOATARRAY";
case PARAM_STRINGARRAY: return "STRINGARRAY"; case GIMP_PDB_STRINGARRAY: return "STRINGARRAY";
case PARAM_COLOR: return "COLOR"; case GIMP_PDB_COLOR: return "COLOR";
case PARAM_REGION: return "REGION"; case GIMP_PDB_REGION: return "REGION";
case PARAM_DISPLAY: return "DISPLAY"; case GIMP_PDB_DISPLAY: return "DISPLAY";
case PARAM_IMAGE: return "IMAGE"; case GIMP_PDB_IMAGE: return "IMAGE";
case PARAM_LAYER: return "LAYER"; case GIMP_PDB_LAYER: return "LAYER";
case PARAM_CHANNEL: return "CHANNEL"; case GIMP_PDB_CHANNEL: return "CHANNEL";
case PARAM_DRAWABLE: return "DRAWABLE"; case GIMP_PDB_DRAWABLE: return "DRAWABLE";
case PARAM_SELECTION: return "SELECTION"; case GIMP_PDB_SELECTION: return "SELECTION";
case PARAM_BOUNDARY: return "BOUNDARY"; case GIMP_PDB_BOUNDARY: return "BOUNDARY";
case PARAM_PATH: return "PATH"; case GIMP_PDB_PATH: return "PATH";
case PARAM_PARASITE: return "PARASITE"; case GIMP_PDB_PARASITE: return "PARASITE";
case PARAM_STATUS: return "STATUS"; case GIMP_PDB_STATUS: return "STATUS";
case PARAM_END: return "END"; case GIMP_PDB_END: return "END";
default: return "UNKNOWN?"; default: return "UNKNOWN?";
} }
} }

18
plug-ins/dbbrowser/procedure-browser.c
View File

@ -77,7 +77,7 @@ query (void)
{ {
static GimpParamDef args[] = static GimpParamDef args[] =
{ {
{ PARAM_INT32, "run_mode", "Interactive, [non-interactive]" } { GIMP_PDB_INT32, "run_mode", "Interactive, [non-interactive]" }
}; };
static gint nargs = sizeof (args) / sizeof (args[0]); static gint nargs = sizeof (args) / sizeof (args[0]);
@ -89,7 +89,7 @@ query (void)
"23th june 1997", "23th june 1997",
N_("<Toolbox>/Xtns/DB Browser..."), N_("<Toolbox>/Xtns/DB Browser..."),
"", "",
PROC_EXTENSION, GIMP_EXTENSION,
nargs, 0, nargs, 0,
args, NULL); args, NULL);
} }
@ -102,18 +102,18 @@ run (gchar *name,
GimpParam **return_vals) GimpParam **return_vals)
{ {
static GimpParam values[1]; static GimpParam values[1];
GRunModeType run_mode; GimpRunModeType run_mode;
run_mode = param[0].data.d_int32; run_mode = param[0].data.d_int32;
*nreturn_vals = 1; *nreturn_vals = 1;
*return_vals = values; *return_vals = values;
values[0].type = PARAM_STATUS; values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = STATUS_SUCCESS; values[0].data.d_status = GIMP_PDB_SUCCESS;
switch (run_mode) switch (run_mode)
{ {
case RUN_INTERACTIVE: case GIMP_RUN_INTERACTIVE:
{ {
INIT_I18N_UI(); INIT_I18N_UI();
@ -126,10 +126,10 @@ run (gchar *name,
} }
break; break;
case RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
case RUN_NONINTERACTIVE: case GIMP_RUN_NONINTERACTIVE:
g_warning ("dbbrowser allows only interactive invocation"); g_warning ("dbbrowser allows only interactive invocation");
values[0].data.d_status = STATUS_CALLING_ERROR; values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
break; break;
default: default: