2006-01-15 [colin] 1.9.100cvs153
authorColin Leroy <colin@colino.net>
Sun, 15 Jan 2006 18:05:16 +0000 (18:05 +0000)
committerColin Leroy <colin@colino.net>
Sun, 15 Jan 2006 18:05:16 +0000 (18:05 +0000)
* src/folder.c
* src/folder.h
* src/main.c
Check if a mailbox is loaded after all
plugins are loaded.

ChangeLog
PATCHSETS
configure.ac
src/folder.c
src/folder.h
src/main.c

index 0c48fb75c41f47ee96c2712e735e5833456df2ab..d089ef40edb73dcd0739c5767c3774070ed1ebbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-15 [colin]     1.9.100cvs153
+
+       * src/folder.c
+       * src/folder.h
+       * src/main.c
+               Check if a mailbox is loaded after all
+               plugins are loaded.
+
 2006-01-15 [colin]     1.9.100cvs152
 
        * src/folder.c
index 30bbac5cb80cf63e2c54270ab8c26641f1a1e7ac..c5e54b894aa05cb839915598dd672b18834eeadc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/prefs_filtering_action.c;  cvs diff -u -r 1.26.2.23 -r 1.26.2.24 src/foldersel.c;  ) > 1.9.100cvs150.patchset
 ( cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/addressbook.c;  cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/expldifdlg.c;  cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/importldif.c;  cvs diff -u -r 1.4.12.11 -r 1.4.12.12 src/importmutt.c;  cvs diff -u -r 1.1.14.11 -r 1.1.14.12 src/importpine.c;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/mh_gtk.c;  ) > 1.9.100cvs151.patchset
 ( cvs diff -u -r 1.213.2.74 -r 1.213.2.75 src/folder.c;  ) > 1.9.100cvs152.patchset
+( cvs diff -u -r 1.213.2.75 -r 1.213.2.76 src/folder.c;  cvs diff -u -r 1.87.2.24 -r 1.87.2.25 src/folder.h;  cvs diff -u -r 1.115.2.73 -r 1.115.2.74 src/main.c;  ) > 1.9.100cvs153.patchset
index 63b46c14196fd376fb78711580c8ef8f045275f4..ecf73584b9e55afcff0706fa027196fca3e67dcc 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=152
+EXTRA_VERSION=153
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index c2b3867f36793e5aeddf9740802af4f6834048df..3f9b80c6c55b75989c7c7907fef4724a7a827d3e 100644 (file)
@@ -1268,6 +1268,17 @@ Folder *folder_get_default_folder(void)
        return folder_list ? FOLDER(folder_list->data) : NULL;
 }
 
+gboolean folder_have_mailbox (void)
+{
+       GList *cur;
+       for (cur = folder_list; cur != NULL; cur = g_list_next(cur)) {
+               Folder *folder = FOLDER(cur->data);
+               if (folder->inbox && folder->outbox)
+                       return TRUE;
+       }
+       return FALSE;
+}
+
 FolderItem *folder_get_default_inbox(void)
 {
        GList *flist;
index a286fa73c4c6d30882f6ae55d456fc51f4931b88..cceea7cd911e1a2cb7c6d8e8a131d50c3f495722 100644 (file)
@@ -819,4 +819,6 @@ void folder_item_process_open               (FolderItem *item,
                                         void (*after_proc_func)(gpointer data),
                                         gpointer data);
 gboolean folder_subscribe              (const gchar *uri);
+gboolean folder_have_mailbox           (void);
+
 #endif /* __FOLDER_H__ */
index 11e91c569783f15e25e9cfa9b7334af17d1ffc95..c4147e3c2dd5928e1900fe24ef306505c18354f8 100644 (file)
@@ -521,6 +521,15 @@ int main(int argc, char *argv[])
 
        plugin_load_all("GTK2");
        
+       if (!folder_have_mailbox()) {
+               alertpanel_error(_("Sylpheed-Claws has detected a configured "
+                                  "mailbox, but could not load it. It is "
+                                  "probably provided by an out-of-date "
+                                  "external plugin. Please reinstall the "
+                                  "plugin and try again."));
+               exit(1);
+       }
+       
        static_mainwindow = mainwin;
 
 #ifdef HAVE_STARTUP_NOTIFICATION