Diff of /trunk/src/diff.c

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

src/diff.c revision 1 by harbaum, Tue Dec 9 20:06:06 2008 UTC trunk/src/diff.c revision 28 by achadwick, Wed Dec 24 14:17:20 2008 UTC
# Line 215  gboolean diff_is_clean(osm_t *osm, gbool Line 215  gboolean diff_is_clean(osm_t *osm, gbool
215  }  }
216    
217  void diff_save(project_t *project, osm_t *osm) {  void diff_save(project_t *project, osm_t *osm) {
218    if(!project) return;    if(!project || !osm) return;
219    
220    char *diff_name =    char *diff_name =
221    g_strdup_printf("%s/%s.diff", project->path, project->name);    g_strdup_printf("%s/%s.diff", project->path, project->name);
# Line 628  void diff_restore_relation(xmlDoc *doc, Line 628  void diff_restore_relation(xmlDoc *doc,
628  }  }
629    
630  void diff_restore(appdata_t *appdata, project_t *project, osm_t *osm) {  void diff_restore(appdata_t *appdata, project_t *project, osm_t *osm) {
631      if(!project || !osm) return;
632    
633    char *diff_name = g_strdup_printf("%s/%s.diff", project->path, project->name);    char *diff_name = g_strdup_printf("%s/%s.diff", project->path, project->name);
634    
635    if(!g_file_test(diff_name, G_FILE_TEST_EXISTS)) {    if(!g_file_test(diff_name, G_FILE_TEST_EXISTS)) {
636      printf("no diff present!\n");      printf("no diff present!\n");
637      g_free(diff_name);      g_free(diff_name);
# Line 707  void diff_restore(appdata_t *appdata, pr Line 709  void diff_restore(appdata_t *appdata, pr
709    if(something_is_hidden) {    if(something_is_hidden) {
710      printf("hidden flags have been restored, enable show_add menu\n");      printf("hidden flags have been restored, enable show_add menu\n");
711    
712      statusbar_set(appdata, _("Some objects have been hidden"), TRUE);      statusbar_set(appdata, _("Some objects are hidden"), TRUE);
713      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, TRUE);      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, TRUE);
714    }    }
715  }  }
Legend:
Removed from v.1  
changed lines
  Added in v.28