aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2007-09-13 02:30:54 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2007-09-13 02:30:54 +0000
commit9026c5444aa126d97995f8f9b1c826109545d9f1 (patch)
tree3a241903fbed0713eadb738d8d3d919101c78a45
parent1f5f03634cbea00ae0927605a801c19e4cfb2a04 (diff)
disabled the passphrase dialog on query search.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1896 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--libsylph/procmsg.c8
-rw-r--r--libsylph/procmsg.h1
-rw-r--r--src/main.c1
-rw-r--r--src/query_search.c4
6 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7356977d..620f5dae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-13
+
+ * libsylph/procmsg.[ch]: procmsg_set_auto_decrypt_message(): added.
+ * src/query_search.c: query_search_folder(): disabled the passphrase
+ dialog on query search.
+
2007-09-12
* libsylph/enums.h
diff --git a/ChangeLog.ja b/ChangeLog.ja
index e77c15be..6e8bc3ee 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2007-09-13
+
+ * libsylph/procmsg.[ch]: procmsg_set_auto_decrypt_message(): 追加。
+ * src/query_search.c: query_search_folder(): クエリ検索時はパス
+ フレーズダイアログを出さないようにした。
+
2007-09-12
* libsylph/enums.h
diff --git a/libsylph/procmsg.c b/libsylph/procmsg.c
index 5797625d..194dd374 100644
--- a/libsylph/procmsg.c
+++ b/libsylph/procmsg.c
@@ -1214,17 +1214,23 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
}
static DecryptMessageFunc decrypt_message_func = NULL;
+static gboolean auto_decrypt = TRUE;
void procmsg_set_decrypt_message_func(DecryptMessageFunc func)
{
decrypt_message_func = func;
}
+void procmsg_set_auto_decrypt_message(gboolean enabled)
+{
+ auto_decrypt = enabled;
+}
+
FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
{
FILE *fp;
- if (decrypt_message_func)
+ if (decrypt_message_func && auto_decrypt)
return decrypt_message_func(msginfo, mimeinfo);
*mimeinfo = NULL;
diff --git a/libsylph/procmsg.h b/libsylph/procmsg.h
index 1abe7205..8456cdc9 100644
--- a/libsylph/procmsg.h
+++ b/libsylph/procmsg.h
@@ -291,6 +291,7 @@ void procmsg_message_file_list_free (GSList *file_list);
FILE *procmsg_open_message (MsgInfo *msginfo);
void procmsg_set_decrypt_message_func (DecryptMessageFunc func);
+void procmsg_set_auto_decrypt_message (gboolean enabled);
FILE *procmsg_open_message_decrypted (MsgInfo *msginfo,
MimeInfo **mimeinfo);
diff --git a/src/main.c b/src/main.c
index 0865f191..4deeeb3d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -844,6 +844,7 @@ static void check_gpg(void)
procmsg_set_decrypt_message_func
(rfc2015_open_message_decrypted);
+ procmsg_set_auto_decrypt_message(TRUE);
} else {
rfc2015_disable_all();
diff --git a/src/query_search.c b/src/query_search.c
index 68e40436..63f4587f 100644
--- a/src/query_search.c
+++ b/src/query_search.c
@@ -582,6 +582,8 @@ static void query_search_folder(FolderItem *item)
memset(&fltinfo, 0, sizeof(FilterInfo));
+ procmsg_set_auto_decrypt_message(FALSE);
+
debug_print("requires_full_headers: %d\n",
search_window.requires_full_headers);
debug_print("start query search: %s\n", item->path ? item->path : "");
@@ -629,6 +631,8 @@ static void query_search_folder(FolderItem *item)
procheader_header_list_destroy(hlist);
}
+ procmsg_set_auto_decrypt_message(TRUE);
+
procmsg_msg_list_free(mlist);
g_free(folder_name);
}