From 450cfb74af15787e18acb3440c0452708ad9dac9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Wed, 22 Jul 2009 20:39:12 +0000
Subject: [PATCH] (trunk gtk) minor tweak: replace mkdir_p() with
 gtr_mkdir_with_parents() for symmetry with glib

---
 gtk/conf.c | 2 +-
 gtk/main.c | 4 ++--
 gtk/util.c | 5 ++---
 gtk/util.h | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gtk/conf.c b/gtk/conf.c
index b458c9c9a..cf1cb6e49 100644
--- a/gtk/conf.c
+++ b/gtk/conf.c
@@ -57,7 +57,7 @@ cf_init( const char   * configDir,
 
     gl_confdir = g_strdup( configDir );
 
-    if( mkdir_p( gl_confdir, 0755 ) )
+    if( gtr_mkdir_with_parents( gl_confdir, 0755 ) )
         return TRUE;
 
     if( errstr != NULL )
diff --git a/gtk/main.c b/gtk/main.c
index d427d0cad..a4664dd93 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -438,9 +438,9 @@ main( int     argc,
 
         /* ensure the directories are created */
        if(( str = pref_string_get( PREF_KEY_DIR_WATCH )))
-           mkdir_p( str, 0777 );
+           gtr_mkdir_with_parents( str, 0777 );
        if(( str = pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR )))
-           mkdir_p( str, 0777 );
+           gtr_mkdir_with_parents( str, 0777 );
 
         /* initialize the libtransmission session */
         session = tr_sessionInit( "gtk", configDir, TRUE, pref_get_all( ) );
diff --git a/gtk/util.c b/gtk/util.c
index 6dd2ab31b..bc8744a66 100644
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -7,7 +7,7 @@
  * This exemption does not extend to derived works not owned by
  * the Transmission project.
  *
- * $Id:$
+ * $Id$
  */
 
 #include <ctype.h> /* isxdigit() */
@@ -197,8 +197,7 @@ gtr_localtime2( char * buf, time_t time, size_t buflen )
 }
 
 int
-mkdir_p( const char * path,
-         mode_t       mode )
+gtr_mkdir_with_parents( const char * path, int mode )
 {
 #if GLIB_CHECK_VERSION( 2, 8, 0 )
     return !g_mkdir_with_parents( path, mode );
diff --git a/gtk/util.h b/gtk/util.h
index 8a6e0c758..b7c8f1302 100644
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -7,7 +7,7 @@
  * This exemption does not extend to derived works not owned by
  * the Transmission project.
  *
- * $Id:$
+ * $Id$
  */
 
 #ifndef GTR_UTIL_H
@@ -38,9 +38,6 @@ char* gtr_localtime( time_t time );
 /* similar to asctime, but is utf8-clean */
 char* gtr_localtime2( char * buf, time_t time, size_t buflen );
 
-/* create a directory and any missing parent directories */
-int mkdir_p( const char *name, mode_t mode );
-
 /***
 ****
 ***/
@@ -79,6 +76,9 @@ char*       gtr_get_help_url( void );
 /* GTK-related utilities */
 #ifdef GTK_MAJOR_VERSION
 
+/* backwards-compatible wrapper around g_mkdir_with_parents() */
+int gtr_mkdir_with_parents( const char *name, int mode );
+
 /* backwards-compatible wrapper around gdk_threads_add_timeout_seconds() */
 guint gtr_timeout_add_seconds( guint seconds, GSourceFunc func, gpointer data );
 
-- 
2.40.0