Diff of /trunk/src/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 193 by harbaum, Tue Nov 17 20:13:09 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 155  gpx_t *choose_file(appdata_t *appdata, g Line 155  gpx_t *choose_file(appdata_t *appdata, g
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 */
# Line 474  static GtkWidget *cachelist_create(appda Line 474  static GtkWidget *cachelist_create(appda
474      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
475    
476      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
477      int type = (cache->type<<8) +      int type = cache->type<<8;
478        (cache->notes?4:0) +      if(cache->notes) type |= 4;
479        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
480        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
481        if(cache->found) type |= 2;
482        if(cache->mine) type |= 8;
483    
484      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
485    
# Line 864  static void gpxlist_view_onRowActivated( Line 866  static void gpxlist_view_onRowActivated(
866          gpx_t *new = NULL;          gpx_t *new = NULL;
867    
868          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
869            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
870          else          else
871            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
872    
873          if(new) {          if(new) {
874            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
Legend:
Removed from v.193  
changed lines
  Added in v.205