2006-09-21 [colin] 2.4.0cvs209
authorColin Leroy <colin@colino.net>
Thu, 21 Sep 2006 17:10:04 +0000 (17:10 +0000)
committerColin Leroy <colin@colino.net>
Thu, 21 Sep 2006 17:10:04 +0000 (17:10 +0000)
* src/wizard.c
* src/common/plugin.c
Prepare infra to load predefined plugins when
no configuration existed. Don't actually load
anything yet (feat. freeze)

ChangeLog
PATCHSETS
configure.ac
src/common/plugin.c
src/wizard.c

index 37d6977d40da33d54d70b7721eb3ae6ab9f14b11..87c6447faa4c263a4277dd1a17582173d3f64fc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-21 [colin]     2.4.0cvs209
+
+       * src/wizard.c
+       * src/common/plugin.c
+               Prepare infra to load predefined plugins when
+               no configuration existed. Don't actually load
+               anything yet (feat. freeze)
+
 2006-09-21 [wwp]       2.4.0cvs208
 
        * manual/fr/faq.xml
index 933ddc1a08afca9eb15210d82a76f1ba3b5530ed..f2855087197a2a94dfd25dd8590c4dec1c9b5f5d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.36.2.78 -r 1.36.2.79 src/common/utils.c;  ) > 2.4.0cvs206.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/fix_date.sh;  ) > 2.4.0cvs207.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/faq.xml;  ) > 2.4.0cvs208.patchset
+( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/wizard.c;  cvs diff -u -r 1.13.2.20 -r 1.13.2.21 src/common/plugin.c;  ) > 2.4.0cvs209.patchset
index 4908507150c316e6ab0a84fbff0d79394c716c62..353d0181b740ee769d2621bce023e130a91b6152 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=208
+EXTRA_VERSION=209
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 3dfb0b9122d7ee1ed07a72866f5a2e8cfa445310..385427814f58b8892738afe2075bcf37d6047bf2 100644 (file)
@@ -454,6 +454,9 @@ void plugin_load_standard_plugins (void)
 #ifdef G_OS_WIN32 
                "pgpmime",
                "pgpinline",
+#else
+               /* post-2.5 maybe 
+               "bogofilter", */
 #endif
                NULL
        };
@@ -473,8 +476,13 @@ void plugin_load_standard_plugins (void)
                        /* FIXME: get_plugin_dir () returns with a trailing
                         * (back)slash; this should be fixed so that we can use
                         * g_module_build_path here. */
+#ifdef G_OS_WIN32 
                        filename = g_strconcat (get_plugin_dir(),
                                                names[i], NULL);
+#else
+                       filename = g_strconcat (get_plugin_dir(),
+                                               names[i], ".", G_MODULE_SUFFIX, NULL);
+#endif
                        error = NULL;
                        plugin_load(filename, &error);
                        g_free (error);
@@ -483,7 +491,6 @@ void plugin_load_standard_plugins (void)
        }
 }
 
-
 GSList *plugin_get_list(void)
 {
        return g_slist_copy(plugins);
index a93d772692ba36a44f4a3002f0564e96f9b63573..48f488523bcd4c793c1d9790f42bdd1529ca6bc4 100644 (file)
@@ -49,6 +49,7 @@
 
 #include "utils.h"
 #include "gtk/menu.h"
+#include "plugin.h"
 #include "account.h"
 #include "prefs_account.h"
 #include "mainwindow.h"
@@ -390,7 +391,6 @@ static void wizard_read_defaults(void)
        g_free(rcpath);
 }
 
-
 static void initialize_fonts(WizardWindow *wizard)
 {
        GtkWidget *widget = wizard->email;
@@ -692,6 +692,9 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
                write_welcome_email(wizard);
        
+#ifndef G_OS_WIN32 
+       plugin_load_standard_plugins();
+#endif
        return TRUE;
 }