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

app/plug-in/Makefile.am app/plug-in/plug-in-types.h removed... 

2007-02-19  Michael Natterer  <mitch@gimp.org>

	* app/plug-in/Makefile.am
	* app/plug-in/plug-in-types.h
	* app/plug-in/plug-in-def.[ch]: removed...

	* app/plug-in/gimpplugindef.[ch]: ...and added as object. Merged
	locale and help domain setters into one function each.

	* app/plug-in/gimpplugin-message.c
	* app/plug-in/gimpplugin.[ch]
	* app/plug-in/gimppluginmanager-call.[ch]
	* app/plug-in/gimppluginmanager-file.c
	* app/plug-in/gimppluginmanager.c
	* app/plug-in/plug-in-rc.c
	* tools/pdbgen/pdb/plug_in.pdb: changed accordingly.

	* app/pdb/plug_in_cmds.c: regenerated.


svn path=/trunk/; revision=21944
This commit is contained in:
Michael Natterer 2007-02-19 01:16:05 +00:00 committed by Michael Natterer
parent 303704f013
commit be5fbd643e
16 changed files with 299 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
2007-02-19 Michael Natterer <mitch@gimp.org>
* app/plug-in/Makefile.am
* app/plug-in/plug-in-types.h
* app/plug-in/plug-in-def.[ch]: removed...
* app/plug-in/gimpplugindef.[ch]: ...and added as object. Merged
locale and help domain setters into one function each.
* app/plug-in/gimpplugin-message.c
* app/plug-in/gimpplugin.[ch]
* app/plug-in/gimppluginmanager-call.[ch]
* app/plug-in/gimppluginmanager-file.c
* app/plug-in/gimppluginmanager.c
* app/plug-in/plug-in-rc.c
* tools/pdbgen/pdb/plug_in.pdb: changed accordingly.
* app/pdb/plug_in_cmds.c: regenerated.
2007-02-18 Michael Natterer <mitch@gimp.org>
* app/text/gimptext-parasite.c

10
app/pdb/plug_in_cmds.c
View File

