gimp r26509 - in trunk: . plug-ins/common plug-ins/file-bmp plug-ins/file-ico plug-ins/flame plug-ins/fractal-explorer plug-ins/gimpressionist plug-ins/help-browser plug-ins/ifs-compose plug-ins/imagemap plug-ins/lighting plug-ins/map-object plug-ins/selection-to-path plug-ins/win-snap
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26509 - in trunk: . plug-ins/common plug-ins/file-bmp plug-ins/file-ico plug-ins/flame plug-ins/fractal-explorer plug-ins/gimpressionist plug-ins/help-browser plug-ins/ifs-compose plug-ins/imagemap plug-ins/lighting plug-ins/map-object plug-ins/selection-to-path plug-ins/win-snap
- Date: Mon, 11 Aug 2008 19:42:08 +0000 (UTC)
Author: mitch
Date: Mon Aug 11 19:42:08 2008
New Revision: 26509
URL: http://svn.gnome.org/viewvc/gimp?rev=26509&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/plug-ins/common/cml-explorer.c
trunk/plug-ins/common/depth-merge.c
trunk/plug-ins/common/file-cel.c
trunk/plug-ins/common/oilify.c
trunk/plug-ins/file-bmp/bmp-write.c
trunk/plug-ins/file-bmp/bmp.c
trunk/plug-ins/file-bmp/bmp.h
trunk/plug-ins/file-ico/ico-dialog.c
trunk/plug-ins/file-ico/ico-save.c
trunk/plug-ins/file-ico/ico.h
trunk/plug-ins/flame/flame.c
trunk/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
trunk/plug-ins/fractal-explorer/fractal-explorer.c
trunk/plug-ins/fractal-explorer/fractal-explorer.h
trunk/plug-ins/gimpressionist/gimp.c
trunk/plug-ins/gimpressionist/gimpressionist.c
trunk/plug-ins/gimpressionist/gimpressionist.h
trunk/plug-ins/gimpressionist/orientmap.c
trunk/plug-ins/gimpressionist/presets.c
trunk/plug-ins/gimpressionist/sizemap.c
trunk/plug-ins/help-browser/dialog.c
trunk/plug-ins/help-browser/dialog.h
trunk/plug-ins/help-browser/help-browser.c
trunk/plug-ins/ifs-compose/ifs-compose.c
trunk/plug-ins/imagemap/imap_default_dialog.c
trunk/plug-ins/imagemap/imap_main.c
trunk/plug-ins/imagemap/imap_main.h
trunk/plug-ins/lighting/lighting-main.c
trunk/plug-ins/lighting/lighting-main.h
trunk/plug-ins/lighting/lighting-ui.c
trunk/plug-ins/map-object/map-object-main.c
trunk/plug-ins/map-object/map-object-main.h
trunk/plug-ins/map-object/map-object-ui.c
trunk/plug-ins/selection-to-path/selection-to-path.c
trunk/plug-ins/win-snap/Makefile.am
trunk/plug-ins/win-snap/winsnap.c
Modified: trunk/plug-ins/common/cml-explorer.c
==============================================================================
--- trunk/plug-ins/common/cml-explorer.c (original)
+++ trunk/plug-ins/common/cml-explorer.c Mon Aug 11 19:42:08 2008
@@ -1816,7 +1816,7 @@
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,
Modified: trunk/plug-ins/common/depth-merge.c
==============================================================================
--- trunk/plug-ins/common/depth-merge.c (original)
+++ trunk/plug-ins/common/depth-merge.c Mon Aug 11 19:42:08 2008
@@ -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 @@
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,
Modified: trunk/plug-ins/common/file-cel.c
==============================================================================
--- trunk/plug-ins/common/file-cel.c (original)
+++ trunk/plug-ins/common/file-cel.c Mon Aug 11 19:42:08 2008
@@ -213,7 +213,7 @@
{
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 |
Modified: trunk/plug-ins/common/oilify.c
==============================================================================
--- trunk/plug-ins/common/oilify.c (original)
+++ trunk/plug-ins/common/oilify.c Mon Aug 11 19:42:08 2008
@@ -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 @@
{ 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 @@
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 @@
{
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 @@
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 @@
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 @@
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 @@
/* 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 @@
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,
Modified: trunk/plug-ins/file-bmp/bmp-write.c
==============================================================================
--- trunk/plug-ins/file-bmp/bmp-write.c (original)
+++ trunk/plug-ins/file-bmp/bmp-write.c Mon Aug 11 19:42:08 2008
@@ -788,7 +788,7 @@
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,
Modified: trunk/plug-ins/file-bmp/bmp.c
==============================================================================
--- trunk/plug-ins/file-bmp/bmp.c (original)
+++ trunk/plug-ins/file-bmp/bmp.c Mon Aug 11 19:42:08 2008
@@ -221,7 +221,7 @@
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 |
Modified: trunk/plug-ins/file-bmp/bmp.h
==============================================================================
--- trunk/plug-ins/file-bmp/bmp.h (original)
+++ trunk/plug-ins/file-bmp/bmp.h Mon Aug 11 19:42:08 2008
@@ -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 @@
guint32 shiftin;
gfloat max_value;
} Bitmap_Channel;
+
+#endif /* __BMP_H__ */
Modified: trunk/plug-ins/file-ico/ico-dialog.c
==============================================================================
--- trunk/plug-ins/file-ico/ico-dialog.c (original)
+++ trunk/plug-ins/file-ico/ico-dialog.c Mon Aug 11 19:42:08 2008
@@ -51,7 +51,7 @@
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",
Modified: trunk/plug-ins/file-ico/ico-save.c
==============================================================================
--- trunk/plug-ins/file-ico/ico-save.c (original)
+++ trunk/plug-ins/file-ico/ico-save.c Mon Aug 11 19:42:08 2008
@@ -233,7 +233,7 @@
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++)
Modified: trunk/plug-ins/file-ico/ico.h
==============================================================================
--- trunk/plug-ins/file-ico/ico.h (original)
+++ trunk/plug-ins/file-ico/ico.h Mon Aug 11 19:42:08 2008
@@ -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 @@
gint bpp,
gint *len);
-#endif /* __MAIN_H__ */
+#endif /* __ICO_H__ */
Modified: trunk/plug-ins/flame/flame.c
==============================================================================
--- trunk/plug-ins/flame/flame.c (original)
+++ trunk/plug-ins/flame/flame.c Mon Aug 11 19:42:08 2008
@@ -36,6 +36,7 @@
#define PLUG_IN_PROC "plug-in-flame"
+#define PLUG_IN_BINARY "flame"
#define VARIATION_SAME (-2)
@@ -642,7 +643,7 @@
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 @@
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,
Modified: trunk/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
==============================================================================
--- trunk/plug-ins/fractal-explorer/fractal-explorer-dialogs.c (original)
+++ trunk/plug-ins/fractal-explorer/fractal-explorer-dialogs.c Mon Aug 11 19:42:08 2008
@@ -528,7 +528,7 @@
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 @@
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,
Modified: trunk/plug-ins/fractal-explorer/fractal-explorer.c
==============================================================================
--- trunk/plug-ins/fractal-explorer/fractal-explorer.c (original)
+++ trunk/plug-ins/fractal-explorer/fractal-explorer.c Mon Aug 11 19:42:08 2008
@@ -71,8 +71,6 @@
#include "libgimp/stdplugins-intl.h"
-#define PLUG_IN_PROC "plug-in-fractalexplorer"
-
/**********************************************************************
Global variables
*********************************************************************/
@@ -1113,10 +1111,10 @@
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,
Modified: trunk/plug-ins/fractal-explorer/fractal-explorer.h
==============================================================================
--- trunk/plug-ins/fractal-explorer/fractal-explorer.h (original)
+++ trunk/plug-ins/fractal-explorer/fractal-explorer.h Mon Aug 11 19:42:08 2008
@@ -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"
Modified: trunk/plug-ins/gimpressionist/gimp.c
==============================================================================
--- trunk/plug-ins/gimpressionist/gimp.c (original)
+++ trunk/plug-ins/gimpressionist/gimp.c Mon Aug 11 19:42:08 2008
@@ -86,7 +86,7 @@
{ 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 @@
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 @@
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));
}
Modified: trunk/plug-ins/gimpressionist/gimpressionist.c
==============================================================================
--- trunk/plug-ins/gimpressionist/gimpressionist.c (original)
+++ trunk/plug-ins/gimpressionist/gimpressionist.c Mon Aug 11 19:42:08 2008
@@ -134,11 +134,11 @@
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,
Modified: trunk/plug-ins/gimpressionist/gimpressionist.h
==============================================================================
--- trunk/plug-ins/gimpressionist/gimpressionist.h (original)
+++ trunk/plug-ins/gimpressionist/gimpressionist.h Mon Aug 11 19:42:08 2008
@@ -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
Modified: trunk/plug-ins/gimpressionist/orientmap.c
==============================================================================
--- trunk/plug-ins/gimpressionist/orientmap.c (original)
+++ trunk/plug-ins/gimpressionist/orientmap.c Mon Aug 11 19:42:08 2008
@@ -523,9 +523,9 @@
}
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,
Modified: trunk/plug-ins/gimpressionist/presets.c
==============================================================================
--- trunk/plug-ins/gimpressionist/presets.c (original)
+++ trunk/plug-ins/gimpressionist/presets.c Mon Aug 11 19:42:08 2008
@@ -635,9 +635,9 @@
}
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,
Modified: trunk/plug-ins/gimpressionist/sizemap.c
==============================================================================
--- trunk/plug-ins/gimpressionist/sizemap.c (original)
+++ trunk/plug-ins/gimpressionist/sizemap.c Mon Aug 11 19:42:08 2008
@@ -398,9 +398,9 @@
}
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,
Modified: trunk/plug-ins/help-browser/dialog.c
==============================================================================
--- trunk/plug-ins/help-browser/dialog.c (original)
+++ trunk/plug-ins/help-browser/dialog.c Mon Aug 11 19:42:08 2008
@@ -162,7 +162,7 @@
/* public functions */
void
-browser_dialog_open (void)
+browser_dialog_open (const gchar *plug_in_binary)
{
GtkWidget *window;
GtkWidget *main_vbox;
@@ -175,14 +175,14 @@
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);
Modified: trunk/plug-ins/help-browser/dialog.h
==============================================================================
--- trunk/plug-ins/help-browser/dialog.h (original)
+++ trunk/plug-ins/help-browser/dialog.h Mon Aug 11 19:42:08 2008
@@ -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,
Modified: trunk/plug-ins/help-browser/help-browser.c
==============================================================================
--- trunk/plug-ins/help-browser/help-browser.c (original)
+++ trunk/plug-ins/help-browser/help-browser.c Mon Aug 11 19:42:08 2008
@@ -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 @@
if (status == GIMP_PDB_SUCCESS)
{
- browser_dialog_open ();
+ browser_dialog_open (PLUG_IN_BINARY);
temp_proc_install ();
Modified: trunk/plug-ins/ifs-compose/ifs-compose.c
==============================================================================
--- trunk/plug-ins/ifs-compose/ifs-compose.c (original)
+++ trunk/plug-ins/ifs-compose/ifs-compose.c Mon Aug 11 19:42:08 2008
@@ -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 @@
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 @@
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 @@
* 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 @@
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 @@
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 @@
*/
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 @@
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 @@
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,
Modified: trunk/plug-ins/imagemap/imap_default_dialog.c
==============================================================================
--- trunk/plug-ins/imagemap/imap_default_dialog.c (original)
+++ trunk/plug-ins/imagemap/imap_default_dialog.c Mon Aug 11 19:42:08 2008
@@ -93,11 +93,9 @@
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),
Modified: trunk/plug-ins/imagemap/imap_main.c
==============================================================================
--- trunk/plug-ins/imagemap/imap_main.c (original)
+++ trunk/plug-ins/imagemap/imap_main.c Mon Aug 11 19:42:08 2008
@@ -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 @@
GtkWidget *tools;
Menu_t *menu;
- gimp_ui_init ("imagemap", TRUE);
+ gimp_ui_init (PLUG_IN_BINARY, TRUE);
set_arrow_func ();
@@ -1270,18 +1268,18 @@
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),
Modified: trunk/plug-ins/imagemap/imap_main.h
==============================================================================
--- trunk/plug-ins/imagemap/imap_main.h (original)
+++ trunk/plug-ins/imagemap/imap_main.h Mon Aug 11 19:42:08 2008
@@ -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 {
Modified: trunk/plug-ins/lighting/lighting-main.c
==============================================================================
--- trunk/plug-ins/lighting/lighting-main.c (original)
+++ trunk/plug-ins/lighting/lighting-main.c Mon Aug 11 19:42:08 2008
@@ -36,9 +36,6 @@
#include "libgimp/stdplugins-intl.h"
-#define PLUG_IN_PROC "plug-in-lighting"
-
-
LightingValues mapvals;
/******************/
Modified: trunk/plug-ins/lighting/lighting-main.h
==============================================================================
--- trunk/plug-ins/lighting/lighting-main.h (original)
+++ trunk/plug-ins/lighting/lighting-main.h Mon Aug 11 19:42:08 2008
@@ -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
Modified: trunk/plug-ins/lighting/lighting-ui.c
==============================================================================
--- trunk/plug-ins/lighting/lighting-ui.c (original)
+++ trunk/plug-ins/lighting/lighting-ui.c Mon Aug 11 19:42:08 2008
@@ -1005,7 +1005,7 @@
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 @@
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,
Modified: trunk/plug-ins/map-object/map-object-main.c
==============================================================================
--- trunk/plug-ins/map-object/map-object-main.c (original)
+++ trunk/plug-ins/map-object/map-object-main.c Mon Aug 11 19:42:08 2008
@@ -36,9 +36,6 @@
#include "libgimp/stdplugins-intl.h"
-#define PLUG_IN_PROC "plug-in-map-object"
-
-
/* Global variables */
/* ================ */
Modified: trunk/plug-ins/map-object/map-object-main.h
==============================================================================
--- trunk/plug-ins/map-object/map-object-main.h (original)
+++ trunk/plug-ins/map-object/map-object-main.h Mon Aug 11 19:42:08 2008
@@ -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 */
Modified: trunk/plug-ins/map-object/map-object-ui.c
==============================================================================
--- trunk/plug-ins/map-object/map-object-ui.c (original)
+++ trunk/plug-ins/map-object/map-object-ui.c Mon Aug 11 19:42:08 2008
@@ -1330,11 +1330,11 @@
GimpZoomModel *model;
gboolean run = FALSE;
- gimp_ui_init ("map-object", FALSE);
+ gimp_ui_init (PLUG_IN_BINARY, FALSE);
- appwin = gimp_dialog_new (_("Map to Object"), "map-object",
+ appwin = gimp_dialog_new (_("Map to Object"), PLUG_IN_BINARY,
NULL, 0,
- gimp_standard_help_func, "plug-in-map-object",
+ gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
Modified: trunk/plug-ins/selection-to-path/selection-to-path.c
==============================================================================
--- trunk/plug-ins/selection-to-path/selection-to-path.c (original)
+++ trunk/plug-ins/selection-to-path/selection-to-path.c Mon Aug 11 19:42:08 2008
@@ -46,6 +46,8 @@
#include "libgimp/stdplugins-intl.h"
+#define PLUG_IN_BINARY "selection-to-path"
+
#define RESPONSE_RESET 1
#define MID_POINT 127
@@ -295,9 +297,10 @@
retVal = FALSE;
- gimp_ui_init ("sel2path", FALSE);
+ gimp_ui_init (PLUG_IN_BINARY, FALSE);
- dlg = gimp_dialog_new (_("Selection to Path Advanced Settings"), "sel2path",
+ dlg = gimp_dialog_new (_("Selection to Path Advanced Settings"),
+ PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, "plug-in-sel2path-advanced",
Modified: trunk/plug-ins/win-snap/Makefile.am
==============================================================================
--- trunk/plug-ins/win-snap/Makefile.am (original)
+++ trunk/plug-ins/win-snap/Makefile.am Mon Aug 11 19:42:08 2008
@@ -12,9 +12,9 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = winsnap
+libexec_PROGRAMS = win-snap
-winsnap_SOURCES = \
+win_snap_SOURCES = \
winsnap.c \
winsnap.h
Modified: trunk/plug-ins/win-snap/winsnap.c
==============================================================================
--- trunk/plug-ins/win-snap/winsnap.c (original)
+++ trunk/plug-ins/win-snap/winsnap.c Mon Aug 11 19:42:08 2008
@@ -55,12 +55,13 @@
* Plug-in Definitions
*/
#define PLUG_IN_NAME "plug_in_winsnap"
-#define HELP_ID "plug-in-winsnap"
+#define PLUG_IN_PROC "plug-in-winsnap"
#define PLUG_IN_PRINT_NAME "WinSnap"
#define PLUG_IN_HELP "This plug-in will capture an image of a Win32 window or desktop"
#define PLUG_IN_AUTHOR "Craig Setera (setera home com)"
#define PLUG_IN_COPYRIGHT "Craig Setera"
#define PLUG_IN_VERSION "v0.70 (07/16/1999)"
+#define PLUG_IN_BINARY "win-snap"
/*
* Application definitions
@@ -853,12 +854,12 @@
decorations = winsnapvals.decor;
/* Init GTK */
- gimp_ui_init ("winsnap", FALSE);
+ gimp_ui_init (PLUG_IN_BINARY, FALSE);
/* Main Dialog */
- dialog = gimp_dialog_new (PLUG_IN_PRINT_NAME, "winsnap",
+ dialog = gimp_dialog_new (PLUG_IN_PRINT_NAME, PLUG_IN_BINARY,
NULL, 0,
- gimp_standard_help_func, HELP_ID,
+ gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Grab"), GTK_RESPONSE_OK,
@@ -866,9 +867,9 @@
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_CANCEL,
- -1);
+ GTK_RESPONSE_OK,
+ GTK_RESPONSE_CANCEL,
+ -1);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -984,7 +985,7 @@
static const GimpParamDef return_vals[] = { OUT_ARGS };
/* the installation of the plugin */
- gimp_install_procedure (PLUG_IN_NAME,
+ gimp_install_procedure (PLUG_IN_PROC,
N_("Capture a window or desktop image"),
PLUG_IN_HELP,
PLUG_IN_AUTHOR,
@@ -998,7 +999,7 @@
args,
return_vals);
- gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/File/New/Acquire");
+ gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/File/New/Acquire");
}
/* Return values storage */
@@ -1037,7 +1038,7 @@
values[1].data.d_int32 = 0;
/* Get the data from last run */
- gimp_get_data(PLUG_IN_NAME, &winsnapvals);
+ gimp_get_data (PLUG_IN_PROC, &winsnapvals);
/* How are we running today? */
switch (run_mode) {
@@ -1072,7 +1073,7 @@
*/
if (run_mode == GIMP_RUN_INTERACTIVE) {
/* Store variable states for next run */
- gimp_set_data(PLUG_IN_NAME, &winsnapvals, sizeof(WinSnapValues));
+ gimp_set_data (PLUG_IN_PROC, &winsnapvals, sizeof(WinSnapValues));
}
/* Set return values */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
