Compare commits
	
		
			No commits in common. "017e6e8b9a6fef5ddb4b855c441d604da6fa5424" and "8678f326cd3ed02cea0cae3f9527e6882d31c999" have entirely different histories.
		
	
	
		
			017e6e8b9a
			...
			8678f326cd
		
	
		
@ -375,7 +375,7 @@ static void mdiary_add_file_to_store(struct mdiary_scanner *mdiary_scanner,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void mdiary_add_gpg_to_store(struct mdiary_scanner *mdiary_scanner,
 | 
			
		||||
				    gchar *filename, GList **autotags,
 | 
			
		||||
				    gchar *filename, GList **add_tags,
 | 
			
		||||
				    GtkListStore *entryListStore, GtkListStore *autoCompletion)
 | 
			
		||||
{
 | 
			
		||||
	gchar *cmd	  = NULL;
 | 
			
		||||
@ -387,9 +387,7 @@ static void mdiary_add_gpg_to_store(struct mdiary_scanner *mdiary_scanner,
 | 
			
		||||
 | 
			
		||||
	if (g_spawn_command_line_sync(cmd, &cmd_stdout, &cmd_stderr, &exit_status, NULL) && exit_status == 0) {
 | 
			
		||||
		g_message("GPG: Decryption OK!\n");
 | 
			
		||||
		*autotags = g_list_append(*autotags, "encrypted");
 | 
			
		||||
		mdiary_add_file_to_store(mdiary_scanner, filename, cmd_stdout, *autotags, entryListStore, autoCompletion);
 | 
			
		||||
		*autotags = g_list_remove(*autotags, g_list_last(*autotags)->data);
 | 
			
		||||
		mdiary_add_file_to_store(mdiary_scanner, filename, cmd_stdout, *add_tags, entryListStore, autoCompletion);
 | 
			
		||||
	} else {
 | 
			
		||||
		mdiary_scanner->entries_failed++;
 | 
			
		||||
		mdiary_scanner->error_code |= MDS_ERROR_GPG;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user