From 8321f6718a2e978ac4b5592b2973f908a66ad274 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sun, 5 Dec 2010 15:40:40 +0200
Subject: [PATCH] * mu_maildir_mkmdir => mu_maildir_mkdir

---
 src/mu-cmd-mkdir.c          | 2 +-
 src/mu-maildir.c            | 6 +++---
 src/mu-maildir.h            | 7 +++++--
 src/tests/test-mu-maildir.c | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/mu-cmd-mkdir.c b/src/mu-cmd-mkdir.c
index 7cff0a3d..050fbc32 100644
--- a/src/mu-cmd-mkdir.c
+++ b/src/mu-cmd-mkdir.c
@@ -47,7 +47,7 @@ mu_cmd_mkdir (MuConfigOptions *opts)
 	
 	i = 1;
 	while (opts->params[i]) {
-		if (!mu_maildir_mkmdir (opts->params[i], opts->dirmode,
+		if (!mu_maildir_mkdir (opts->params[i], opts->dirmode,
 					FALSE))
 			return FALSE;
 		++i;
diff --git a/src/mu-maildir.c b/src/mu-maildir.c
index e8d92892..6fc78565 100644
--- a/src/mu-maildir.c
+++ b/src/mu-maildir.c
@@ -106,11 +106,11 @@ create_noindex (const char *path)
 }
 
 gboolean
-mu_maildir_mkmdir (const char* path, mode_t mode, gboolean noindex)
+mu_maildir_mkdir (const char* path, mode_t mode, gboolean noindex)
 {	
 	g_return_val_if_fail (path, FALSE);
-
-	MU_WRITE_LOG ("mu_maildir_mkdir (%s, %o, %s)",
+	
+	MU_WRITE_LOG ("%s (%s, %o, %s)", __FUNCTION__,
 		      path, mode, noindex ?"TRUE":"FALSE");
 	
 	if (!create_maildir (path, mode))
diff --git a/src/mu-maildir.h b/src/mu-maildir.h
index c6aaebbe..dd838762 100644
--- a/src/mu-maildir.h
+++ b/src/mu-maildir.h
@@ -25,6 +25,7 @@
 #include <sys/types.h>          /* for mode_t */
 #include "mu-result.h"          /* for MuResult */
 
+G_BEGIN_DECLS
 
 /**
  * create a new maildir. Note, if the function fails 'halfway', it
@@ -39,7 +40,7 @@
  * 
  * @return TRUE if creation succeeded, FALSE otherwise
  */
-gboolean mu_maildir_mkmdir (const char* path, mode_t mode, gboolean noindex);
+gboolean mu_maildir_mkdir (const char* path, mode_t mode, gboolean noindex);
 
 
 /**
@@ -72,7 +73,7 @@ typedef MuResult (*MuMaildirWalkMsgCallback)
  * with 'enter' being TRUE upon entering, FALSE otherwise 
  */
 typedef MuResult (*MuMaildirWalkDirCallback)
-(const char* fullpath, gboolean enter, void *user_data);
+     (const char* fullpath, gboolean enter, void *user_data);
 
 /**
  * start a recursive walk of a maildir; for each file found, we call
@@ -109,4 +110,6 @@ MuResult mu_maildir_walk (const char *path, MuMaildirWalkMsgCallback cb_msg,
  */
 gboolean mu_maildir_clear_links (const gchar* dir);
 
+G_END_DECLS
+
 #endif /*__MU_MAILDIR_H__*/
diff --git a/src/tests/test-mu-maildir.c b/src/tests/test-mu-maildir.c
index b2eee298..2475e964 100644
--- a/src/tests/test-mu-maildir.c
+++ b/src/tests/test-mu-maildir.c
@@ -42,7 +42,7 @@ test_mu_maildir_mkmdir_01 (void)
 	mdir   = g_strdup_printf ("%s%c%s", tmpdir, G_DIR_SEPARATOR,
 				  "cuux");
 	
-	g_assert_cmpuint (mu_maildir_mkmdir (mdir, 0755, FALSE),
+	g_assert_cmpuint (mu_maildir_mkdir (mdir, 0755, FALSE),
 			  ==, TRUE);
 
 	for (i = 0; i != G_N_ELEMENTS(subs); ++i) {
@@ -76,7 +76,7 @@ test_mu_maildir_mkmdir_02 (void)
 	mdir   = g_strdup_printf ("%s%c%s", tmpdir, G_DIR_SEPARATOR,
 				  "cuux");
 	
-	g_assert_cmpuint (mu_maildir_mkmdir (mdir, 0755, TRUE),
+	g_assert_cmpuint (mu_maildir_mkdir (mdir, 0755, TRUE),
 			  ==, TRUE);
 
 	for (i = 0; i != G_N_ELEMENTS(subs); ++i) {
@@ -113,7 +113,7 @@ test_mu_maildir_mkmdir_03 (void)
 	/* this must fail */
 	g_test_log_set_fatal_handler ((GTestLogFatalFunc)ignore_error, NULL);
 
-	g_assert_cmpuint (mu_maildir_mkmdir (NULL, 0755, TRUE),
+	g_assert_cmpuint (mu_maildir_mkdir (NULL, 0755, TRUE),
 					    ==, FALSE);
 }