155 |
gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window)); |
gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window)); |
156 |
|
|
157 |
if(!whole_dir) |
if(!whole_dir) |
158 |
gpx = gpx_parse(dialog, filename); |
gpx = gpx_parse(dialog, filename, appdata->username); |
159 |
else { |
else { |
160 |
/* cur trailing '/' if present */ |
/* cur trailing '/' if present */ |
161 |
if(strlastchr(filename) == '/') |
if(strlastchr(filename) == '/') |
162 |
filename[strlen(filename)] = 0; |
filename[strlen(filename)] = 0; |
163 |
|
|
164 |
gpx = gpx_parse_dir(dialog, filename); |
gpx = gpx_parse_dir(dialog, filename, appdata->username); |
165 |
} |
} |
166 |
|
|
167 |
gpx_busy_dialog_destroy(dialog); |
gpx_busy_dialog_destroy(dialog); |
168 |
|
|
169 |
/* save path if gpx was successfully loaded */ |
/* save path if gpx was successfully loaded */ |
477 |
int type = (cache->type<<8) + |
int type = (cache->type<<8) + |
478 |
(cache->notes?4:0) + |
(cache->notes?4:0) + |
479 |
((cache->notes && cache->notes->override)?1:0) + |
((cache->notes && cache->notes->override)?1:0) + |
480 |
((cache->notes && cache->notes->found)?2:0); |
(((cache->notes && cache->notes->found)||cache->found)?2:0); |
481 |
|
|
482 |
if((!(type & 2)) || !appdata->cachelist_hide_found) { |
if((!(type & 2)) || !appdata->cachelist_hide_found) { |
483 |
|
|
864 |
gpx_t *new = NULL; |
gpx_t *new = NULL; |
865 |
|
|
866 |
if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR)) |
if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR)) |
867 |
new = gpx_parse_dir(dialog, gpx->filename); |
new = gpx_parse_dir(dialog, gpx->filename, appdata->username); |
868 |
else |
else |
869 |
new = gpx_parse(dialog, gpx->filename); |
new = gpx_parse(dialog, gpx->filename, appdata->username); |
870 |
|
|
871 |
if(new) { |
if(new) { |
872 |
gpx_t **prev = &(appdata->gpx); |
gpx_t **prev = &(appdata->gpx); |