2006-03-29 [colin] 2.0.0cvs181

	* src/folderview.c
		Warn for disabled IMAP accounts (due to lack of
		libetpan). Breaks string-freeze - sorry - but it
		is kind of important ;)

diff --git a/ChangeLog b/ChangeLog
index 1dc9fdb7c93d5b5a67fa525c911935cca8b26205..e1c2b3a663a77b5b0a1061b4c80f9373d603c75a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-29 [colin]     2.0.0cvs181
+
+       * src/folderview.c
+               Warn for disabled IMAP accounts (due to lack of
+               libetpan). Breaks string-freeze - sorry - but it
+               is kind of important ;)
+

 2006-03-28 [colin]     2.0.0cvs180
 
        * src/gtk/gtkutils.c
 2006-03-28 [colin]     2.0.0cvs180
 
        * src/gtk/gtkutils.c

diff --git a/PATCHSETS b/PATCHSETS
index 2713a34deb2a06c41b92424567c4eb34f5c58adf..fff9b14c8a8593c9f7586de2879100b9fc1c6686 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1366,3 +1366,4 @@
 ( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/undo.c;  ) > 2.0.0cvs178.patchset
 ( cvs diff -u -r 1.11.2.16 -r 1.11.2.17 src/common/smtp.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/passcrypt.c;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/undo.c;  ) > 2.0.0cvs179.patchset
 ( cvs diff -u -r 1.3.2.39 -r 1.3.2.40 src/prefs_themes.c;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/common/defs.h;  cvs diff -u -r 1.4.2.29 -r 1.4.2.30 src/gtk/about.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/gtk/pluginwindow.c;  ) > 2.0.0cvs180.patchset
 ( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/undo.c;  ) > 2.0.0cvs178.patchset
 ( cvs diff -u -r 1.11.2.16 -r 1.11.2.17 src/common/smtp.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/passcrypt.c;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/undo.c;  ) > 2.0.0cvs179.patchset
 ( cvs diff -u -r 1.3.2.39 -r 1.3.2.40 src/prefs_themes.c;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/common/defs.h;  cvs diff -u -r 1.4.2.29 -r 1.4.2.30 src/gtk/about.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/gtk/pluginwindow.c;  ) > 2.0.0cvs180.patchset

+( cvs diff -u -r 1.207.2.90 -r 1.207.2.91 src/folderview.c;  ) > 2.0.0cvs181.patchset

diff --git a/configure.ac b/configure.ac
index 5ebc08b138cbb0e318065d2e356909a857b07bcf..004074b0d312e3c270c6131ca1a7bd2fd7c6beb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=180
+EXTRA_VERSION=181

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 4ba3e61dce6a7d01e76eed45ce1e49371bb5de49..d000a0051d06db83ae7e52aa1c663c16c3cb98ed 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -923,11 +923,29 @@ void folderview_append_item(FolderItem *item)
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;

-
+       static gboolean missing_imap_warning = TRUE;

        list = folder_get_list();
 
        list = folder_get_list();
 

-       for (; list != NULL; list = list->next)
+       for (; list != NULL; list = list->next) {
+#ifndef HAVE_LIBETPAN
+               if ((FOLDER(list->data))
+               &&  (FOLDER(list->data))->klass
+               &&  (FOLDER(list->data))->klass->type == F_IMAP
+               &&  missing_imap_warning) {
+                       missing_imap_warning = FALSE;
+                       alertpanel_error(
+                               _("You have one or more IMAP accounts "
+                                 "defined. However this version of "
+                                 "Sylpheed-Claws has been built without "
+                                 "IMAP support; your IMAP account(s) are "
+                                 "disabled.\n\n"
+                                 "You probably need to "
+                                 "install libetpan and recompile "
+                                 "Sylpheed-Claws."));
+               }
+#endif

                folderview_append_folder(folderview, FOLDER(list->data));
                folderview_append_folder(folderview, FOLDER(list->data));

+       }

 }
 
 static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 }
 
 static void folderview_scan_tree_func(Folder *folder, FolderItem *item,