@ -34,11 +34,11 @@
#include "core/gimp.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimpplugindef.h"
#include "plug-in/gimppluginmanager-menu-branch.h"
#include "plug-in/gimppluginmanager-query.h"
#include "plug-in/gimppluginmanager.h"
#include "plug-in/gimppluginprocedure.h"
#include "plug-in/plug-in-def.h"
#include "internal_procs.h"
@ -109,8 +109,8 @@ plugin_domain_register_invoker (GimpProcedure *procedure,
if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
{
plug_in_def_set_locale_domain_name (plug_in->plug_in_def, domain_name);
plug_in_def_set_locale_domain_path (plug_in->plug_in_def, domain_path);
gimp_plug_in_def_set_locale_domain (plug_in->plug_in_def,
domain_name, domain_path);
}
else
success = FALSE;
@ -139,8 +139,8 @@ plugin_help_register_invoker (GimpProcedure *procedure,
if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
{
plug_in_def_set_help_domain_name (plug_in->plug_in_def, domain_name);
plug_in_def_set_help_domain_uri (plug_in->plug_in_def, domain_uri);
gimp_plug_in_def_set_help_domain (plug_in->plug_in_def,
domain_name, domain_uri);
}
else
success = FALSE;

4
app/plug-in/Makefile.am
View File

@ -35,6 +35,8 @@ libappplug_in_a_SOURCES = \
gimpplugin-message.h \
gimpplugin-progress.c \
gimpplugin-progress.h \
gimpplugindef.c \
gimpplugindef.h \
gimppluginmanager.c \
gimppluginmanager.h \
gimppluginmanager-call.c \
@ -62,8 +64,6 @@ libappplug_in_a_SOURCES = \
gimptemporaryprocedure.c \
gimptemporaryprocedure.h \
\
plug-in-def.c \
plug-in-def.h \
plug-in-params.c \
plug-in-params.h \
plug-in-rc.c \

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

@ -42,9 +42,9 @@
#include "gimpplugin.h"
#include "gimpplugin-message.h"
#include "gimppluginmanager.h"
#include "gimpplugindef.h"
#include "gimppluginshm.h"
#include "gimptemporaryprocedure.h"
#include "plug-in-def.h"
#include "plug-in-params.h"
@ -607,7 +607,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
canonical);
if (proc)
plug_in_def_remove_procedure (plug_in->plug_in_def, proc);
gimp_plug_in_def_remove_procedure (plug_in->plug_in_def, proc);
procedure = gimp_plug_in_procedure_new (proc_install->type,
plug_in->prog);
@ -691,7 +691,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
{
case GIMP_PLUGIN:
case GIMP_EXTENSION:
plug_in_def_add_procedure (plug_in->plug_in_def, proc);
gimp_plug_in_def_add_procedure (plug_in->plug_in_def, proc);
break;
case GIMP_TEMPORARY:
@ -743,7 +743,7 @@ gimp_plug_in_handle_has_init (GimpPlugIn *plug_in)
{
if (plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
{
plug_in_def_set_has_init (plug_in->plug_in_def, TRUE);
gimp_plug_in_def_set_has_init (plug_in->plug_in_def, TRUE);
}
else
{

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

@ -82,11 +82,11 @@
#include "gimpplugin-message.h"
#include "gimpplugin-progress.h"
#include "gimpplugindebug.h"
#include "gimpplugindef.h"
#include "gimppluginmanager.h"
#include "gimppluginmanager-help-domain.h"
#include "gimppluginmanager-locale-domain.h"
#include "gimptemporaryprocedure.h"
#include "plug-in-def.h"
#include "plug-in-params.h"
#include "gimp-intl.h"

2
app/plug-in/gimpplugin.h
View File

@ -67,7 +67,7 @@ struct _GimpPlugIn
GList *temp_proc_frames;
PlugInDef *plug_in_def; /* Valid during query() and init() */
GimpPlugInDef *plug_in_def; /* Valid during query() and init() */
};
struct _GimpPlugInClass

166
app/plug-in/plug-in-def.c → app/plug-in/gimpplugindef.c
View File

@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* plug-in-def.c
* gimpplugindef.c
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,32 +20,49 @@
#include "config.h"
#include <string.h>
#include <glib-object.h>
#include "plug-in-types.h"
#include "core/gimp-utils.h"
#include "gimpplugindef.h"
#include "gimppluginprocedure.h"
#include "plug-in-def.h"
PlugInDef *
plug_in_def_new (const gchar *prog)
static void gimp_plug_in_def_finalize (GObject *object);
static gint64 gimp_plug_in_def_get_memsize (GimpObject *object,
gint64 *gui_size);
G_DEFINE_TYPE (GimpPlugInDef, gimp_plug_in_def, GIMP_TYPE_OBJECT)
#define parent_class gimp_plug_in_def_parent_class
static void
gimp_plug_in_def_class_init (GimpPlugInDefClass *klass)
{
PlugInDef *plug_in_def;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
g_return_val_if_fail (prog != NULL, NULL);
object_class->finalize = gimp_plug_in_def_finalize;
plug_in_def = g_new0 (PlugInDef, 1);
plug_in_def->prog = g_strdup (prog);
return plug_in_def;
gimp_object_class->get_memsize = gimp_plug_in_def_get_memsize;
}
void
plug_in_def_free (PlugInDef *plug_in_def)
static void
gimp_plug_in_def_init (GimpPlugInDef *def)
{
g_return_if_fail (plug_in_def != NULL);
}
static void
gimp_plug_in_def_finalize (GObject *object)
{
GimpPlugInDef *plug_in_def = GIMP_PLUG_IN_DEF (object);
g_free (plug_in_def->prog);
g_free (plug_in_def->locale_domain_name);
@ -56,14 +73,59 @@ plug_in_def_free (PlugInDef *plug_in_def)
g_slist_foreach (plug_in_def->procedures, (GFunc) g_object_unref, NULL);
g_slist_free (plug_in_def->procedures);
g_free (plug_in_def);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static gint64
gimp_plug_in_def_get_memsize (GimpObject *object,
gint64 *gui_size)
{
GimpPlugInDef *plug_in_def = GIMP_PLUG_IN_DEF (object);
gint64 memsize = 0;
if (plug_in_def->prog)
memsize += strlen (plug_in_def->prog) + 1;
if (plug_in_def->locale_domain_name)
memsize += strlen (plug_in_def->locale_domain_name) + 1;
if (plug_in_def->locale_domain_path)
memsize += strlen (plug_in_def->locale_domain_path) + 1;
if (plug_in_def->help_domain_name)
memsize += strlen (plug_in_def->help_domain_name) + 1;
if (plug_in_def->help_domain_uri)
memsize += strlen (plug_in_def->help_domain_uri) + 1;
memsize += gimp_g_slist_get_memsize (plug_in_def->procedures, 0);
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
gui_size);
}
/* public functions */
GimpPlugInDef *
gimp_plug_in_def_new (const gchar *prog)
{
GimpPlugInDef *plug_in_def;
g_return_val_if_fail (prog != NULL, NULL);
plug_in_def = g_object_new (GIMP_TYPE_PLUG_IN_DEF, NULL);
plug_in_def->prog = g_strdup (prog);
return plug_in_def;
}
void
plug_in_def_add_procedure (PlugInDef *plug_in_def,
GimpPlugInProcedure *proc)
gimp_plug_in_def_add_procedure (GimpPlugInDef *plug_in_def,
GimpPlugInProcedure *proc)
{
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
proc->mtime = plug_in_def->mtime;
@ -78,10 +140,10 @@ plug_in_def_add_procedure (PlugInDef *plug_in_def,
}
void
plug_in_def_remove_procedure (PlugInDef *plug_in_def,
GimpPlugInProcedure *proc)
gimp_plug_in_def_remove_procedure (GimpPlugInDef *plug_in_def,
GimpPlugInProcedure *proc)
{
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
plug_in_def->procedures = g_slist_remove (plug_in_def->procedures, proc);
@ -89,17 +151,22 @@ plug_in_def_remove_procedure (PlugInDef *plug_in_def,
}
void
plug_in_def_set_locale_domain_name (PlugInDef *plug_in_def,
const gchar *domain_name)
gimp_plug_in_def_set_locale_domain (GimpPlugInDef *plug_in_def,
const gchar *domain_name,
const gchar *domain_path)
{
GSList *list;
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
if (plug_in_def->locale_domain_name)
g_free (plug_in_def->locale_domain_name);
plug_in_def->locale_domain_name = g_strdup (domain_name);
if (plug_in_def->locale_domain_path)
g_free (plug_in_def->locale_domain_path);
plug_in_def->locale_domain_path = g_strdup (domain_path);
for (list = plug_in_def->procedures; list; list = g_slist_next (list))
{
GimpPlugInProcedure *procedure = list->data;
@ -110,28 +177,22 @@ plug_in_def_set_locale_domain_name (PlugInDef *plug_in_def,
}
void
plug_in_def_set_locale_domain_path (PlugInDef *plug_in_def,
const gchar *domain_path)
{
g_return_if_fail (plug_in_def != NULL);
if (plug_in_def->locale_domain_path)
g_free (plug_in_def->locale_domain_path);
plug_in_def->locale_domain_path = g_strdup (domain_path);
}
void
plug_in_def_set_help_domain_name (PlugInDef *plug_in_def,
const gchar *domain_name)
gimp_plug_in_def_set_help_domain (GimpPlugInDef *plug_in_def,
const gchar *domain_name,
const gchar *domain_uri)
{
GSList *list;
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
if (plug_in_def->help_domain_name)
g_free (plug_in_def->help_domain_name);
plug_in_def->help_domain_name = g_strdup (domain_name);
if (plug_in_def->help_domain_uri)
g_free (plug_in_def->help_domain_uri);
plug_in_def->help_domain_uri = g_strdup (domain_uri);
for (list = plug_in_def->procedures; list; list = g_slist_next (list))
{
GimpPlugInProcedure *procedure = list->data;
@ -142,23 +203,12 @@ plug_in_def_set_help_domain_name (PlugInDef *plug_in_def,
}
void
plug_in_def_set_help_domain_uri (PlugInDef *plug_in_def,
const gchar *domain_uri)
{
g_return_if_fail (plug_in_def != NULL);
if (plug_in_def->help_domain_uri)
g_free (plug_in_def->help_domain_uri);
plug_in_def->help_domain_uri = g_strdup (domain_uri);
}
void
plug_in_def_set_mtime (PlugInDef *plug_in_def,
time_t mtime)
gimp_plug_in_def_set_mtime (GimpPlugInDef *plug_in_def,
time_t mtime)
{
GSList *list;
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
plug_in_def->mtime = mtime;
@ -171,19 +221,19 @@ plug_in_def_set_mtime (PlugInDef *plug_in_def,
}
void
plug_in_def_set_needs_query (PlugInDef *plug_in_def,
gboolean needs_query)
gimp_plug_in_def_set_needs_query (GimpPlugInDef *plug_in_def,
gboolean needs_query)
{
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
plug_in_def->needs_query = needs_query ? TRUE : FALSE;
}
void
plug_in_def_set_has_init (PlugInDef *plug_in_def,
gboolean has_init)
gimp_plug_in_def_set_has_init (GimpPlugInDef *plug_in_def,
gboolean has_init)
{
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
plug_in_def->has_init = has_init ? TRUE : FALSE;
}

85
app/plug-in/gimpplugindef.h Normal file
View File

@ -0,0 +1,85 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpplugindef.h
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PLUG_IN_DEF_H__
#define __GIMP_PLUG_IN_DEF_H__
#include <time.h>
#include "core/gimpobject.h"
#define GIMP_TYPE_PLUG_IN_DEF (gimp_plug_in_def_get_type ())
#define GIMP_PLUG_IN_DEF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUG_IN_DEF, GimpPlugInDef))
#define GIMP_PLUG_IN_DEF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUG_IN_DEF, GimpPlugInDefClass))
#define GIMP_IS_PLUG_IN_DEF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUG_IN_DEF))
#define GIMP_IS_PLUG_IN_DEF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUG_IN_DEF))
typedef struct _GimpPlugInDefClass GimpPlugInDefClass;
struct _GimpPlugInDef
{
GimpObject parent_instance;
gchar *prog;
GSList *procedures;
gchar *locale_domain_name;
gchar *locale_domain_path;
gchar *help_domain_name;
gchar *help_domain_uri;
time_t mtime;
gboolean needs_query; /* Does the plug-in need to be queried ? */
gboolean has_init; /* Does the plug-in need to be initialized ? */
};
struct _GimpPlugInDefClass
{
GimpObjectClass parent_class;
};
GType gimp_plug_in_def_get_type (void) G_GNUC_CONST;
GimpPlugInDef * gimp_plug_in_def_new (const gchar *prog);
void gimp_plug_in_def_add_procedure (GimpPlugInDef *plug_in_def,
GimpPlugInProcedure *proc);
void gimp_plug_in_def_remove_procedure (GimpPlugInDef *plug_in_def,
GimpPlugInProcedure *proc);
void gimp_plug_in_def_set_locale_domain (GimpPlugInDef *plug_in_def,
const gchar *domain_name,
const gchar *domain_path);
void gimp_plug_in_def_set_help_domain (GimpPlugInDef *plug_in_def,
const gchar *domain_name,
const gchar *domain_uri);
void gimp_plug_in_def_set_mtime (GimpPlugInDef *plug_in_def,
time_t mtime);
void gimp_plug_in_def_set_needs_query (GimpPlugInDef *plug_in_def,
gboolean needs_query);
void gimp_plug_in_def_set_has_init (GimpPlugInDef *plug_in_def,
gboolean has_init);
#endif /* __GIMP_PLUG_IN_DEF_H__ */

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

@ -40,12 +40,12 @@
#include "gimpplugin.h"
#include "gimpplugin-message.h"
#include "gimpplugindef.h"
#include "gimppluginmanager.h"
#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
#include "gimppluginmanager-call.h"
#include "gimppluginshm.h"
#include "gimptemporaryprocedure.h"
#include "plug-in-def.h"
#include "plug-in-params.h"
#include "gimp-intl.h"
@ -56,13 +56,13 @@
void
gimp_plug_in_manager_call_query (GimpPlugInManager *manager,
GimpContext *context,
PlugInDef *plug_in_def)
GimpPlugInDef *plug_in_def)
{
GimpPlugIn *plug_in;
g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
plug_in = gimp_plug_in_new (manager, context, NULL,
NULL, plug_in_def->prog);
@ -96,13 +96,13 @@ gimp_plug_in_manager_call_query (GimpPlugInManager *manager,
void
gimp_plug_in_manager_call_init (GimpPlugInManager *manager,
GimpContext *context,
PlugInDef *plug_in_def)
GimpPlugInDef *plug_in_def)
{
GimpPlugIn *plug_in;
g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail (plug_in_def != NULL);
g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
plug_in = gimp_plug_in_new (manager, context, NULL,
NULL, plug_in_def->prog);

4
app/plug-in/gimppluginmanager-call.h
View File

@ -30,13 +30,13 @@
*/
void gimp_plug_in_manager_call_query (GimpPlugInManager *manager,
GimpContext *context,
PlugInDef *plug_in_def);
GimpPlugInDef *plug_in_def);
/* Call the plug-in's init() function
*/
void gimp_plug_in_manager_call_init (GimpPlugInManager *manager,
GimpContext *context,
PlugInDef *plug_in_def);
GimpPlugInDef *plug_in_def);
/* Run a plug-in as if it were a procedure database procedure
*/

2
app/plug-in/gimppluginmanager-file.c
View File

@ -28,10 +28,10 @@
#include "core/gimpparamspecs.h"
#include "gimpplugin.h"
#include "gimpplugindef.h"
#include "gimppluginmanager.h"
#include "gimppluginmanager-file.h"
#include "gimppluginprocedure.h"
#include "plug-in-def.h"
/* public functions */

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

@ -42,6 +42,7 @@
#include "gimpinterpreterdb.h"
#include "gimpplugin.h"
#include "gimpplugindebug.h"
#include "gimpplugindef.h"
#include "gimppluginmanager.h"
#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
#include "gimppluginmanager-call.h"
@ -52,7 +53,6 @@
#include "gimppluginmanager-menu-branch.h"
#include "gimppluginshm.h"
#include "gimptemporaryprocedure.h"
#include "plug-in-def.h"
#include "plug-in-rc.h"
#include "gimp-intl.h"
@ -77,7 +77,7 @@ static gint64 gimp_plug_in_manager_get_memsize (GimpObject *object,
static void gimp_plug_in_manager_add_from_file (const GimpDatafileData *file_data,
gpointer data);
static void gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
PlugInDef *plug_in_def);
GimpPlugInDef *plug_in_def);
static void gimp_plug_in_manager_add_to_db (GimpPlugInManager *manager,
GimpContext *context,
GimpPlugInProcedure *proc);
@ -397,7 +397,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
for (list = manager->plug_in_defs, n_plugins = 0; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GimpPlugInDef *plug_in_def = list->data;
if (plug_in_def->needs_query)
n_plugins++;
@ -409,7 +409,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
for (list = manager->plug_in_defs, nth = 0; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GimpPlugInDef *plug_in_def = list->data;
if (plug_in_def->needs_query)
{
@ -434,7 +434,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
for (list = manager->plug_in_defs, n_plugins = 0; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GimpPlugInDef *plug_in_def = list->data;
if (plug_in_def->has_init)
n_plugins++;
@ -444,7 +444,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
{
for (list = manager->plug_in_defs, nth = 0; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GimpPlugInDef *plug_in_def = list->data;
if (plug_in_def->has_init)
{
@ -469,8 +469,8 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
/* add the procedures to manager->plug_in_procedures */
for (list = manager->plug_in_defs; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GSList *list2;
GimpPlugInDef *plug_in_def = list->data;
GSList *list2;
for (list2 = plug_in_def->procedures; list2; list2 = list2->next)
{
@ -498,7 +498,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
/* create help_path and locale_domain lists */
for (list = manager->plug_in_defs; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GimpPlugInDef *plug_in_def = list->data;
if (plug_in_def->locale_domain_name)
gimp_plug_in_manager_add_locale_domain (manager,
@ -514,7 +514,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
}
/* we're done with the plug-in-defs */
g_slist_foreach (manager->plug_in_defs, (GFunc) plug_in_def_free, NULL);
g_slist_foreach (manager->plug_in_defs, (GFunc) g_object_unref, NULL);
g_slist_free (manager->plug_in_defs);
manager->plug_in_defs = NULL;
@ -649,10 +649,10 @@ gimp_plug_in_manager_add_procedure (GimpPlugInManager *manager,
*/
for (list2 = manager->plug_in_defs; list2; list2 = list2->next)
{
PlugInDef *plug_in_def = list2->data;
GimpPlugInDef *plug_in_def = list2->data;
if (g_slist_find (plug_in_def->procedures, tmp_proc))
plug_in_def_remove_procedure (plug_in_def, tmp_proc);
gimp_plug_in_def_remove_procedure (plug_in_def, tmp_proc);
}
/* also remove it from the lists of load and save procs */
@ -777,7 +777,7 @@ gimp_plug_in_manager_add_from_file (const GimpDatafileData *file_data,
gpointer data)
{
GimpPlugInManager *manager = data;
PlugInDef *plug_in_def;
GimpPlugInDef *plug_in_def;
GSList *list;
for (list = manager->plug_in_defs; list; list = list->next)
@ -800,17 +800,17 @@ gimp_plug_in_manager_add_from_file (const GimpDatafileData *file_data,
g_free (plug_in_name);
}
plug_in_def = plug_in_def_new (file_data->filename);
plug_in_def = gimp_plug_in_def_new (file_data->filename);
plug_in_def_set_mtime (plug_in_def, file_data->mtime);
plug_in_def_set_needs_query (plug_in_def, TRUE);
gimp_plug_in_def_set_mtime (plug_in_def, file_data->mtime);
gimp_plug_in_def_set_needs_query (plug_in_def, TRUE);
manager->plug_in_defs = g_slist_prepend (manager->plug_in_defs, plug_in_def);
}
static void
gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
PlugInDef *plug_in_def)
GimpPlugInDef *plug_in_def)
{
GSList *list;
gchar *basename1;
@ -822,7 +822,7 @@ gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
if (! g_path_is_absolute (plug_in_def->prog))
{
g_warning ("plug_ins_def_add_from_rc: filename not absolute (skipping)");
plug_in_def_free (plug_in_def);
g_object_unref (plug_in_def);
return;
}
@ -854,8 +854,8 @@ gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
*/
for (list = manager->plug_in_defs; list; list = list->next)
{
PlugInDef *ondisk_plug_in_def = list->data;
gchar *basename2;
GimpPlugInDef *ondisk_plug_in_def = list->data;
gchar *basename2;
basename2 = g_path_get_basename (ondisk_plug_in_def->prog);
@ -867,12 +867,12 @@ gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
{
/* Use pluginrc entry, deleting ondisk entry */
list->data = plug_in_def;
plug_in_def_free (ondisk_plug_in_def);
g_object_unref (ondisk_plug_in_def);
}
else
{
/* Use ondisk entry, deleting pluginrc entry */
plug_in_def_free (plug_in_def);
g_object_unref (plug_in_def);
}
g_free (basename2);
@ -889,7 +889,7 @@ gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
manager->write_pluginrc = TRUE;
g_printerr ("executable not found: '%s'\n",
gimp_filename_to_utf8 (plug_in_def->prog));
plug_in_def_free (plug_in_def);
g_object_unref (plug_in_def);
}
static void

66
app/plug-in/plug-in-def.h
View File

@ -1,66 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* plug-in-def.h
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __PLUG_IN_DEF_H__
#define __PLUG_IN_DEF_H__
#include <time.h>
struct _PlugInDef
{
gchar *prog;
GSList *procedures;
gchar *locale_domain_name;
gchar *locale_domain_path;
gchar *help_domain_name;
gchar *help_domain_uri;
time_t mtime;
gboolean needs_query; /* Does the plug-in need to be queried ? */
gboolean has_init; /* Does the plug-in need to be initialized ? */
};
PlugInDef * plug_in_def_new (const gchar *prog);
void plug_in_def_free (PlugInDef *plug_in_def);
void plug_in_def_add_procedure (PlugInDef *plug_in_def,
GimpPlugInProcedure *proc);
void plug_in_def_remove_procedure (PlugInDef *plug_in_def,
GimpPlugInProcedure *proc);
void plug_in_def_set_locale_domain_name (PlugInDef *plug_in_def,
const gchar *domain_name);
void plug_in_def_set_locale_domain_path (PlugInDef *plug_in_def,
const gchar *domain_path);
void plug_in_def_set_help_domain_name (PlugInDef *plug_in_def,
const gchar *domain_name);
void plug_in_def_set_help_domain_uri (PlugInDef *plug_in_def,
const gchar *domain_uri);
void plug_in_def_set_mtime (PlugInDef *plug_in_def,
time_t mtime);
void plug_in_def_set_needs_query (PlugInDef *plug_in_def,
gboolean needs_query);
void plug_in_def_set_has_init (PlugInDef *plug_in_def,
gboolean has_init);
#endif /* __PLUG_IN_DEF_H__ */

72
app/plug-in/plug-in-rc.c
View File

@ -33,8 +33,8 @@
#include "pdb/gimp-pdb-compat.h"
#include "gimpplugindef.h"
#include "gimppluginprocedure.h"
#include "plug-in-def.h"
#include "plug-in-rc.h"
#include "gimp-intl.h"
@ -63,11 +63,11 @@ static GTokenType plug_in_proc_arg_deserialize (GScanner *scanner,
GimpProcedure *procedure,
gboolean return_value);
static GTokenType plug_in_locale_def_deserialize (GScanner *scanner,
PlugInDef *plug_in_def);
GimpPlugInDef *plug_in_def);
static GTokenType plug_in_help_def_deserialize (GScanner *scanner,
PlugInDef *plug_in_def);
GimpPlugInDef *plug_in_def);
static GTokenType plug_in_has_init_deserialize (GScanner *scanner,
PlugInDef *plug_in_def);
GimpPlugInDef *plug_in_def);
enum
@ -213,7 +213,7 @@ plug_in_rc_parse (Gimp *gimp,
_("fatal parse error"), TRUE);
}
g_slist_foreach (plug_in_defs, (GFunc) plug_in_def_free, NULL);
g_slist_foreach (plug_in_defs, (GFunc) g_object_unref, NULL);
g_slist_free (plug_in_defs);
plug_in_defs = NULL;
}
@ -230,7 +230,7 @@ plug_in_def_deserialize (Gimp *gimp,
GScanner *scanner,
GSList **plug_in_defs)
{
PlugInDef *plug_in_def;
GimpPlugInDef *plug_in_def;
GimpPlugInProcedure *proc = NULL;
gchar *name;
gchar *path;
@ -243,12 +243,12 @@ plug_in_def_deserialize (Gimp *gimp,
path = gimp_config_path_expand (name, TRUE, NULL);
g_free (name);
plug_in_def = plug_in_def_new (path);
plug_in_def = gimp_plug_in_def_new (path);
g_free (path);
if (! gimp_scanner_parse_int (scanner, &mtime))
{
plug_in_def_free (plug_in_def);
g_object_unref (plug_in_def);
return G_TOKEN_INT;
}
@ -275,7 +275,7 @@ plug_in_def_deserialize (Gimp *gimp,
&proc);
if (token == G_TOKEN_LEFT_PAREN)
plug_in_def_add_procedure (plug_in_def, proc);
gimp_plug_in_def_add_procedure (plug_in_def, proc);
if (proc)
g_object_unref (proc);
@ -318,7 +318,7 @@ plug_in_def_deserialize (Gimp *gimp,
}
}
plug_in_def_free (plug_in_def);
g_object_unref (plug_in_def);
return token;
}
@ -689,22 +689,22 @@ plug_in_proc_arg_deserialize (GScanner *scanner,
}
static GTokenType
plug_in_locale_def_deserialize (GScanner *scanner,
PlugInDef *plug_in_def)
plug_in_locale_def_deserialize (GScanner *scanner,
GimpPlugInDef *plug_in_def)
{
gchar *string;
gchar *domain_name;
gchar *domain_path;
if (! gimp_scanner_parse_string (scanner, &string))
if (! gimp_scanner_parse_string (scanner, &domain_name))
return G_TOKEN_STRING;
plug_in_def_set_locale_domain_name (plug_in_def, string);
g_free (string);
if (! gimp_scanner_parse_string (scanner, &domain_path))
domain_path = NULL;
if (gimp_scanner_parse_string (scanner, &string))
{
plug_in_def_set_locale_domain_path (plug_in_def, string);
g_free (string);
}
gimp_plug_in_def_set_locale_domain (plug_in_def, domain_name, domain_path);
g_free (domain_name);
g_free (domain_path);
if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
return G_TOKEN_RIGHT_PAREN;
@ -713,22 +713,22 @@ plug_in_locale_def_deserialize (GScanner *scanner,
}
static GTokenType
plug_in_help_def_deserialize (GScanner *scanner,
PlugInDef *plug_in_def)
plug_in_help_def_deserialize (GScanner *scanner,
GimpPlugInDef *plug_in_def)
{
gchar *string;
gchar *domain_name;
gchar *domain_uri;
if (! gimp_scanner_parse_string (scanner, &string))
if (! gimp_scanner_parse_string (scanner, &domain_name))
return G_TOKEN_STRING;
plug_in_def_set_help_domain_name (plug_in_def, string);
g_free (string);
if (! gimp_scanner_parse_string (scanner, &domain_uri))
domain_uri = NULL;
if (gimp_scanner_parse_string (scanner, &string))
{
plug_in_def_set_help_domain_uri (plug_in_def, string);
g_free (string);
}
gimp_plug_in_def_set_help_domain (plug_in_def, domain_name, domain_uri);
g_free (domain_name);
g_free (domain_uri);
if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
return G_TOKEN_RIGHT_PAREN;
@ -737,10 +737,10 @@ plug_in_help_def_deserialize (GScanner *scanner,
}
static GTokenType
plug_in_has_init_deserialize (GScanner *scanner,
PlugInDef *plug_in_def)
plug_in_has_init_deserialize (GScanner *scanner,
GimpPlugInDef *plug_in_def)
{
plug_in_def_set_has_init (plug_in_def, TRUE);
gimp_plug_in_def_set_has_init (plug_in_def, TRUE);
if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
return G_TOKEN_RIGHT_PAREN;
@ -779,7 +779,7 @@ plug_in_rc_write (GSList *plug_in_defs,
for (list = plug_in_defs; list; list = list->next)
{
PlugInDef *plug_in_def = list->data;
GimpPlugInDef *plug_in_def = list->data;
if (plug_in_def->procedures)
{

2
app/plug-in/plug-in-types.h
View File

@ -26,11 +26,11 @@
typedef struct _GimpPlugIn GimpPlugIn;
typedef struct _GimpPlugInDef GimpPlugInDef;
typedef struct _GimpPlugInManager GimpPlugInManager;
typedef struct _GimpPlugInMenuBranch GimpPlugInMenuBranch;
typedef struct _GimpPlugInProcFrame GimpPlugInProcFrame;
typedef struct _GimpPlugInShm GimpPlugInShm;
typedef struct _PlugInDef PlugInDef;
#endif /* __PLUG_IN_TYPES_H__ */

12
tools/pdbgen/pdb/plug_in.pdb
View File

@ -103,8 +103,8 @@ HELP
if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
{
plug_in_def_set_locale_domain_name (plug_in->plug_in_def, domain_name);
plug_in_def_set_locale_domain_path (plug_in->plug_in_def, domain_path);
gimp_plug_in_def_set_locale_domain (plug_in->plug_in_def,
domain_name, domain_path);
}
else
success = FALSE;
@ -138,8 +138,8 @@ HELP
if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
{
plug_in_def_set_help_domain_name (plug_in->plug_in_def, domain_name);
plug_in_def_set_help_domain_uri (plug_in->plug_in_def, domain_uri);
gimp_plug_in_def_set_help_domain (plug_in->plug_in_def,
domain_name, domain_uri);
}
else
success = FALSE;
@ -274,11 +274,11 @@ CODE
"libgimpbase/gimpbase.h"
"core/gimp.h"
"plug-in/gimpplugin.h"
"plug-in/gimpplugindef.h"
"plug-in/gimppluginmanager.h"
"plug-in/gimppluginmanager-menu-branch.h"
"plug-in/gimppluginmanager-query.h"
"plug-in/gimppluginprocedure.h"
"plug-in/plug-in-def.h");
"plug-in/gimppluginprocedure.h");
@procs = qw(plugins_query
plugin_domain_register plugin_help_register