Diff of /trunk/src/project.c

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

revision 28 by achadwick, Wed Dec 24 14:17:20 2008 UTC revision 29 by harbaum, Wed Dec 24 20:16:53 2008 UTC
# Line 1099  gboolean project_load(appdata_t *appdata Line 1099  gboolean project_load(appdata_t *appdata
1099    char banner_txt[_PROJECT_LOAD_BUF_SIZ];    char banner_txt[_PROJECT_LOAD_BUF_SIZ];
1100    memset(banner_txt, 0, _PROJECT_LOAD_BUF_SIZ);    memset(banner_txt, 0, _PROJECT_LOAD_BUF_SIZ);
1101    
1102    snprintf(&banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Loading %s"), proj_name);    snprintf(banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Loading %s"), proj_name);
1103    banner_busy_start(appdata, TRUE, banner_txt);    banner_busy_start(appdata, TRUE, banner_txt);
1104    
1105    /* close current project */    /* close current project */
# Line 1111  gboolean project_load(appdata_t *appdata Line 1111  gboolean project_load(appdata_t *appdata
1111    banner_busy_tick();    banner_busy_tick();
1112    if(!project_open(appdata, proj_name)) {    if(!project_open(appdata, proj_name)) {
1113      printf("error opening requested project\n");      printf("error opening requested project\n");
1114      snprintf(&banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Error opening %s"), proj_name);      snprintf(banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Error opening %s"), proj_name);
1115      banner_busy_stop(appdata);      banner_busy_stop(appdata);
1116      banner_show_info(appdata, banner_txt);      banner_show_info(appdata, banner_txt);
1117      g_free(proj_name);      g_free(proj_name);
# Line 1123  gboolean project_load(appdata_t *appdata Line 1123  gboolean project_load(appdata_t *appdata
1123    if(!osm_sanity_check(GTK_WIDGET(appdata->window), appdata->osm)) {    if(!osm_sanity_check(GTK_WIDGET(appdata->window), appdata->osm)) {
1124      printf("project/osm sanity checks failed, unloading project\n");      printf("project/osm sanity checks failed, unloading project\n");
1125      project_free(appdata->project);      project_free(appdata->project);
1126      snprintf(&banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Error opening %s"), proj_name);      snprintf(banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Error opening %s"), proj_name);
1127      banner_busy_stop(appdata);      banner_busy_stop(appdata);
1128      banner_show_info(appdata, banner_txt);      banner_show_info(appdata, banner_txt);
1129      g_free(proj_name);      g_free(proj_name);
# Line 1153  gboolean project_load(appdata_t *appdata Line 1153  gboolean project_load(appdata_t *appdata
1153      g_free(appdata->settings->project);      g_free(appdata->settings->project);
1154    appdata->settings->project = g_strdup(appdata->project->name);    appdata->settings->project = g_strdup(appdata->project->name);
1155    
1156    snprintf(&banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Loaded %s"), proj_name);    snprintf(banner_txt, _PROJECT_LOAD_BUF_SIZ, _("Loaded %s"), proj_name);
1157    banner_busy_stop(appdata);    banner_busy_stop(appdata);
1158    banner_show_info(appdata, banner_txt);    banner_show_info(appdata, banner_txt);
1159    statusbar_set(appdata, NULL, 0);    statusbar_set(appdata, NULL, 0);
Legend:
Removed from v.28  
changed lines
  Added in v.29