Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an option to always prompt for a download directory. Fixes ticket #116.

Browse Source 
Fix a minor memory leak with the 'Add a Torrent' dialog.
This commit is contained in:
Josh Elsasser
2007-02-07 02:59:25 +00:00
parent 3a4a6c4251
commit e15841cc93
6 changed files with 153 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gtk/main.c
View File

@@ -1064,6 +1064,29 @@ doubleclick(GtkWidget *widget SHUTUP, GtkTreePath *path,
}
}
static const char *
defaultdir( void )
{
static char * wd = NULL;
const char * dir;
dir = cf_getpref( PREF_DIR );
if( NULL == dir )
{
if( NULL == wd )
{
wd = g_new( char, MAX_PATH_LENGTH + 1 );
if( NULL == getcwd( wd, MAX_PATH_LENGTH + 1 ) )
{
strcpy( wd, "." );
}
}
dir = wd;
}
return dir;
}
void
addtorrents(void *vdata, void *state, GList *files,
const char *dir, guint flags) {
@@ -1072,7 +1095,7 @@ addtorrents(void *vdata, void *state, GList *files,
char *errstr;
TrTorrent *tor;
GtkTreeIter iter;
char *wd;
const char * pref;
errlist = NULL;
torlist = NULL;
@@ -1081,15 +1104,16 @@ addtorrents(void *vdata, void *state, GList *files,
torlist = tr_backend_load_state(data->back, state, &errlist);
if(NULL != files) {
if(NULL == dir)
dir = cf_getpref(PREF_DIR);
wd = NULL;
if(NULL == dir) {
wd = g_new(char, MAX_PATH_LENGTH + 1);
if(NULL == getcwd(wd, MAX_PATH_LENGTH + 1))
dir = ".";
else
dir = wd;
if( NULL == dir )
{
pref = cf_getpref( PREF_ASKDIR );
if( NULL != pref && strbool( pref ) )
{
promptfordir( data->wind, addtorrents, data,
files, flags, defaultdir() );
files = NULL;
}
dir = defaultdir();
}
for(ii = g_list_first(files); NULL != ii; ii = ii->next) {
errstr = NULL;
@@ -1100,8 +1124,6 @@ addtorrents(void *vdata, void *state, GList *files,
if(NULL != errstr)
errlist = g_list_append(errlist, errstr);
}
if(NULL != wd)
g_free(wd);
}
for(ii = g_list_first(torlist); NULL != ii; ii = ii->next) {