Diff of /trunk/src/main.c

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

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