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

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 07c7b10eb25719f39fcd54e0afdde12c930dde4f..21d00faa6fe20a26ef420acac870884e19575b03 100644 (file)
--- 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 a9231c04e6365e5204ef58a1a7871d55a01ccb32..e1746cdb144a14d05c34b466373d40fed4bfc32b 100644 (file)
--- 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 78208046a6a9c9276ffc4b3b4cdc9a3018a171d3..94fa68eeb87fc0c12df68fb58f2899de0da87086 100644 (file)
--- 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 ba0183e94d1c707f612720d409328a5eb123081d..3a66f43aeae229a2757ca875b1ce105cafac3faa 100644 (file)
--- 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 24480bb2d847c73f172d96b0619da205d50f2548..98d232f8a3711db4f8006f985d61c3f5693449a4 100644 (file)
--- 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 28a356f17258a4f984474c0b238a8c560e36dcaf..dcac718909e5d6dd99dc16be41740fd4d1aa6c92 100644 (file)
--- 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()