Diff of /trunk/src/main.c

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

revision 55 by achadwick, Sat Feb 7 01:14:09 2009 UTC revision 158 by harbaum, Fri Apr 10 11:13:26 2009 UTC
# Line 1  Line 1 
1  /*  /*
2     * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.
3     *
4   * This file is part of OSM2Go.   * This file is part of OSM2Go.
5   *   *
6   * OSM2Go is free software: you can redistribute it and/or modify   * OSM2Go is free software: you can redistribute it and/or modify
# Line 56  static void main_ui_enable(appdata_t *ap Line 58  static void main_ui_enable(appdata_t *ap
58    /* disable all menu entries related to map */    /* disable all menu entries related to map */
59    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);
60    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);
61    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);    if(appdata->menu_item_osm_undo)
62        gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);
63      gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
64    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
65      gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);
66    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
67    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
68    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
# Line 70  static void main_ui_enable(appdata_t *ap Line 75  static void main_ui_enable(appdata_t *ap
75    
76  /******************** begin of menu *********************/  /******************** begin of menu *********************/
77    
 #if 0 // simplify menu  
 static struct {  
   enum { MENU_END, MENU_ITEM, MENU_SUB, MENU_SUB_END, MENU_SEP }  type;  
   
   char *title;  
   GCallback c_handler;  
 } menu[] = {  
   { MENU_SUB, "_OSM", NULL },  
   
   { MENU_END,  NULL, NULL },  
 };  
 #endif  
   
