Changeset 6946
- Timestamp:
- Oct 22, 2008, 5:16:12 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cli/cli.c
r6935 r6946 44 44 static int isPrivate = 0; 45 45 static int verboseLevel = 0; 46 static int encryptionMode = TR_ ENCRYPTION_PREFERRED;46 static int encryptionMode = TR_DEFAULT_ENCRYPTION; 47 47 static int peerPort = TR_DEFAULT_PORT; 48 48 static int peerSocketTOS = TR_DEFAULT_PEER_SOCKET_TOS; -
trunk/daemon/daemon.c
r6911 r6946 219 219 getConfigStr( dict, KEY_PASSWORD, &password, NULL ); 220 220 getConfigInt( dict, KEY_ENCRYPTION, &encryption, 221 TR_ ENCRYPTION_PREFERRED);221 TR_DEFAULT_ENCRYPTION ); 222 222 223 223 /*** -
trunk/gtk/tr-prefs.c
r6873 r6946 113 113 pref_flag_set_default ( PREF_KEY_PEX, TR_DEFAULT_PEX_ENABLED ); 114 114 pref_flag_set_default ( PREF_KEY_ASKQUIT, TRUE ); 115 pref_flag_set_default ( PREF_KEY_ENCRYPTION, TR_ ENCRYPTION_PREFERRED);115 pref_flag_set_default ( PREF_KEY_ENCRYPTION, TR_DEFAULT_ENCRYPTION ); 116 116 pref_flag_set_default ( PREF_KEY_LAZY_BITFIELD, 117 117 TR_DEFAULT_LAZY_BITFIELD_ENABLED ); -
trunk/libtransmission/session.c
r6898 r6946 315 315 TR_DEFAULT_PORT_FORWARDING_ENABLED, 316 316 -1, /* public port */ 317 TR_ ENCRYPTION_PREFERRED, /* encryption mode */317 TR_DEFAULT_ENCRYPTION, /* encryption mode */ 318 318 TR_DEFAULT_LAZY_BITFIELD_ENABLED, 319 319 FALSE, /* use upload speed limit? */ -
trunk/libtransmission/transmission.h
r6941 r6946 98 98 /** @see tr_sessionInitFull */ 99 99 #define TR_DEFAULT_CONFIG_DIR tr_getDefaultConfigDir( ) 100 /** @see tr_sessionInitFull */ 101 #ifdef TR_EMBEDDED 102 #define TR_DEFAULT_ENCRYPTION TR_CLEAR_PREFERRED 103 #else 104 #define TR_DEFAULT_ENCRYPTION TR_ENCRYPTION_PREFERRED 105 #endif 100 106 /** @see tr_sessionInitFull */ 101 107 #define TR_DEFAULT_PEX_ENABLED 1 -
trunk/libtransmission/utils.h
r6945 r6946 99 99 100 100 /* #define DISABLE_GETTEXT */ 101 #if defined(TR_EMBEDDED) && !defined(DISABLE_GETTEXT) 102 #define DISABLE_GETTEXT 103 #endif 101 104 #ifdef DISABLE_GETTEXT 102 const char* tr_strip_positional_args( const char* fmt ); 103 105 const char * tr_strip_positional_args( const char * fmt ); 104 106 #undef _ 105 107 #define _( a ) tr_strip_positional_args( a ) -
trunk/macosx/Controller.m
r6942 r6946 211 211 [fDefaults boolForKey: @"NatTraversal"], 212 212 [fDefaults integerForKey: @"BindPort"], 213 TR_ ENCRYPTION_PREFERRED, /* reset in prefs */213 TR_DEFAULT_ENCRYPTION, /* reset in prefs */ 214 214 TR_DEFAULT_LAZY_BITFIELD_ENABLED, 215 215 NO, /* reset in prefs */
Note: See TracChangeset
for help on using the changeset viewer.