Diff of /trunk/src/main.c

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

revision 174 by harbaum, Sat May 9 19:01:38 2009 UTC revision 175 by harbaum, Wed Jun 10 09:24:47 2009 UTC
# Line 148  cb_menu_download(GtkMenuItem *item, gpoi Line 148  cb_menu_download(GtkMenuItem *item, gpoi
148    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
149                    appdata->project)) {                    appdata->project)) {
150      banner_busy_start(appdata, 1, "Redrawing...");      banner_busy_start(appdata, 1, "Redrawing...");
151      appdata->osm = osm_parse(appdata->project->osm);      appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
152      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
153      map_paint(appdata);      map_paint(appdata);
154      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing..."
# Line 203  cb_menu_redraw(GtkMenuItem *item, gpoint Line 203  cb_menu_redraw(GtkMenuItem *item, gpoint
203    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
204    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
205    
206    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
207    diff_restore(appdata, appdata->project, appdata->osm);    diff_restore(appdata, appdata->project, appdata->osm);
208    map_paint(appdata);    map_paint(appdata);
209    
# Line 276  cb_menu_undo_changes(GtkMenuItem *item, Line 276  cb_menu_undo_changes(GtkMenuItem *item,
276    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
277    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
278    diff_remove(appdata->project);    diff_remove(appdata->project);
279    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
280    map_paint(appdata);    map_paint(appdata);
281    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing..."
282    
Legend:
Removed from v.174  
changed lines
  Added in v.175