Revision: 2615 http://geany.svn.sourceforge.net/geany/?rev=2615&view=rev Author: ntrel Date: 2008-05-26 07:22:02 -0700 (Mon, 26 May 2008)
Log Message: ----------- Fix compilation (oops).
Modified Paths: -------------- trunk/src/plugins.c
Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-05-26 14:17:41 UTC (rev 2614) +++ trunk/src/plugins.c 2008-05-26 14:22:02 UTC (rev 2615) @@ -430,31 +430,34 @@ { PluginCallback *callbacks; PluginInfo **p_info; + PluginFields **plugin_fields; + GeanyData **p_geany_data; + GeanyFunctions **p_geany_functions;
/* set these symbols before init() is called */ g_module_symbol(plugin->module, "plugin_info", (void *) &p_info); if (p_info) *p_info = &plugin->info; - g_module_symbol(module, "geany_data", (void *) &p_geany_data); + g_module_symbol(plugin->module, "geany_data", (void *) &p_geany_data); if (p_geany_data) *p_geany_data = &geany_data; - g_module_symbol(module, "geany_functions", (void *) &p_geany_functions); + g_module_symbol(plugin->module, "geany_functions", (void *) &p_geany_functions); if (p_geany_functions) *p_geany_functions = &geany_functions; - g_module_symbol(module, "plugin_fields", (void *) &plugin_fields); + g_module_symbol(plugin->module, "plugin_fields", (void *) &plugin_fields); if (plugin_fields) *plugin_fields = &plugin->fields;
/* start the plugin */ - g_module_symbol(module, "init", (void *) &plugin->init); + g_module_symbol(plugin->module, "init", (void *) &plugin->init); if (plugin->init != NULL) plugin->init(&geany_data); else geany_debug("Plugin '%s' has no init() function!", plugin->info.name);
/* store some function pointers for later use */ - g_module_symbol(module, "configure", (void *) &plugin->configure); - g_module_symbol(module, "cleanup", (void *) &plugin->cleanup); + g_module_symbol(plugin->module, "configure", (void *) &plugin->configure); + g_module_symbol(plugin->module, "cleanup", (void *) &plugin->cleanup); if (plugin->init != NULL && plugin->cleanup == NULL) { if (app->debug_mode) @@ -498,9 +501,6 @@ Plugin *plugin; GModule *module; void (*plugin_set_info)(PluginInfo*); - PluginFields **plugin_fields; - GeanyData **p_geany_data; - GeanyFunctions **p_geany_functions;
g_return_val_if_fail(fname, NULL); g_return_val_if_fail(g_module_supported(), NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.