78  static void  static void
79  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkMenuItem *item, gpointer data) {
80    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
81    project_load(appdata, NULL);    project_load(appdata, NULL);
82    main_ui_enable(appdata);    main_ui_enable(appdata);
83  }  }
84    
85  static void  static void
86  cb_menu_project_close(GtkWidget *window, gpointer data) {  cb_menu_project_close(GtkMenuItem *item, gpointer data) {
87    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
88    project_close(appdata);    project_close(appdata);
89    main_ui_enable(appdata);    main_ui_enable(appdata);
90  }  }
91    
92  static void  static void
93  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkMenuItem *item, gpointer data) {
94    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    appdata_t *appdata = (appdata_t*)data;
   
   gtk_about_dialog_set_name(about, "OSM2Go");  
   gtk_about_dialog_set_version(about, VERSION);  
   gtk_about_dialog_set_copyright(about, _("Copyright 2008"));  
95    
96    const gchar *authors[] = {    const gchar *authors[] = {
97      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
98      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
99      NULL };      NULL };
100    
101    gtk_about_dialog_set_authors(about, authors);    const gchar *artists[] = {
102        "Andrew Zhilin <drew.zhilin@gmail.com>",
103    gtk_about_dialog_set_website(about,      NULL };
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Mobile OSM Editor"));  
104    
105    gtk_widget_show_all(GTK_WIDGET(about));    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
106    gtk_dialog_run(GTK_DIALOG(about));                          "name", "OSM2Go",
107    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
108                            "copyright", _("Copyright 2008-2009"),
109                            "authors", authors,
110                            "artists", artists,
111                            "website", _("http://www.harbaum.org/till/maemo"),
112                            "comments", _("Mobile OSM Editor"),
113                            NULL);
114  }  }
115    
116  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
117    
118  static void  static void
119  cb_menu_quit(GtkWidget *window, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
120    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
121    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
122  }  }
123    
124  static void  static void
125  cb_menu_upload(GtkWidget *window, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
126    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
127    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
128    
# Line 140  cb_menu_upload(GtkWidget *window, gpoint Line 130  cb_menu_upload(GtkWidget *window, gpoint
130  }  }
131    
132  static void  static void
133  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkMenuItem *item, gpointer data) {
134    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
135    if(!appdata->project) return;    if(!appdata->project) return;
136    
# Line 167  cb_menu_download(GtkWidget *window, gpoi Line 157  cb_menu_download(GtkWidget *window, gpoi
157  }  }
158    
159  static void  static void
160  cb_menu_wms_import(GtkWidget *window, gpointer data) {  cb_menu_wms_import(GtkMenuItem *item, gpointer data) {
161    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
162    wms_import(appdata);    wms_import(appdata);
163  }  }
164    
165  static void  static void
166  cb_menu_wms_clear(GtkWidget *window, gpointer data) {  cb_menu_wms_clear(GtkMenuItem *item, gpointer data) {
167    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
168    wms_remove(appdata);    wms_remove(appdata);
169  }  }
170    
171  static void  static void
172  cb_menu_wms_adjust(GtkWidget *window, gpointer data) {  cb_menu_wms_adjust(GtkMenuItem *item, gpointer data) {
173    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
174    map_action_set(appdata, MAP_ACTION_BG_ADJUST);    map_action_set(appdata, MAP_ACTION_BG_ADJUST);
175  }  }
# Line 187  cb_menu_wms_adjust(GtkWidget *window, gp Line 177  cb_menu_wms_adjust(GtkWidget *window, gp
177  /* ----------- hide objects for performance reasons ----------- */  /* ----------- hide objects for performance reasons ----------- */
178    
179  static void  static void
180  cb_menu_map_hide_sel(GtkWidget *window, gpointer data) {  cb_menu_map_hide_sel(GtkMenuItem *item, gpointer data) {
181    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
182    map_hide_selected(appdata);    map_hide_selected(appdata);
183  }  }
184    
185  static void  static void
186  cb_menu_map_show_all(GtkWidget *window, gpointer data) {  cb_menu_map_show_all(GtkMenuItem *item, gpointer data) {
187    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
188    map_show_all(appdata);    map_show_all(appdata);
189  }  }
# Line 202  cb_menu_map_show_all(GtkWidget *window, Line 192  cb_menu_map_show_all(GtkWidget *window,
192    
193  #if 1  // mainly for testing  #if 1  // mainly for testing
194  static void  static void
195  cb_menu_redraw(GtkWidget *window, gpointer data) {  cb_menu_redraw(GtkMenuItem *item, gpointer data) {
196    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
197    
198    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
# Line 226  cb_menu_redraw(GtkWidget *window, gpoint Line 216  cb_menu_redraw(GtkWidget *window, gpoint
216  #endif  #endif
217    
218  static void  static void
219  cb_menu_style(GtkWidget *widget, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
220    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
221    
222    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
223  }  }
224    
225  static void  static void
226  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {
227    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
228    
229    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing...");
230    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
231    appdata->settings->no_icons =    appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
232    map_paint(appdata);    map_paint(appdata);
233    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing..."
234  }  }
235    
236  static void  static void
237  cb_menu_map_no_antialias(GtkWidget *widget, gpointer data) {  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {
238    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
239    
240    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing...");
241    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
242    appdata->settings->no_antialias =    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
243    map_paint(appdata);    map_paint(appdata);
244    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing..."
245  }  }
246    
247  static void  static void
248  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo(GtkMenuItem *item, gpointer data) {
249      appdata_t *appdata = (appdata_t*)data;
250    
251      undo(appdata);
252    
253      // the banner will be displayed from within undo with more details
254    }
255    
256    static void
257    cb_menu_save_changes(GtkMenuItem *item, gpointer data) {
258    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
259    
260    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
# Line 265  cb_menu_save_changes(GtkWidget *widget, Line 262  cb_menu_save_changes(GtkWidget *widget,
262  }  }
263    
264  static void  static void
265  cb_menu_undo_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo_changes(GtkMenuItem *item, gpointer data) {
266    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
267    
268    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
269                 _("Discard local changes?"),                 _("Discard local changes?"),
270                 _("Throw away all the changes you've not uploaded yet? This can't be undone.")))                 _("Throw away all the changes you've not "
271                     "uploaded yet? This can't be undone.")))
272      return;      return;
273    
274    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing..."));
# Line 285  cb_menu_undo_changes(GtkWidget *widget, Line 283  cb_menu_undo_changes(GtkWidget *widget,
283  }  }
284    
285  static void  static void
286  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {
287      relation_list((appdata_t*)data);
288    }
289    
290    static void
291    cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {
292    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
293    
294    if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))    if(gtk_check_menu_item_get_active(item))
295      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
296    else    else
297      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
298  }  }
299    
300  static void  static void
301  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
302    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
303    
304    map_set_zoom(appdata->map, appdata->map->state->zoom*ZOOM_FACTOR_MENU, TRUE);    map_set_zoom(appdata->map, appdata->map->state->zoom*ZOOM_FACTOR_MENU, TRUE);
# Line 303  cb_menu_zoomin(GtkWidget *widget, appdat Line 306  cb_menu_zoomin(GtkWidget *widget, appdat
306  }  }
307    
308  static void  static void
309  cb_menu_zoomout(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomout(GtkMenuItem *item, appdata_t *appdata) {
310    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
311    
312    map_set_zoom(appdata->map, appdata->map->state->zoom/ZOOM_FACTOR_MENU, TRUE);    map_set_zoom(appdata->map, appdata->map->state->zoom/ZOOM_FACTOR_MENU, TRUE);
# Line 311  cb_menu_zoomout(GtkWidget *widget, appda Line 314  cb_menu_zoomout(GtkWidget *widget, appda
314  }  }
315    
316  static void  static void
317  cb_menu_track_import(GtkWidget *window, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
318      g_assert(appdata->settings);
319    
320    /* open a file selector */    /* open a file selector */
321    GtkWidget *dialog;    GtkWidget *dialog;
# Line 328  cb_menu_track_import(GtkWidget *window, Line 332  cb_menu_track_import(GtkWidget *window,
332                          NULL);                          NULL);
333  #endif  #endif
334    
335    /* use path if one is present */    if(appdata->settings->track_path) {
336    if(appdata->track.import_path)      if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
337      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),        char *last_sep = strrchr(appdata->settings->track_path, '/');
338                                          appdata->track.import_path);        if(last_sep) {
339            *last_sep = 0;  // seperate path from file
340    
341            /* the user just created a new document */
342            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
343                                        appdata->settings->track_path);
344            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
345                                              last_sep+1);
346    
347            /* restore full filename */
348            *last_sep = '/';
349          }
350        } else
351          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
352                                        appdata->settings->track_path);
353      }
354    
355    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
356    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
357      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
358    
359      /* load a track */      /* load a track */
360      track_do(appdata, TRACK_IMPORT, filename);      appdata->track.track = track_import(appdata, filename);
361      if(appdata->track.track) {      if(appdata->track.track) {
362          if(appdata->settings->track_path) g_free(appdata->settings->track_path);
363        /* save path if gpx was successfully loaded */        appdata->settings->track_path = g_strdup(filename);
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r) {  
         *r = 0;  
         if(appdata->track.import_path) g_free(appdata->track.import_path);  
         appdata->track.import_path = g_strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
       }  
364      }      }
365      g_free (filename);      g_free (filename);
366    }    }
# Line 360  cb_menu_track_import(GtkWidget *window, Line 369  cb_menu_track_import(GtkWidget *window,
369  }  }
370    
371  static void  static void
372  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_enable_gps(GtkMenuItem *item, gpointer data) {
373    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
374    
375    if(gtk_check_menu_item_get_active(    if(gtk_check_menu_item_get_active(
376      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_gps))) {      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_enable_gps))) {
377      track_do(appdata, TRACK_GPS, NULL);      track_enable_gps(appdata, TRUE);
378    } else {    } else
379      track_do(appdata, TRACK_NONE, NULL);      track_enable_gps(appdata, FALSE);
   }  
