diff --git a/src/mdiary.c b/src/mdiary.c index 5d0577b..4850cce 100644 --- a/src/mdiary.c +++ b/src/mdiary.c @@ -353,13 +353,15 @@ static void mdiary_add_file_to_store(struct mdiary_scanner *mdiary_scanner, if (g_date_time_to_unix(datetime) < mdiary_scanner->time_earliest) mdiary_scanner->time_earliest = g_date_time_to_unix(datetime); - g_input_stream_close(G_INPUT_STREAM(dstream), NULL, NULL); - g_input_stream_close(G_INPUT_STREAM(stream), NULL, NULL); + if (!content) { + g_input_stream_close(G_INPUT_STREAM(dstream), NULL, NULL); + g_input_stream_close(G_INPUT_STREAM(stream), NULL, NULL); + g_object_unref(file); + } g_string_free(text, 0); g_free(summary); g_free(title); g_date_time_unref(datetime); - g_object_unref(file); } static void mdiary_add_gpg_to_store(struct mdiary_scanner *mdiary_scanner, @@ -374,14 +376,14 @@ static void mdiary_add_gpg_to_store(struct mdiary_scanner *mdiary_scanner, cmd = g_strdup_printf("gpg --decrypt %s", filename); if (g_spawn_command_line_sync(cmd, &cmd_stdout, &cmd_stderr, &exit_status, NULL) && exit_status == 0) { - g_print("GPG: Decryption OK!\n"); + g_message("GPG: Decryption OK!\n"); mdiary_add_file_to_store(mdiary_scanner, filename, cmd_stdout, entryListStore, autoCompletion); } else { - g_print("GPG: Decryption of message failed!\n" - "---------- SNIP ----------\n" - "%s" - "---------- SNIP ----------\n", - cmd_stderr ? cmd_stderr : "Unknown error."); + g_warning("GPG: Decryption of message failed!\n" + "---------- SNIP ----------\n" + "%s" + "---------- SNIP ----------\n", + cmd_stderr ? cmd_stderr : "Unknown error."); } g_free(cmd);