Changeset 8026

Timestamp:

Mar 5, 2009, 2:40:58 AM (14 years ago)

Author:

charles

Message:

(trunk gtk) #1773: First run - error in Properties

Location:

trunk/gtk

Files:

• main.c (modified) (2 diffs)
• tr-prefs.c (modified) (3 diffs)
• tr-prefs.h (modified) (2 diffs)

trunk/gtk/main.c

@@ -407 +407 @@
     tr_notify_init( );
     didinit = cf_init( configDir, NULL ); /* must come before actions_init */
-    tr_prefs_init_global( );
+    tr_prefs_init_defaults( );
 
     myUIManager = gtk_ui_manager_new ( );
@@ -439 +439 @@
     if( didlock && ( didinit || cf_init( configDir, &err ) ) )
     {
+        const char * str;
         GtkWindow * win;
         tr_session * session;
+
+        /* ensure the directories are created */
+       if(( str = pref_string_get( PREF_KEY_DIR_WATCH )))
+           mkdir_p( str, 0777 );
+       if(( str = pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR )))
+           mkdir_p( str, 0777 );
 
         /* initialize the libtransmission session */

trunk/gtk/tr-prefs.c

@@ -34 +34 @@
  */
 void
-tr_prefs_init_global( void )
+tr_prefs_init_defaults( void )
 {
     const char * str;
@@ -43 +43 @@
     str = NULL;
     if( !str ) str = g_get_user_special_dir( G_USER_DIRECTORY_DESKTOP );
+    if( !str ) str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
     if( !str ) str = tr_getDefaultDownloadDir( );
-    mkdir_p( str, 0777 );
     pref_string_set_default ( PREF_KEY_DIR_WATCH, str );
     pref_flag_set_default   ( PREF_KEY_DIR_WATCH_ENABLED, FALSE );
@@ -80 +80 @@
 #endif
     if( !str ) str = tr_getDefaultDownloadDir( );
-    mkdir_p( str, 0777 );
     pref_string_set_default ( TR_PREFS_KEY_DOWNLOAD_DIR, str );
 

trunk/gtk/tr-prefs.h

@@ -20 +20 @@
 
 /* if you add a key here,  you /must/ add its
- * default in tr_prefs_init_global( void ) */
+ * default in tr_prefs_init_defaults( void ) */
 
 #define PREF_KEY_SCHED_LIMIT_ENABLED        "sched-limit-enabled"
@@ -51 +51 @@
 #define PREF_KEY_MAIN_WINDOW_Y              "main-window-y"
 
-void tr_prefs_init_global( void );
+void tr_prefs_init_defaults( void );
 
 #endif