From 6c7fbaeeaa9e5d6ac052619a295156ac2e93e754 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Tue, 27 Jul 2010 10:07:52 +0200
Subject: [PATCH] Unification of protocol handler names.

---
 src/protocol/file/mailcap.c | 2 +-
 src/protocol/file/mailcap.h | 2 +-
 src/protocol/protocol.c     | 2 +-
 src/protocol/test/stub.c    | 4 ++--
 src/session/download.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/protocol/file/mailcap.c b/src/protocol/file/mailcap.c
index f2fe4095..f64348bb 100644
--- a/src/protocol/file/mailcap.c
+++ b/src/protocol/file/mailcap.c
@@ -65,7 +65,7 @@ get_request(struct connection *conn)
 }
 
 void
-execute_mailcap(struct connection *conn)
+mailcap_protocol_handler(struct connection *conn)
 {
 	unsigned char *script, *ref;
 	pid_t pid;
diff --git a/src/protocol/file/mailcap.h b/src/protocol/file/mailcap.h
index a0800a85..e3116be4 100644
--- a/src/protocol/file/mailcap.h
+++ b/src/protocol/file/mailcap.h
@@ -5,6 +5,6 @@
 #include "protocol/protocol.h"
 
 extern struct module mailcap_protocol_module;
-extern protocol_handler_T execute_mailcap;
+extern protocol_handler_T mailcap_protocol_handler;
 
 #endif
diff --git a/src/protocol/protocol.c b/src/protocol/protocol.c
index 433cc0fa..285c0f74 100644
--- a/src/protocol/protocol.c
+++ b/src/protocol/protocol.c
@@ -69,7 +69,7 @@ static const struct protocol_backend protocol_backends[] = {
 	{ "http",	  80, http_protocol_handler,		1, 1, 0, 0, 1 },
 	{ "https",	 443, https_protocol_handler,		1, 1, 0, 1, 1 },
 	{ "javascript",	   0, NULL,				0, 0, 1, 0, 1 },
-	{ "mailcap",	   0, execute_mailcap,			0, 0, 1, 0, 0 },
+	{ "mailcap",	   0, mailcap_protocol_handler,		0, 0, 1, 0, 0 },
 	{ "news",	   0, news_protocol_handler,		0, 0, 1, 0, 1 },
 	{ "nntp",	 119, nntp_protocol_handler,		1, 1, 0, 0, 0 },
 	{ "nntps",	 563, nntp_protocol_handler,		1, 1, 0, 1, 0 },
diff --git a/src/protocol/test/stub.c b/src/protocol/test/stub.c
index 9b8ff5b3..313d8c8b 100644
--- a/src/protocol/test/stub.c
+++ b/src/protocol/test/stub.c
@@ -115,8 +115,8 @@ msg_box(struct terminal *term, struct memory_list *mem_list,
 
 /* declared in "protocol/file/mailcap.h" */
 void
-execute_mailcap(struct connection *conn)
+mailcap_protocol_handler(struct connection *conn)
 {
-	stub_called("execute_mailcap");
+	stub_called("mailcap_protocol_handler");
 	return NULL;
 }
diff --git a/src/session/download.c b/src/session/download.c
index b919895c..8a5e1c4b 100644
--- a/src/session/download.c
+++ b/src/session/download.c
@@ -459,7 +459,7 @@ download_data_store(struct download *download, struct file_download *file_downlo
 		if (file_download->copiousoutput) {
 			exec_later(file_download->ses,
 				   file_download->external_handler, file_download->file);
-			/* Temporary file is deleted by the execute_mailcap */
+			/* Temporary file is deleted by the mailcap_protocol_handler */
 			file_download->delete = 0;
 		} else {
 			exec_on_terminal(term, file_download->external_handler,
-- 
2.11.4.GIT