typedef void (*PrefsCreateWidgetFunc) (PrefsPage *, GtkWindow *window, gpointer);
typedef void (*PrefsDestroyWidgetFunc) (PrefsPage *);
typedef void (*PrefsSavePageFunc) (PrefsPage *);
-typedef void (*PrefsDestroyPageFunc) (PrefsPage *);
struct _PrefsPage
{
- gchar *path;
- gboolean page_open;
- GtkWidget *widget;
-
- PrefsCreateWidgetFunc create_widget;
- PrefsDestroyWidgetFunc destroy_widget;
- PrefsSavePageFunc save_page;
- PrefsDestroyPageFunc destroy_page;
+ gchar *path;
+ gboolean page_open;
+ GtkWidget *widget;
+
+ PrefsCreateWidgetFunc create_widget;
+ PrefsDestroyWidgetFunc destroy_widget;
+ PrefsSavePageFunc save_page;
};
void prefswindow_open ();
spamassassin_save_config();
}
-static void spamassassin_destroy_func(PrefsPage *_page)
-{
- debug_print("Destroying SpamAssassin Page\n");
- g_free(_page);
-}
-
static struct SpamAssassinPage *spamassassin_page;
gint plugin_init(gchar **error)
page->page.create_widget = spamassassin_create_widget_func;
page->page.destroy_widget = spamassassin_destroy_widget_func;
page->page.save_page = spamassassin_save_func;
- page->page.destroy_page = spamassassin_destroy_func;
prefs_gtk_register_page((PrefsPage *) page);
spamassassin_page = page;
}
static void prefs_toolbar_destroy_widget(PrefsPage *_page)
-{
- /* nothing here */
-}
-
-static void prefs_toolbar_destroy(PrefsPage *_page)
{
ToolbarPage *prefs_toolbar = (ToolbarPage *) _page;
g_list_free(prefs_toolbar->combo_action_list);
- g_free(_page);
+ prefs_toolbar->combo_action_list = NULL;
}
static void prefs_toolbar_set_displayed(ToolbarPage *prefs_toolbar)
page->page.create_widget = prefs_toolbar_create_widget;
page->page.destroy_widget = prefs_toolbar_destroy_widget;
page->page.save_page = prefs_toolbar_save;
- page->page.destroy_page = prefs_toolbar_destroy;
page->source = TOOLBAR_MAIN;
prefs_gtk_register_page((PrefsPage *) page);
prefs_toolbar_mainwindow = page;
page = g_new0(ToolbarPage, 1);
- page->page.path = _("Customize Toolbars/Compose Window");
+ page->page.path = _("Customize Toolbars/Message Window");
page->page.create_widget = prefs_toolbar_create_widget;
page->page.destroy_widget = prefs_toolbar_destroy_widget;
page->page.save_page = prefs_toolbar_save;
- page->page.destroy_page = prefs_toolbar_destroy;
- page->source = TOOLBAR_COMPOSE;
+ page->source = TOOLBAR_MSGVIEW;
prefs_gtk_register_page((PrefsPage *) page);
- prefs_toolbar_composewindow = page;
+ prefs_toolbar_messageview = page;
page = g_new0(ToolbarPage, 1);
- page->page.path = _("Customize Toolbars/Message Window");
+ page->page.path = _("Customize Toolbars/Compose Window");
page->page.create_widget = prefs_toolbar_create_widget;
page->page.destroy_widget = prefs_toolbar_destroy_widget;
page->page.save_page = prefs_toolbar_save;
- page->page.destroy_page = prefs_toolbar_destroy;
- page->source = TOOLBAR_MSGVIEW;
+ page->source = TOOLBAR_COMPOSE;
prefs_gtk_register_page((PrefsPage *) page);
- prefs_toolbar_messageview = page;
+ prefs_toolbar_composewindow = page;
}
void prefs_toolbar_done()