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

simply check for G_MODULE_SUFFIX and remove utility function 

2007-10-18  Michael Natterer  <mitch@gimp.org>

	* libgimpmodule/gimpmoduledb.c (gimp_module_db_module_initialize):
	simply check for G_MODULE_SUFFIX and remove utility function
	is_valid_module_name().


svn path=/trunk/; revision=23876
This commit is contained in:
Michael Natterer 2007-10-18 15:57:44 +00:00 committed by Michael Natterer
parent 95a98cb9bf
commit 251fbfd8b0
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-10-18 Michael Natterer <mitch@gimp.org>
* libgimpmodule/gimpmoduledb.c (gimp_module_db_module_initialize):
simply check for G_MODULE_SUFFIX and remove utility function
is_valid_module_name().
2007-10-18 Sven Neumann <sven@gimp.org> 2007-10-18 Sven Neumann <sven@gimp.org>
* app/config/gimpcoreconfig.c: lower the upper limit for * app/config/gimpcoreconfig.c: lower the upper limit for

30
libgimpmodule/gimpmoduledb.c
View File

@ -312,33 +312,6 @@ gimp_module_db_refresh (GimpModuleDB *db,
db); db);
} }
/* name must be of the form lib*.so (Unix) or *.dll (Win32) */
static gboolean
valid_module_name (const gchar *filename)
{
gchar *basename = g_path_get_basename (filename);
#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN)
if (strncmp (basename, "lib", 3))
goto no_module;
if (! gimp_datafiles_check_extension (basename, ".so"))
goto no_module;
#else
if (! gimp_datafiles_check_extension (basename, ".dll"))
goto no_module;
#endif
g_free (basename);
return TRUE;
no_module:
g_free (basename);
return FALSE;
}
static void static void
gimp_module_db_module_initialize (const GimpDatafileData *file_data, gimp_module_db_module_initialize (const GimpDatafileData *file_data,
gpointer user_data) gpointer user_data)
@ -347,7 +320,8 @@ gimp_module_db_module_initialize (const GimpDatafileData *file_data,
GimpModule *module; GimpModule *module;
gboolean load_inhibit; gboolean load_inhibit;
if (! valid_module_name (file_data->filename)) if (! gimp_datafiles_check_extension (file_data->filename,
"." G_MODULE_SUFFIX))
return; return;
/* don't load if we already know about it */ /* don't load if we already know about it */