( cvs diff -u -r 1.395.2.218 -r 1.395.2.219 src/summaryview.c; cvs diff -u -r 1.204.2.87 -r 1.204.2.88 src/prefs_common.c; cvs diff -u -r 1.103.2.50 -r 1.103.2.51 src/prefs_common.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gedit-print.c; cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/prefs_fonts.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 manual/advanced.xml; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/fr/advanced.xml; ) > 2.3.0cvs4.patchset
( cvs diff -u -r 1.382.2.276 -r 1.382.2.277 src/compose.c; cvs diff -u -r 1.50.2.25 -r 1.50.2.26 src/compose.h; cvs diff -u -r 1.213.2.97 -r 1.213.2.98 src/folder.c; cvs diff -u -r 1.87.2.28 -r 1.87.2.29 src/folder.h; cvs diff -u -r 1.179.2.119 -r 1.179.2.120 src/imap.c; cvs diff -u -r 1.149.2.51 -r 1.149.2.52 src/inc.c; cvs diff -u -r 1.115.2.89 -r 1.115.2.90 src/main.c; cvs diff -u -r 1.94.2.85 -r 1.94.2.86 src/messageview.c; cvs diff -u -r 1.79.2.34 -r 1.79.2.35 src/mh.c; cvs diff -u -r 1.52.2.20 -r 1.52.2.21 src/prefs_folder_item.c; cvs diff -u -r 1.47.2.30 -r 1.47.2.31 src/procheader.c; cvs diff -u -r 1.49.2.76 -r 1.49.2.77 src/procmime.c; cvs diff -u -r 1.150.2.67 -r 1.150.2.68 src/procmsg.c; cvs diff -u -r 1.60.2.28 -r 1.60.2.29 src/procmsg.h; cvs diff -u -r 1.17.2.30 -r 1.17.2.31 src/send_message.c; cvs diff -u -r 1.395.2.219 -r 1.395.2.220 src/summaryview.c; cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/toolbar.c; ) > 2.3.0cvs5.patchset
( cvs diff -u -r 1.207.2.102 -r 1.207.2.103 src/folderview.c; ) > 2.3.0cvs6.patchset
+( cvs diff -u -r 1.213.2.98 -r 1.213.2.99 src/folder.c; cvs diff -u -r 1.52.2.21 -r 1.52.2.22 src/prefs_folder_item.c; ) > 2.3.0cvs7.patchset
GtkWidget *dummy_chkbtn;
GtkWidget *menuitem;
SpecialFolderItemType type;
- gboolean type_apply_to_sub = TRUE;
GtkWidget *checkbtn_simplify_subject;
GtkWidget *entry_simplify_subject;
folder_type = gtk_option_menu_new ();
gtk_widget_show (folder_type);
- parent = item;
type = F_NORMAL;
- while (parent && (type = parent->stype) == F_NORMAL) {
- parent = folder_item_parent(parent);
- }
-
- if (type == F_INBOX && (parent = folder_item_parent(item)) != NULL
- && folder_item_parent(parent) != NULL) {
- type = F_NORMAL;
- type_apply_to_sub = FALSE;
- }
+ if (item->stype == F_INBOX)
+ type = F_INBOX;
+ else if (folder_has_parent_of_type(item, F_OUTBOX))
+ type = F_OUTBOX;
+ else if (folder_has_parent_of_type(item, F_DRAFT))
+ type = F_DRAFT;
+ else if (folder_has_parent_of_type(item, F_QUEUE))
+ type = F_QUEUE;
+ else if (folder_has_parent_of_type(item, F_TRASH))
+ type = F_TRASH;
folder_type_menu = gtk_menu_new ();
gtk_option_menu_set_history(GTK_OPTION_MENU(folder_type), type);
dummy_chkbtn = gtk_check_button_new();
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dummy_chkbtn), type_apply_to_sub);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dummy_chkbtn), type != F_INBOX);
gtk_widget_set_sensitive(dummy_chkbtn, FALSE);
- if (((parent = folder_item_parent(item)) != NULL
- && folder_item_parent(parent) == NULL)
- && item->stype == F_NORMAL) {
+ if (type == item->stype && type == F_NORMAL)
gtk_widget_set_sensitive(folder_type, TRUE);
- } else {
+ else
gtk_widget_set_sensitive(folder_type, FALSE);
- }
+
label = gtk_label_new(_("Folder type:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1,