Commit c023af46 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

plug-ins/common/cml-explorer.c plug-ins/common/depth-merge.c

2008-08-11  Michael Natterer  <mitch@gimp.org>

	* plug-ins/common/cml-explorer.c
	* plug-ins/common/depth-merge.c
	* plug-ins/common/file-cel.c
	* plug-ins/common/oilify.c
	* plug-ins/file-bmp/bmp-write.c
	* plug-ins/file-bmp/bmp.[ch]
	* plug-ins/file-ico/ico-dialog.c
	* plug-ins/file-ico/ico-save.c
	* plug-ins/file-ico/ico.h
	* plug-ins/flame/flame.c
	* plug-ins/fractal-explorer/fractal-explorer-dialogs.c
	* plug-ins/fractal-explorer/fractal-explorer.[ch]
	* plug-ins/gimpressionist/gimp.c
	* plug-ins/gimpressionist/gimpressionist.[ch]
	* plug-ins/gimpressionist/orientmap.c
	* plug-ins/gimpressionist/presets.c
	* plug-ins/gimpressionist/sizemap.c
	* plug-ins/help-browser/dialog.[ch]
	* plug-ins/help-browser/help-browser.c
	* plug-ins/ifs-compose/ifs-compose.c
	* plug-ins/imagemap/imap_default_dialog.c
	* plug-ins/imagemap/imap_main.[ch]
	* plug-ins/lighting/lighting-main.[ch]
	* plug-ins/lighting/lighting-ui.c
	* plug-ins/map-object/map-object-main.[ch]
	* plug-ins/map-object/map-object-ui.c
	* plug-ins/selection-to-path/selection-to-path.c
	* plug-ins/win-snap/winsnap.c: use PLUG_IN_BINARY and PLUG_IN_PROC
	defines consistently instead of using literal strings or other
	random defines. Define them if not already there or move them to
	plugin-global places.

	* plug-ins/win-snap/Makefile.am: rename the binary to "win-snap".

	* plug-ins/win-snap/winsnap.c: changed accordingly.


