From 95e7aa1fcb8dd0241bfc5edd46900adce3ff9011 Mon Sep 17 00:00:00 2001 From: Christoph Hohmann Date: Thu, 16 Jan 2003 18:35:59 +0000 Subject: [PATCH 1/1] 0.8.8claws106 * src/prefs_gtk.c * src/prefs_toolbar.c * src/gtk/prefswindow.h * src/plugins/spamassassin/spamassassin_gtk.c remove page destroy function that is not used anymore --- ChangeLog.claws | 8 ++++++++ configure.ac | 2 +- src/gtk/prefswindow.h | 16 +++++++-------- src/plugins/spamassassin/spamassassin_gtk.c | 7 ------- src/prefs_gtk.c | 11 ----------- src/prefs_toolbar.c | 22 +++++++-------------- 6 files changed, 23 insertions(+), 43 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 07c7b10eb..21d00faa6 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,11 @@ +2003-01-16 [christoph] 0.8.8claws106 + + * src/prefs_gtk.c + * src/prefs_toolbar.c + * src/gtk/prefswindow.h + * src/plugins/spamassassin/spamassassin_gtk.c + remove page destroy function that is not used anymore + 2003-01-16 [paul] 0.8.8claws105 * sync with 0.8.8cvs9 diff --git a/configure.ac b/configure.ac index a9231c04e..e1746cdb1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws105 +EXTRA_VERSION=claws106 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h index 78208046a..94fa68eeb 100644 --- a/src/gtk/prefswindow.h +++ b/src/gtk/prefswindow.h @@ -28,18 +28,16 @@ typedef struct _PrefsPage PrefsPage; 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 (); diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c index ba0183e94..3a66f43ae 100644 --- a/src/plugins/spamassassin/spamassassin_gtk.c +++ b/src/plugins/spamassassin/spamassassin_gtk.c @@ -247,12 +247,6 @@ static void spamassassin_save_func(PrefsPage *_page) 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) @@ -264,7 +258,6 @@ 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; diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c index 24480bb2d..98d232f8a 100644 --- a/src/prefs_gtk.c +++ b/src/prefs_gtk.c @@ -708,14 +708,3 @@ void prefs_gtk_unregister_page(PrefsPage *page) { prefs_pages = g_slist_remove(prefs_pages, page); } - -void prefs_gtk_destroy_all_pages() -{ - GSList *cur; - - for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) { - PrefsPage *page = (PrefsPage *) cur->data; - - page->destroy_page(page); - } -} diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index 28a356f17..dcac71890 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -184,16 +184,11 @@ void prefs_toolbar_save(PrefsPage *_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) @@ -874,30 +869,27 @@ void prefs_toolbar_init() 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() -- 2.25.1