Revision 3239

View differences:

src/summaryview.c
5060 5060

  
5061 5061
void summary_junk(SummaryView *summaryview)
5062 5062
{
5063
	FolderItem *junk;
5063
	FolderItem *junk = NULL;
5064 5064

  
5065 5065
	if (!prefs_common.enable_junk)
5066 5066
		return;
5067 5067
	if (!prefs_common.junk_learncmd)
5068 5068
		return;
5069 5069

  
5070
	summary_lock(summaryview);
5070
	debug_print("summary_junk: setting selected mails as junk\n");
5071 5071

  
5072
	debug_print("Set mail as junk\n");
5073

  
5074 5072
	if (prefs_common.junk_folder)
5075 5073
		junk = folder_find_item_from_identifier
5076 5074
			(prefs_common.junk_folder);
5077
	else
5075
	if (!junk &&
5076
	    summaryview->folder_item && summaryview->folder_item->folder)
5077
		junk = folder_get_junk(summaryview->folder_item->folder);
5078
	if (!junk)
5078 5079
		junk = folder_get_default_junk();
5080
	if (!junk) {
5081
		g_warning("summary_junk: junk folder not found");
5082
		return;
5083
	}
5079 5084

  
5085
	summary_lock(summaryview);
5086

  
5080 5087
	summaryview->to_folder = junk;
5081 5088
	gtk_tree_selection_selected_foreach(summaryview->selection,
5082 5089
					    summary_junk_func, summaryview);
ChangeLog
1
2013-03-29
2

  
3
	* src/summaryview.c: summary_junk(): select proper junk folder instead
4
	  of default one.
5

  
1 6
2013-03-28
2 7

  
3 8
	* src/quote_fmt_parse.y: prohibit warnings when target message does

Also available in: Unified diff