+2006-11-11 [colin] 2.6.0cvs33
+
+ * src/folderview.c
+ Forbid drag and drop from/to different
+ folders of type F_UNKNOWN
+
2006-11-11 [colin] 2.6.0cvs32
* src/plugins/pgpinline/pgpinline.c
( cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/undo.c; ) > 2.6.0cvs30.patchset
( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/pgpmime/pgpmime.c; ) > 2.6.0cvs31.patchset
( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpinline/pgpinline.c; ) > 2.6.0cvs32.patchset
+( cvs diff -u -r 1.207.2.132 -r 1.207.2.133 src/folderview.c; ) > 2.6.0cvs33.patchset
/* we are copying messages, so only accept folder items that are not
the source item, are no root items and can copy messages */
if (item && item->folder && folder_item_parent(item) != NULL && src_item &&
- src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)
+ src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL &&
+ FOLDER_TYPE(item->folder) != F_UNKNOWN)
acceptable = TRUE;
} else if (srcwidget == folderview->ctree) {
/* comes from folderview */
the source items and can copy messages and create folder items */
if (item && item->folder && src_item && src_item != item &&
FOLDER_CLASS(item->folder)->copy_msg != NULL &&
- FOLDER_CLASS(item->folder)->create_folder != NULL)
+ FOLDER_CLASS(item->folder)->create_folder != NULL &&
+ ((FOLDER_TYPE(item->folder) != F_UNKNOWN && FOLDER_TYPE(src_item->folder) != F_UNKNOWN)
+ || item->folder == src_item->folder))
acceptable = TRUE;
} else {
/* comes from another app */
/* we are adding messages, so only accept folder items that are
no root items and can copy messages */
if (item && item->folder && folder_item_parent(item) != NULL
- && FOLDER_CLASS(item->folder)->add_msg != NULL)
+ && FOLDER_CLASS(item->folder)->add_msg != NULL &&
+ FOLDER_TYPE(item->folder) != F_UNKNOWN)
acceptable = TRUE;
}
}