svn path=/trunk/; revision=26509
parent 49b30c41
2008-08-11 Michael Natterer <mitch@gimp.org>
* plug-ins/common/cml-explorer.c
* plug-ins/common/depth-merge.c
* plug-ins/common/file-cel.c
* plug-ins/common/oilify.c
* plug-ins/file-bmp/bmp-write.c
* plug-ins/file-bmp/bmp.[ch]
* plug-ins/file-ico/ico-dialog.c
* plug-ins/file-ico/ico-save.c
* plug-ins/file-ico/ico.h
* plug-ins/flame/flame.c
* plug-ins/fractal-explorer/fractal-explorer-dialogs.c
* plug-ins/fractal-explorer/fractal-explorer.[ch]
* plug-ins/gimpressionist/gimp.c
* plug-ins/gimpressionist/gimpressionist.[ch]
* plug-ins/gimpressionist/orientmap.c
* plug-ins/gimpressionist/presets.c
* plug-ins/gimpressionist/sizemap.c
* plug-ins/help-browser/dialog.[ch]
* plug-ins/help-browser/help-browser.c
* plug-ins/ifs-compose/ifs-compose.c
* plug-ins/imagemap/imap_default_dialog.c
* plug-ins/imagemap/imap_main.[ch]
* plug-ins/lighting/lighting-main.[ch]
* plug-ins/lighting/lighting-ui.c
* plug-ins/map-object/map-object-main.[ch]
* plug-ins/map-object/map-object-ui.c
* plug-ins/selection-to-path/selection-to-path.c
* plug-ins/win-snap/winsnap.c: use PLUG_IN_BINARY and PLUG_IN_PROC
defines consistently instead of using literal strings or other
random defines. Define them if not already there or move them to
plugin-global places.
* plug-ins/win-snap/Makefile.am: rename the binary to "win-snap".
* plug-ins/win-snap/winsnap.c: changed accordingly.
2008-08-11 Michael Natterer <mitch@gimp.org>
* modules/Makefile.am
......
......@@ -1816,7 +1816,7 @@ function_graph_new (GtkWidget *widget,
GtkWidget *frame;
GtkWidget *preview;
dialog = gimp_dialog_new (_("Graph of the Current Settings"), "cml_explorer",
dialog = gimp_dialog_new (_("Graph of the Current Settings"), PLUG_IN_BINARY,
gtk_widget_get_toplevel (widget), 0,
gimp_standard_help_func, PLUG_IN_PROC,
......
......@@ -41,6 +41,7 @@
#define PLUG_IN_PROC "plug-in-depth-merge"
#define PLUG_IN_VERSION "August 1998"
#define PLUG_IN_BINARY "depth-merge"
#define PREVIEW_SIZE 256
......@@ -637,10 +638,10 @@ DepthMerge_dialog (DepthMerge *dm)
dm->interface = g_new0 (DepthMergeInterface, 1);
gimp_ui_init ("depthmerge", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
dm->interface->dialog =
dialog = gimp_dialog_new (_("Depth Merge"), "depthmerge",
dialog = gimp_dialog_new (_("Depth Merge"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, PLUG_IN_PROC,
......
......@@ -213,7 +213,7 @@ run (const gchar *name,
{
case GIMP_RUN_INTERACTIVE:
case GIMP_RUN_WITH_LAST_VALS:
gimp_ui_init ("CEL", FALSE);
gimp_ui_init (PLUG_IN_BINARY, FALSE);
export = gimp_export_image (&image_ID, &drawable_ID, "CEL",
(GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_ALPHA |
......
......@@ -31,9 +31,9 @@
#include "libgimp/stdplugins-intl.h"
#define OILIFY_PROC "plug-in-oilify"
#define OILIFY_ENHANCED_PROC "plug-in-oilify-enhanced"
#define OILIFY_BINARY "oilify"
#define PLUG_IN_PROC "plug-in-oilify"
#define PLUG_IN_ENHANCED_PROC "plug-in-oilify-enhanced"
#define PLUG_IN_BINARY "oilify"
#define SCALE_WIDTH 125
#define HISTSIZE 256
......@@ -115,7 +115,7 @@ query (void)
{ GIMP_PDB_DRAWABLE, "exponent-map", "Exponent control map" }
};
gimp_install_procedure (OILIFY_PROC,
gimp_install_procedure (PLUG_IN_PROC,
N_("Smear colors to simulate an oil painting"),
"This function performs the well-known oil-paint "
"effect on the specified drawable.",
......@@ -128,9 +128,9 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (OILIFY_PROC, "<Image>/Filters/Artistic");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Artistic");
gimp_install_procedure (OILIFY_ENHANCED_PROC,
gimp_install_procedure (PLUG_IN_ENHANCED_PROC,
N_("Smear colors to simulate an oil painting"),
"This function performs the well-known oil-paint "
"effect on the specified drawable.",
......@@ -174,7 +174,7 @@ run (const gchar *name,
{
case GIMP_RUN_INTERACTIVE:
/* Possibly retrieve data */
gimp_get_data (OILIFY_PROC, &ovals);
gimp_get_data (PLUG_IN_PROC, &ovals);
/* First acquire information with a dialog */
if (! oilify_dialog (drawable))
......@@ -183,7 +183,7 @@ run (const gchar *name,
case GIMP_RUN_NONINTERACTIVE:
/* Interpret the arguments per the name used to invoke us */
if (! strcmp (name, OILIFY_PROC))
if (! strcmp (name, PLUG_IN_PROC))
{
if (nparams != 5)
{
......@@ -195,7 +195,7 @@ run (const gchar *name,
ovals.mode = param[4].data.d_int32;
}
}
else if (! strcmp (name, OILIFY_ENHANCED_PROC))
else if (! strcmp (name, PLUG_IN_ENHANCED_PROC))
{
if (nparams < 5 || nparams > 8)
{
......@@ -232,7 +232,7 @@ run (const gchar *name,
case GIMP_RUN_WITH_LAST_VALS:
/* Possibly retrieve data */
gimp_get_data (OILIFY_PROC, &ovals);
gimp_get_data (PLUG_IN_PROC, &ovals);
break;
default:
......@@ -253,7 +253,7 @@ run (const gchar *name,
/* Store data */
if (run_mode == GIMP_RUN_INTERACTIVE)
gimp_set_data (OILIFY_PROC, &ovals, sizeof (OilifyVals));
gimp_set_data (PLUG_IN_PROC, &ovals, sizeof (OilifyVals));
}
else
{
......@@ -772,11 +772,11 @@ oilify_dialog (GimpDrawable *drawable)
if (! can_use_mode_inten && ovals.mode == MODE_INTEN)
ovals.mode = MODE_RGB;
gimp_ui_init (OILIFY_BINARY, FALSE);
gimp_ui_init (PLUG_IN_BINARY, FALSE);
dialog = gimp_dialog_new (_("Oilify"), OILIFY_BINARY,
dialog = gimp_dialog_new (_("Oilify"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, OILIFY_PROC,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
......
......@@ -788,7 +788,7 @@ save_dialog (gint channels)
GSList *group;
gboolean run;
dialog = gimp_dialog_new (_("Save as BMP"), "bmp",
dialog = gimp_dialog_new (_("Save as BMP"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, SAVE_PROC,
......
......@@ -221,7 +221,7 @@ run (const gchar *name,
case GIMP_RUN_WITH_LAST_VALS:
if (run_mode == GIMP_RUN_WITH_LAST_VALS) lastvals = TRUE;
gimp_ui_init ("file-bmp", FALSE);
gimp_ui_init (PLUG_IN_BINARY, FALSE);
export = gimp_export_image (&image_ID, &drawable_ID, "BMP",
(GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_ALPHA |
......
......@@ -17,8 +17,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define LOAD_PROC "file-bmp-load"
#define SAVE_PROC "file-bmp-save"
#ifndef __BMP_H__
#define __BMP_H__
#define LOAD_PROC "file-bmp-load"
#define SAVE_PROC "file-bmp-save"
#define PLUG_IN_BINARY "file-bmp"
#define MAXCOLORS 256
......@@ -68,3 +72,5 @@ typedef struct _Bitmap_Channel
guint32 shiftin;
gfloat max_value;
} Bitmap_Channel;
#endif /* __BMP_H__ */
......@@ -51,7 +51,7 @@ ico_dialog_new (IcoSaveInfo *info)
GtkWidget *scrolledwindow;
GtkWidget *warning;
dialog = gimp_dialog_new (_("Save as Windows Icon"), "ico",
dialog = gimp_dialog_new (_("Save as Windows Icon"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, "plug-in-winicon",
......
......@@ -233,7 +233,7 @@ ico_save_dialog (gint32 image_ID,
gint i;
gint response;
gimp_ui_init ("file-ico", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
dialog = ico_dialog_new (info);
for (i = 0; i < info->num_icons; i++)
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MAIN_H__
#define __MAIN_H__
#ifndef __ICO_H__
#define __ICO_H__
#ifdef ICO_DBG
......@@ -33,6 +33,8 @@
#define D(x)
#endif
#define PLUG_IN_BINARY "file-ico"
#define ICO_PNG_MAGIC 0x474e5089
#define ICO_ALPHA_THRESHOLD 127
#define ICO_MAXBUF 4096
......@@ -105,4 +107,4 @@ guint8 * ico_alloc_map (gint width,
gint bpp,
gint *len);
#endif /* __MAIN_H__ */
#endif /* __ICO_H__ */
......@@ -36,6 +36,7 @@
#define PLUG_IN_PROC "plug-in-flame"
#define PLUG_IN_BINARY "flame"
#define VARIATION_SAME (-2)
......@@ -642,7 +643,7 @@ edit_callback (GtkWidget *widget,
GtkObject *adj;
gint i, j;
edit_dialog = gimp_dialog_new (_("Edit Flame"), "flame",
edit_dialog = gimp_dialog_new (_("Edit Flame"), PLUG_IN_BINARY,
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, PLUG_IN_PROC,
......@@ -962,9 +963,9 @@ flame_dialog (void)
GtkObject *adj;
gboolean run;
gimp_ui_init ("flame", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
dialog = gimp_dialog_new (_("Flame"), "flame",
dialog = gimp_dialog_new (_("Flame"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, PLUG_IN_PROC,
......
......@@ -528,7 +528,7 @@ explorer_dialog (void)
GSList *group = NULL;
gint i;
gimp_ui_init ("fractal-explorer", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
path = gimp_gimprc_query ("fractalexplorer-path");
......@@ -560,9 +560,9 @@ explorer_dialog (void)
elements = g_new (DialogElements, 1);
dialog = maindlg =
gimp_dialog_new ("Fractal Explorer", "fractal-explorer",
gimp_dialog_new ("Fractal Explorer", PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, HELP_ID,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
......
......@@ -71,8 +71,6 @@
#include "libgimp/stdplugins-intl.h"
#define PLUG_IN_PROC "plug-in-fractalexplorer"
/**********************************************************************
Global variables
*********************************************************************/
......@@ -1113,10 +1111,10 @@ fractalexplorer_rescan_list (GtkWidget *widget,
return;
}
dlg = gimp_dialog_new (_("Rescan for Fractals"), "fractalexplorer",
dlg = gimp_dialog_new (_("Rescan for Fractals"), PLUG_IN_BINARY,
gtk_widget_get_toplevel (view),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
......
......@@ -15,7 +15,8 @@
#define MAXNCOLORS 8192
#define MAXSTRLEN 256
#define HELP_ID "plug-in-fractalexplorer"
#define PLUG_IN_PROC "plug-in-fractalexplorer"
#define PLUG_IN_BINARY "fractal-explorer"
#define FRACTAL_HEADER "Fractal Explorer Plug-In Version 2 - (c) 1997 <cotting@mygale.org>\n"
#define fractalexplorer_HEADER "Fractal Explorer Plug-In Version 2 - (c) 1997 <cotting@mygale.org>\n"
......
......@@ -86,7 +86,7 @@ query (void)
{ GIMP_PDB_STRING, "preset", "Preset Name" },
};
gimp_install_procedure (PLUG_IN_NAME,
gimp_install_procedure (PLUG_IN_PROC,
N_("Performs various artistic operations"),
"Performs various artistic operations on an image",
"Vidar Madsen <vidar@prosalg.no>",
......@@ -98,14 +98,14 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Filters/Artistic");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Artistic");
}
static void
gimpressionist_get_data (void)
{
restore_default_values ();
gimp_get_data (PLUG_IN_NAME, &pcvals);
gimp_get_data (PLUG_IN_PROC, &pcvals);
}
static void
......@@ -204,7 +204,7 @@ run (const gchar *name,
gimp_displays_flush ();
if (run_mode == GIMP_RUN_INTERACTIVE)
gimp_set_data (PLUG_IN_NAME,
gimp_set_data (PLUG_IN_PROC,
&pcvals,
sizeof (gimpressionist_vals_t));
}
......
......@@ -134,11 +134,11 @@ create_dialog (void)
GtkWidget *hbox;
GtkWidget *preview_box;
gimp_ui_init ("gimpressionist", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
dialog = gimp_dialog_new (_("GIMPressionist"), "gimpressionist",
dialog = gimp_dialog_new (_("GIMPressionist"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, PLUG_IN_NAME,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
......
......@@ -26,8 +26,9 @@
#include "ppmtool.h"
/* Defines */
#define PLUG_IN_NAME "plug-in-gimpressionist"
#define PLUG_IN_PROC "plug-in-gimpressionist"
#define PLUG_IN_VERSION "v1.0, November 2003"
#define PLUG_IN_BINARY "gimpressionist"
#define PREVIEWSIZE 150
#define MAXORIENTVECT 50
......
......@@ -523,9 +523,9 @@ create_orientmap_dialog (GtkWidget *parent)
}
orient_map_window =
gimp_dialog_new (_("Orientation Map Editor"), "gimpressionist",
gimp_dialog_new (_("Orientation Map Editor"), PLUG_IN_BINARY,
gtk_widget_get_toplevel (parent), 0,
gimp_standard_help_func, PLUG_IN_NAME,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
......
......@@ -635,9 +635,9 @@ create_save_preset (GtkWidget *parent)
}
window =
gimp_dialog_new (_("Save Current"), "gimpressionist",
gimp_dialog_new (_("Save Current"), PLUG_IN_BINARY,
gtk_widget_get_toplevel (parent), 0,
gimp_standard_help_func, PLUG_IN_NAME,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
......
......@@ -398,9 +398,9 @@ create_sizemap_dialog (GtkWidget *parent)
}
smwindow =
gimp_dialog_new (_("Size Map Editor"), "gimpressionist",
gimp_dialog_new (_("Size Map Editor"), PLUG_IN_BINARY,
gtk_widget_get_toplevel (parent), 0,
gimp_standard_help_func, PLUG_IN_NAME,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_APPLY, RESPONSE_APPLY,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
......
......@@ -162,7 +162,7 @@ static GdkCursor *busy_cursor = NULL;
/* public functions */
void
browser_dialog_open (void)
browser_dialog_open (const gchar *plug_in_binary)
{
GtkWidget *window;
GtkWidget *main_vbox;
......@@ -175,14 +175,14 @@ browser_dialog_open (void)
GtkAction *action;
DialogData data = { 720, 560, 240, TRUE, 1.0 };
gimp_ui_init ("helpbrowser", TRUE);
gimp_ui_init (plug_in_binary, TRUE);
gimp_get_data (GIMP_HELP_BROWSER_DIALOG_DATA, &data);
/* the dialog window */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), _("GIMP Help Browser"));
gtk_window_set_role (GTK_WINDOW (window), "help-browser");
gtk_window_set_role (GTK_WINDOW (window), plug_in_binary);
gtk_window_set_default_size (GTK_WINDOW (window), data.width, data.height);
......
......@@ -26,7 +26,7 @@
#define __DIALOG_H__
void browser_dialog_open (void);
void browser_dialog_open (const gchar *plug_in_binary);
void browser_dialog_load (const gchar *uri);
void browser_dialog_make_index (GimpHelpDomain *domain,
......
......@@ -42,6 +42,7 @@
#define GIMP_HELP_BROWSER_EXT_PROC "extension-gimp-help-browser"
#define GIMP_HELP_BROWSER_TEMP_EXT_PROC "extension-gimp-help-browser-temp"
#define PLUG_IN_BINARY "help-browser"
/* forward declarations */
......@@ -149,7 +150,7 @@ run (const gchar *name,
if (status == GIMP_PDB_SUCCESS)
{
browser_dialog_open ();
browser_dialog_open (PLUG_IN_BINARY);
temp_proc_install ();
......
......@@ -53,8 +53,9 @@
#define UNDO_LEVELS 24
#define IFSCOMPOSE_PARASITE "ifscompose-parasite"
#define IFSCOMPOSE_PROC "plug-in-ifscompose"
#define PLUG_IN_PARASITE "ifscompose-parasite"
#define PLUG_IN_PROC "plug-in-ifscompose"
#define PLUG_IN_BINARY "ifs-compose"
typedef enum
{
......@@ -329,7 +330,7 @@ query (void)
static const GimpParamDef *return_vals = NULL;
static int nreturn_vals = 0;
gimp_install_procedure (IFSCOMPOSE_PROC,
gimp_install_procedure (PLUG_IN_PROC,
N_("Create an Iterated Function System (IFS) fractal"),
"Interactively create an Iterated Function System "
"fractal. Use the window on the upper left to adjust "
......@@ -348,7 +349,7 @@ query (void)
G_N_ELEMENTS (args), nreturn_vals,
args, return_vals);
gimp_plugin_menu_register (IFSCOMPOSE_PROC,
gimp_plugin_menu_register (PLUG_IN_PROC,
"<Image>/Filters/Render/Nature");
}
......@@ -387,7 +388,7 @@ run (const gchar *name,
* if not found, fall back to global values
*/
parasite = gimp_drawable_parasite_find (drawable->drawable_id,
IFSCOMPOSE_PARASITE);
PLUG_IN_PARASITE);
if (parasite)
{
found_parasite = ifsvals_parse_string (gimp_parasite_data (parasite),
......@@ -397,13 +398,13 @@ run (const gchar *name,
if (!found_parasite)
{
gint length = gimp_get_data_size (IFSCOMPOSE_PROC);
gint length = gimp_get_data_size (PLUG_IN_PROC);
if (length > 0)
{
gchar *data = g_new (gchar, length);
gimp_get_data (IFSCOMPOSE_PROC, data);
gimp_get_data (PLUG_IN_PROC, data);
ifsvals_parse_string (data, &ifsvals, &elements);
g_free (data);
}
......@@ -423,13 +424,13 @@ run (const gchar *name,
case GIMP_RUN_WITH_LAST_VALS:
{
gint length = gimp_get_data_size (IFSCOMPOSE_PROC);
gint length = gimp_get_data_size (PLUG_IN_PROC);
if (length > 0)
{
gchar *data = g_new (gchar, length);
gimp_get_data (IFSCOMPOSE_PROC, data);
gimp_get_data (PLUG_IN_PROC, data);
ifsvals_parse_string (data, &ifsvals, &elements);
g_free (data);
}
......@@ -468,9 +469,9 @@ run (const gchar *name,
*/
str = ifsvals_stringify (&ifsvals, elements);
gimp_set_data (IFSCOMPOSE_PROC, str, strlen (str) + 1);
gimp_set_data (PLUG_IN_PROC, str, strlen (str) + 1);
parasite = gimp_parasite_new (IFSCOMPOSE_PARASITE,
parasite = gimp_parasite_new (PLUG_IN_PARASITE,
GIMP_PARASITE_PERSISTENT |
GIMP_PARASITE_UNDOABLE,
strlen (str) + 1, str);
......@@ -764,11 +765,11 @@ ifs_compose_dialog (GimpDrawable *drawable)
ifsD->preview_width = design_width;
ifsD->preview_height = design_height;
gimp_ui_init ("ifscompose", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
dialog = gimp_dialog_new (_("IFS Fractal"), "ifscompose",
dialog = gimp_dialog_new (_("IFS Fractal"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, IFSCOMPOSE_PROC,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_OPEN, RESPONSE_OPEN,
GTK_STOCK_SAVE, RESPONSE_SAVE,
......@@ -1173,8 +1174,9 @@ ifs_options_dialog (GtkWidget *parent)
ifsOptD = g_new0 (IfsOptionsDialog, 1);
ifsOptD->dialog =
gimp_dialog_new (_("IFS Fractal Render Options"), "ifscompose",
parent, 0, NULL, NULL,
gimp_dialog_new (_("IFS Fractal Render Options"), PLUG_IN_BINARY,
parent, 0,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
......
......@@ -93,11 +93,9 @@ make_default_dialog (const gchar *title)
data->apply_cb = NULL;
data->cancel_cb = NULL;
data->dialog = gimp_dialog_new (title, "imagemap",
data->dialog = gimp_dialog_new (title, PLUG_IN_BINARY,
get_dialog(), 0,
/* gimp_standard_help_func,
"plug-in-imagemap", */
gimp_standard_help_func, NULL,
gimp_standard_help_func, PLUG_IN_PROC,
NULL);
data->apply = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
......
......@@ -61,8 +61,6 @@
#define ZOOMED(x) (_zoom_factor * (x))
#define GET_REAL_COORD(x) ((x) / _zoom_factor)
#define PLUG_IN_PROC "plug-in-imagemap"
static gint zoom_in (void);
static gint zoom_out (void);
......@@ -1260,7 +1258,7 @@ dialog(GimpDrawable *drawable)
GtkWidget *tools;
Menu_t *menu;
gimp_ui_init ("imagemap", TRUE);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
set_arrow_func ();
......@@ -1270,18 +1268,18 @@ dialog(GimpDrawable *drawable)
gtk_window_set_resizable(GTK_WINDOW(dlg), TRUE);
main_set_title(NULL);
gimp_help_connect (dlg, gimp_standard_help_func, "plug-in-imagemap", NULL);
gimp_help_connect (dlg, gimp_standard_help_func, PLUG_IN_PROC, NULL);
gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gimp_window_set_transient (GTK_WINDOW (dlg));
g_signal_connect(dlg, "delete-event",
G_CALLBACK(close_callback), NULL);
g_signal_connect(dlg, "key-press-event",
G_CALLBACK(key_press_cb), NULL);
g_signal_connect(dlg, "key_release_event",
G_CALLBACK(key_release_cb), NULL);
g_signal_connect (dlg, "delete-event",
G_CALLBACK (close_callback), NULL);
g_signal_connect (dlg, "key-press-event",
G_CALLBACK (key_press_cb), NULL);
g_signal_connect (dlg, "key_release_event",
G_CALLBACK (key_release_cb), NULL);
g_signal_connect (dlg, "destroy",
G_CALLBACK (gtk_main_quit),
......
......@@ -28,6 +28,9 @@
#include "imap_object.h"
#include "imap_preferences.h"
#define PLUG_IN_PROC "plug-in-imagemap"
#define PLUG_IN_BINARY "imagemap"
typedef enum {NCSA, CERN, CSIM} MapFormat_t;
typedef struct {
......
......@@ -36,9 +36,6 @@
#include "libgimp/stdplugins-intl.h"
#define PLUG_IN_PROC "plug-in-lighting"
LightingValues mapvals;
/******************/
......
......@@ -4,6 +4,9 @@
/* Defines and stuff */
/* ================= */
#define PLUG_IN_PROC "plug-in-lighting"
#define PLUG_IN_BINARY "lighting"
#define TILE_CACHE_SIZE 16
#define NUM_LIGHTS 6
......
......@@ -1005,7 +1005,7 @@ main_dialog (GimpDrawable *drawable)
GtkWidget *image;
*/
gimp_ui_init ("Lighting", FALSE);
gimp_ui_init (PLUG_IN_BINARY, FALSE);
path = gimp_gimprc_query ("lighting-effects-path");
if (path)
......@@ -1016,9 +1016,9 @@ main_dialog (GimpDrawable *drawable)
lighting_stock_init ();
appwin = gimp_dialog_new (_("Lighting Effects"), "Lighting",
appwin = gimp_dialog_new (_("Lighting Effects"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, "plug-in-lighting",
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
......
......@@ -36,9 +36,6 @@
#include "libgimp/stdplugins-intl.h"
#define PLUG_IN_PROC "plug-in-map-object"
/* Global variables */
/* ================ */
......
......@@ -4,6 +4,9 @@
/* Defines and stuff */
/* ================= */
#define PLUG_IN_PROC "plug-in-map-object"
#define PLUG_IN_BINARY "map-object"
#define TILE_CACHE_SIZE 16
/* Typedefs */
......