380  }  }
381    
382    
383  static void  static void
384  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_follow_gps(GtkMenuItem *item, gpointer data) {
385    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
386    messagef(GTK_WIDGET(appdata->window), _("NIY"),  
387             _("Track export is not yet supported."));    if(gtk_check_menu_item_get_active(
388        GTK_CHECK_MENU_ITEM(appdata->track.menu_item_follow_gps))) {
389        appdata->settings->follow_gps = TRUE;
390      } else
391        appdata->settings->follow_gps = FALSE;
392    }
393    
394    
395    static void
396    cb_menu_track_export(GtkMenuItem *item, appdata_t *appdata) {
397      g_assert(appdata->settings);
398    
399      /* open a file selector */
400      GtkWidget *dialog;
401    
402    #ifdef USE_HILDON
403      dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(appdata->window),
404                                              GTK_FILE_CHOOSER_ACTION_SAVE);
405    #else
406      dialog = gtk_file_chooser_dialog_new(_("Export track file"),
407                                           GTK_WINDOW(appdata->window),
408                                           GTK_FILE_CHOOSER_ACTION_SAVE,
409                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
410                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
411                                           NULL);
412    #endif
413    
414      printf("set filename <%s>\n", appdata->settings->track_path);
415    
416      if(appdata->settings->track_path) {
417        if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
418          char *last_sep = strrchr(appdata->settings->track_path, '/');
419          if(last_sep) {
420            *last_sep = 0;  // seperate path from file
421    
422            /* the user just created a new document */
423            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
424                                                appdata->settings->track_path);
425            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
426                                              last_sep+1);
427    
428            /* restore full filename */
429            *last_sep = '/';
430          }
431        } else
432          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
433                                        appdata->settings->track_path);
434      }
435    
436      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_FM_OK) {
437        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
438        if(filename) {
439          printf("export to %s\n", filename);
440    
441          if(!g_file_test(filename, G_FILE_TEST_EXISTS) ||
442             yes_no_f(dialog, appdata, MISC_AGAIN_ID_EXPORT_OVERWRITE,
443                      MISC_AGAIN_FLAG_DONT_SAVE_NO,
444                      "Overwrite existing file",
445                      "The file already exists. "
446                      "Do you really want to replace it?")) {
447            if(appdata->settings->track_path)
448              g_free(appdata->settings->track_path);
449            appdata->settings->track_path = g_strdup(filename);
450    
451            track_export(appdata, filename);
452          }
453        }
454      }
455    
456      gtk_widget_destroy (dialog);
457  }  }
458    
459    
460  static void  static void
461  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
462    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
463    track_do(appdata, TRACK_NONE, NULL);    track_clear(appdata, appdata->track.track);
464      appdata->track.track = NULL;
465  }  }
466    
467    
# Line 424  menu_append_new_item(appdata_t *appdata, Line 504  menu_append_new_item(appdata_t *appdata,
504                       GtkWidget *menu_shell,                       GtkWidget *menu_shell,
505                       GtkSignalFunc activate_cb,                       GtkSignalFunc activate_cb,
506                       char *label,                       char *label,
507                       const gchar *stock_id, // overridden by label, accels                       const gchar *icon_name, // stock id or name for icon_load
508                                        // overridden by label, accels, icon_name
509                       const gchar *accel_path,                       const gchar *accel_path,
510                       guint accel_key,      // from gdk/gdkkeysyms.h                       guint accel_key,      // from gdk/gdkkeysyms.h
511                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
512                         gboolean enabled,
513                       gboolean is_check, gboolean check_status)                       gboolean is_check, gboolean check_status)
514  {  {
515    GtkWidget *item = NULL;    GtkWidget *item = NULL;
516    GtkStockItem stock_item;    GtkWidget *image = NULL;
517    
518    gboolean stock_item_known = FALSE;    gboolean stock_item_known = FALSE;
519    if (stock_id != NULL) {    GtkStockItem stock_item;
520      stock_item_known = gtk_stock_lookup(stock_id, &stock_item);    if (icon_name != NULL) {
521        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
522    }    }
523    
524    // Icons    // Icons
# Line 442  menu_append_new_item(appdata_t *appdata, Line 526  menu_append_new_item(appdata_t *appdata,
526    item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)    item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
527                    : gtk_menu_item_new_with_mnemonic       (label);                    : gtk_menu_item_new_with_mnemonic       (label);
528  #else  #else
529    if (is_check || !stock_item_known) {    if (is_check) {
530      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)      item = gtk_check_menu_item_new_with_mnemonic (label);
531                      : gtk_menu_item_new_with_mnemonic       (label);    }
532      else if (!stock_item_known) {
533        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
534        if (pbuf) {
535          image = gtk_image_new_from_pixbuf(pbuf);
536        }
537        if (image) {
538          item = gtk_image_menu_item_new_with_mnemonic(label);
539          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
540        }
541        else {
542          item = gtk_menu_item_new_with_mnemonic(label);
543        }
544    }    }
545    else {    else {
546      item = gtk_image_menu_item_new_with_mnemonic(label);      item = gtk_image_menu_item_new_with_mnemonic(label);
547      GtkWidget *stock_image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);      image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
548      gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), stock_image);      gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
549    }    }
550  #endif  #endif
551    
# Line 469  menu_append_new_item(appdata_t *appdata, Line 565  menu_append_new_item(appdata_t *appdata,
565  #endif  #endif
566    
567    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
568    if (is_check) {    gtk_widget_set_sensitive(GTK_WIDGET(item), enabled);
569      if (is_check)
570      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
571    }  
572    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
573                     appdata);                     appdata);
574    return item;    return item;
# Line 504  void menu_create(appdata_t *appdata) { Line 601  void menu_create(appdata_t *appdata) {
601    menu_append_new_item(    menu_append_new_item(
602      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),
603      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
604      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
605    );    );
606    
607    appdata->menu_item_project_close = menu_append_new_item(    appdata->menu_item_project_close = menu_append_new_item(
608      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),
609      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",
610      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
611    );    );
612    
613    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
614    
615  #ifndef UISPECIFIC_MENU_IS_MENU_BAR  #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
616    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
617  #endif  #endif
618    
# Line 528  void menu_create(appdata_t *appdata) { Line 625  void menu_create(appdata_t *appdata) {
625    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
626      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
627      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
628      0, 0, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
629    );    );
630    
631    menu_append_new_item(    menu_append_new_item(
632      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
633      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
634      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE      GDK_comma, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
635    );    );
636    
637    menu_append_new_item(    menu_append_new_item(
638      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
639      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
640      GDK_period, GDK_CONTROL_MASK, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
641    );    );
642    
643    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
# Line 553  void menu_create(appdata_t *appdata) { Line 650  void menu_create(appdata_t *appdata) {
650    
651    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_osm_upload = menu_append_new_item(
652      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),
653      NULL, "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/OSM/Upload",
654      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
655    );    );
656    
657    menu_append_new_item(    menu_append_new_item(
658      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),
659      NULL, "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/OSM/Download",
660      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
661    );    );
662    
663    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
664    
665      if(getenv("OSM2GO_UNDO_TEST")) {
666        appdata->menu_item_osm_undo = menu_append_new_item(
667                   appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
668                   GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",
669                   GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
670                   );
671      } else
672        printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
673    
674    appdata->menu_item_osm_diff = menu_append_new_item(    appdata->menu_item_osm_save_changes = menu_append_new_item(
675      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
676      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",
677      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
678    );    );
679    
680    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_osm_undo_changes = menu_append_new_item(
681      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),
682      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
683      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
684      );
685    
686      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
687      appdata->menu_item_osm_relations = menu_append_new_item(
688        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),
689        NULL, "<OSM2Go-Main>/OSM/Relations",
690        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
691    );    );
692    
693    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
# Line 589  void menu_create(appdata_t *appdata) { Line 701  void menu_create(appdata_t *appdata) {
701    menu_append_new_item(    menu_append_new_item(
702      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),
703      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
704      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
705    );    );
706    
707    appdata->menu_item_wms_clear = menu_append_new_item(    appdata->menu_item_wms_clear = menu_append_new_item(
708      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
709      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
710      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
711    );    );
712    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
713    
714    appdata->menu_item_wms_adjust = menu_append_new_item(    appdata->menu_item_wms_adjust = menu_append_new_item(
715      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
716      NULL, "<OSM2Go-Main>/WMS/Adjust",      NULL, "<OSM2Go-Main>/WMS/Adjust",
717      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
718    );    );
719    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
720    
# Line 617  void menu_create(appdata_t *appdata) { Line 729  void menu_create(appdata_t *appdata) {
729    appdata->menu_item_map_hide_sel = menu_append_new_item(    appdata->menu_item_map_hide_sel = menu_append_new_item(
730      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
731      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",      GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",
732      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
733    );    );
734    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
735    
736    appdata->menu_item_map_show_all = menu_append_new_item(    appdata->menu_item_map_show_all = menu_append_new_item(
737      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
738      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",      GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",
739      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
740    );    );
741    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
742    
# Line 633  void menu_create(appdata_t *appdata) { Line 745  void menu_create(appdata_t *appdata) {
745    menu_append_new_item(    menu_append_new_item(
746      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),
747      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
748      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
749    );    );
750    
751    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
# Line 642  void menu_create(appdata_t *appdata) { Line 754  void menu_create(appdata_t *appdata) {
754    menu_append_new_item(    menu_append_new_item(
755      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),
756      NULL, "<OSM2Go-Main>/Map/Redraw",      NULL, "<OSM2Go-Main>/Map/Redraw",
757      GDK_r, GDK_CONTROL_MASK, FALSE, FALSE      GDK_r, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
758    );    );
759    
760    appdata->menu_item_map_no_icons = menu_append_new_item(    appdata->menu_item_map_no_icons = menu_append_new_item(
761      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
762      NULL, "<OSM2Go-Main>/Map/NoIcons",      NULL, "<OSM2Go-Main>/Map/NoIcons",
763      0, 0, TRUE, appdata->settings->no_icons      0, 0, TRUE, TRUE, appdata->settings->no_icons
764    );    );
765    
766    appdata->menu_item_map_no_antialias = menu_append_new_item(    appdata->menu_item_map_no_antialias = menu_append_new_item(
767      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),
768      _("No _antialias"),      _("No _antialias"),
769      NULL, "<OSM2Go-Main>/Map/NoAntialias",      NULL, "<OSM2Go-Main>/Map/NoAntialias",
770      0, 0, TRUE, appdata->settings->no_antialias      0, 0, TRUE, TRUE, appdata->settings->no_antialias
771    );    );
772    
773    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
# Line 669  void menu_create(appdata_t *appdata) { Line 781  void menu_create(appdata_t *appdata) {
781    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_import = menu_append_new_item(
782      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),
783      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
784      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
785    );    );
786    
787    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_export = menu_append_new_item(
788      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),
789      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
790      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
791    );    );
792    
793    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_clear = menu_append_new_item(
794      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
795      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
796      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
797    );    );
798    
799    
800    appdata->track.menu_item_gps = menu_append_new_item(    appdata->track.menu_item_enable_gps = menu_append_new_item(
801      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
802      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
803      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
804        appdata->settings->enable_gps
805      );
806    
807      appdata->track.menu_item_follow_gps = menu_append_new_item(
808        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
809        NULL, "<OSM2Go-Main>/Track/Follow",
810        0, 0, appdata->settings->enable_gps, TRUE,
811        appdata->settings->follow_gps
812    );    );
813    
814    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
# Line 699  void menu_create(appdata_t *appdata) { Line 819  void menu_create(appdata_t *appdata) {
819    menu_append_new_item(    menu_append_new_item(
820      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),
821      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
822      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
823    );    );
824    
825    menu_append_new_item(    menu_append_new_item(
826      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
827      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
828      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
829    );    );
830    
831    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
# Line 803  void cleanup(appdata_t *appdata) { Line 923  void cleanup(appdata_t *appdata) {
923    
924    project_free(appdata->project);    project_free(appdata->project);
925    
926    undo_free(appdata->undo_state);    if(appdata->menu_item_osm_undo)
927        undo_free(appdata->undo.state);
928    
929    puts("everything is gone");    puts("everything is gone");
930  }  }
# Line 869  int main(int argc, char *argv[]) { Line 990  int main(int argc, char *argv[]) {
990    
991    g_thread_init(NULL);    g_thread_init(NULL);
992    
   gps_init(&appdata);  
   
993    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
994    
995      gps_init(&appdata);
996    
997  #ifdef USE_HILDON  #ifdef USE_HILDON
998    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
999    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 963  int main(int argc, char *argv[]) { Line 1084  int main(int argc, char *argv[]) {
1084    
1085    main_ui_enable(&appdata);    main_ui_enable(&appdata);
1086    
1087      /* start GPS if enabled by config */
1088      if(appdata.settings && appdata.settings->enable_gps)
1089        track_enable_gps(&appdata, TRUE);
1090    
1091    /* ------------ jump into main loop ---------------- */    /* ------------ jump into main loop ---------------- */
1092    
1093    gtk_main();    gtk_main();
# Line 970  int main(int argc, char *argv[]) { Line 1095  int main(int argc, char *argv[]) {
1095    puts("gtk_main() left");    puts("gtk_main() left");
1096    
1097    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1098      track_clear(&appdata, appdata.track.track);
1099      appdata.track.track = NULL;
1100    
1101    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1102    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
Legend:
Removed from v.55  
changed lines
  Added in v.158