Changeset 5214 for trunk/gtk/tr-prefs.c

Timestamp:

Mar 7, 2008, 4:30:44 PM (14 years ago)

Author:

charles

Message:

(gtk) #771: use g_get_home_dir() as a fallback for the default download directory if "g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD )" returns NULL. (jopadan)

File:

• trunk/gtk/tr-prefs.c (modified) (2 diffs)

trunk/gtk/tr-prefs.c

@@ -28 +28 @@
 tr_prefs_init_global( void )
 {
+    const char * str;
+
     cf_check_older_configs( );
 
@@ -42 +44 @@
     pref_flag_set_default   ( PREF_KEY_UL_LIMIT_ENABLED, FALSE );
     pref_int_set_default    ( PREF_KEY_UL_LIMIT, 50 );
-
     pref_flag_set_default   ( PREF_KEY_OPTIONS_PROMPT, TRUE );
+
+    str = NULL;
 #if GLIB_CHECK_VERSION(2,14,0)
-    pref_string_set_default ( PREF_KEY_DIR_DEFAULT,
-                              g_get_user_special_dir(
-                                  G_USER_DIRECTORY_DOWNLOAD ) );
-#else
-    pref_string_set_default ( PREF_KEY_DIR_DEFAULT, g_get_home_dir() );
+    if( !str )
+        str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
 #endif
+    if( !str )
+        str = g_get_home_dir( );
+    pref_string_set_default ( PREF_KEY_DIR_DEFAULT, str );
 
     pref_int_set_default    ( PREF_KEY_PORT, TR_DEFAULT_PORT );