diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-02-07 17:08:27 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-02-07 17:08:27 +0000 |
| commit | c4fa7c87df6c33fb7e6b83db82e78f4bbe275d26 (patch) | |
| tree | 14e8d8bec91fcd410bd256244f533ec96e367670 /gtk/plugins_dlg.c | |
| parent | 5da490dab28762832eb65ff861ef4cc6615e47c0 (diff) | |
Code changes, but not Makefile changes, for enabling plugins for Win32.
svn path=/trunk/; revision=1605
Diffstat (limited to 'gtk/plugins_dlg.c')
| -rw-r--r-- | gtk/plugins_dlg.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c index 6839b7ea92..15d858f353 100644 --- a/gtk/plugins_dlg.c +++ b/gtk/plugins_dlg.c @@ -1,7 +1,7 @@ /* plugins_dlg.c * Dialog boxes for plugins * - * $Id: plugins_dlg.c,v 1.12 2000/01/17 20:30:17 guy Exp $ + * $Id: plugins_dlg.c,v 1.13 2000/02/07 17:07:54 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -38,6 +38,11 @@ #include "prefs_dlg.h" #include "simple_dialog.h" +#ifdef PLUGINS_NEED_ADDRESS_TABLE +#include "plugins/plugin_api.h" +extern plugin_address_table_t patable; +#endif + #ifdef HAVE_PLUGINS static gint selected_row; @@ -238,12 +243,12 @@ plugins_enable_cb(GtkWidget *button, gpointer clist) { plugin *pt_plug; gpointer symbol; - void (*proto_init)(void); + void (*plugin_init)(void*); /* nothing selected */ if (selected_row == -1) return; /* already enabled */ - if (!strcmp(selected_enabled, "Yes")) return; + if (strcmp(selected_enabled, "Yes") == 0) return; if ((pt_plug = enable_plugin(selected_name, selected_version)) == NULL) { @@ -253,10 +258,21 @@ plugins_enable_cb(GtkWidget *button, gpointer clist) /* Try to get the initialization routine for the plugin, and, if it has one, call it. */ - if (g_module_symbol(pt_plug->handle, "proto_init", &symbol) == TRUE) { - proto_init = symbol; - proto_init(); - } + if (g_module_symbol(pt_plug->handle, "plugin_init", &symbol) == TRUE) { + plugin_init = symbol; +#ifdef PLUGINS_NEED_ADDRESS_TABLE + plugin_init(&patable); +#else + plugin_init(NULL); +#endif + } +#ifdef PLUGINS_NEED_ADDRESS_TABLE + else { + simple_dialog(ESD_TYPE_WARN, NULL, "Failed to find plugin_init()"); + return; + } +#endif + gtk_clist_set_text(GTK_CLIST(clist), selected_row, 3, "Yes"); } |