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

Redid my latest change here, since it didn't solve the problem. Now, 

* app/plug_in.c: Redid my latest change here, since it didn't solve
  the problem. Now, registering with image_types == NULL means the same
  as what "" used to mean: No image is required and the menu entry will
  always be sensitive.

The rest are fixes to my last commit.


--Sven
This commit is contained in:
Sven Neumann 2000-01-02 20:52:57 +00:00
parent 05bdf34357
commit 3ebaf638bb
30 changed files with 148 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
Sun Jan 2 21:46:46 CET 2000 Sven Neumann <sven@gimp.org>
* app/plug_in.c: Redid my latest change here, since it didn't solve
the problem. Now, registering with image_types == NULL means the same
as what "" used to mean: No image is required and the menu entry will
always be sensitive.
* plug-ins/script-fu/script-fu.c
* plug-ins/gap/gap_decode_mpeg_main.c
* plug-ins/gap/gap_frontends_main.c
* plug-ins/gap/gap_mpege.c: Use NULL instead of the empty string
when registering the image_types.
2000-01-02 Kelly Lynn Martin <kelly@poverty.bloomington.in.us>
* configure.in: bumped GTK req. to 1.2.6 -- I hadn't updated GTK

12
app/actions/plug-in-commands.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/gui/plug-in-commands.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/gui/plug-in-menus.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/menus/plug-in-menus.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimpplugin-message.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimpplugin-progress.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimpplugin.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimppluginmanager-call.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimppluginmanager-run.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimppluginmanager.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/gimppluginshm.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in-def.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in-message.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in-params.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in-progress.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in-run.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in-shm.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-in.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug-in/plug-ins.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

12
app/plug_in.c
View File

@ -3099,14 +3099,14 @@ plug_in_args_destroy (Argument *args,
int
plug_in_image_types_parse (char *image_types)
{
int types;
int types = 0;
/*
* If the plug_in registers with image_type == NULL or "", return 0
* By doing so it won't be touched by plug_in_set_menu_sensitivity()
*/
if (!image_types)
return (PLUG_IN_RGB_IMAGE | PLUG_IN_RGBA_IMAGE |
PLUG_IN_GRAY_IMAGE | PLUG_IN_GRAYA_IMAGE |
PLUG_IN_INDEXED_IMAGE | PLUG_IN_INDEXEDA_IMAGE);
types = 0;
return types;
while (*image_types)
{

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

@ -864,6 +864,7 @@ alienmap_dialog(void)
gtk_widget_show (hbbox);
button = gtk_button_new_with_label (_("About"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC (alienmap_logo_dialog),
NULL);

1
plug-ins/AlienMap2/AlienMap2.c
View File

@ -787,6 +787,7 @@ if (wvals.redfrequency!=1.0) exit;
gtk_widget_show (hbbox);
button = gtk_button_new_with_label (_("About"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC (alienmap2_logo_dialog),
NULL);

4
plug-ins/gap/gap_decode_mpeg_main.c
View File

@ -166,7 +166,7 @@ query ()
"Wolfgang Hofer",
"1999/11/18",
N_("<Image>/Video/Split Video to Frames/MPEG1"),
"RGB*, INDEXED*, GRAY*",
NULL,
PROC_PLUG_IN,
nload_args, nload_return_vals,
load_args, load_return_vals);
@ -178,7 +178,7 @@ query ()
"Wolfgang Hofer",
"1999/11/18",
N_("<Toolbox>/Xtns/Split Video to Frames/MPEG1"),
"RGB*, INDEXED*, GRAY*",
NULL,
PROC_EXTENSION,
next_args, nload_return_vals,
ext_args, load_return_vals);

8
plug-ins/gap/gap_frontends_main.c
View File

@ -127,7 +127,7 @@ query ()
"Wolfgang Hofer",
gap_main_version,
N_("<Image>/Video/Split Video to Frames/Any XANIM readable..."),
"RGB*, INDEXED*, GRAY*",
NULL,
PROC_PLUG_IN,
nargs_xanim, nreturn_vals,
args_xanim, return_vals);
@ -139,7 +139,7 @@ query ()
"Wolfgang Hofer",
gap_main_version,
N_("<Toolbox>/Xtns/Split Video to Frames/Any XANIM readable..."),
"RGB*, INDEXED*, GRAY*",
NULL,
PROC_EXTENSION,
nargs_xanim_ext, nreturn_vals,
args_xanim_ext, return_vals);
@ -151,7 +151,7 @@ query ()
"Wolfgang Hofer",
gap_main_version,
N_("<Image>/Video/Encode/MPEG1..."),
"RGB*, INDEXED*, GRAY*",
"*",
PROC_PLUG_IN,
nargs_mpege, nreturn_vals,
args_mpege, return_vals);
@ -164,7 +164,7 @@ query ()
"Wolfgang Hofer",
gap_main_version,
N_("<Image>/Video/Encode/MPEG2..."),
"RGB*, INDEXED*, GRAY*",
"*",
PROC_PLUG_IN,
nargs_mpege, nreturn_vals,
args_mpege, return_vals);

4
plug-ins/gap/gap_mpege.c
View File

@ -186,7 +186,7 @@ int p_mpege_info(t_anim_info *ainfo_ptr, char *errlist, t_gap_mpeg_encoder encod
l_idx++;
/* the Action Button */
b_argv[0].but_txt = _("CANCEL");
b_argv[0].but_txt = _("Cancel");
b_argv[0].but_val = -1;
b_argv[1].but_txt = _("OK");
b_argv[1].but_val = 0;
@ -242,7 +242,7 @@ int p_mpege_dialog(t_anim_info *ainfo_ptr, t_mpg_par *mp_ptr, t_gap_mpeg_encoder
b_argv[0].but_val = -1;
b_argv[1].but_txt = _("GenParams");
b_argv[1].but_val = 0;
b_argv[2].but_txt = "Gen + Encode";
b_argv[2].but_txt = _("Gen + Encode");
b_argv[2].but_val = 1;
l_str = p_strdup_del_underscore(ainfo_ptr->basename);

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

@ -1363,6 +1363,7 @@ script_fu_interface (SFScript *script)
gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label (_("About"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) script_fu_about_callback,
title);

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

@ -1363,6 +1363,7 @@ script_fu_interface (SFScript *script)
gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label (_("About"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) script_fu_about_callback,
title);

4
plug-ins/script-fu/script-fu.c
View File

@ -156,7 +156,7 @@ query (void)
"Spencer Kimball & Peter Mattis",
"1997",
N_("<Toolbox>/Xtns/Script-Fu/Console..."),
"",
NULL,
PROC_EXTENSION,
nconsole_args, 0,
console_args, NULL);
@ -168,7 +168,7 @@ query (void)
"Spencer Kimball & Peter Mattis",
"1997",
N_("<Toolbox>/Xtns/Script-Fu/Server..."),
"",
NULL,
PROC_EXTENSION,
nserver_args, 0,
server_args, NULL);

1
plug-ins/webbrowser/webbrowser.c
View File

@ -271,6 +271,7 @@ open_url_dialog ()
gtk_widget_show (hbbox);
button = gtk_button_new_with_label (_("About"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc) about_callback,
dlg);