Diff of /trunk/src/main.c

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

revision 156 by harbaum, Tue Nov 3 13:15:35 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24    #include <curl/curl.h>
25    
26  #include <time.h>  #include <time.h>
27  #include <sys/time.h>  #include <sys/time.h>
28    
# Line 29  Line 33 
33    
34  #ifdef USE_MAEMO  #ifdef USE_MAEMO
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36    #if MAEMO_VERSION_MAJOR >= 5
37    #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39    #include <hildon/hildon-check-button.h>
40    #endif
41  #endif  #endif
42    
43  #include <locale.h>  #include <locale.h>
# Line 92  void errorf(const char *fmt, ...) { Line 101  void errorf(const char *fmt, ...) {
101      }      }
102    }    }
103    
104    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
105    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
106                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
107                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
108                             GTK_MESSAGE_ERROR,                             GTK_MESSAGE_ERROR,
 #else  
                            GTK_MESSAGE_OTHER,  
 #endif  
109                             GTK_BUTTONS_CLOSE, buf);                             GTK_BUTTONS_CLOSE, buf);
110    
111    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
112    #else
113      GtkWidget *dialog =
114        hildon_note_new_information(GTK_WINDOW(NULL), buf);
115    #endif
116    
117    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
118    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 147  gpx_t *choose_file(appdata_t *appdata, g Line 157  gpx_t *choose_file(appdata_t *appdata, g
157        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
158    
159        if(!whole_dir)        if(!whole_dir)
160          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
161        else {        else {
162          /* cur trailing '/' if present */          /* cur trailing '/' if present */
163          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
164            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
165    
166          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
167        }        }
168    
169        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
170    
171        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 213  void cachelist_goto_cache(appdata_t *app Line 223  void cachelist_goto_cache(appdata_t *app
223  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
224      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
225  #else  #else
226        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
227    
228      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
229      appdata->cur_view = cache_view(appdata, cache);      appdata->cur_view = cache_view(appdata, cache);
230      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
231      gtk_widget_show_all(appdata->vbox);      gtk_widget_show_all(appdata->vbox);
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
232  #endif  #endif
233  }  }
234    
# Line 466  static GtkWidget *cachelist_create(appda Line 476  static GtkWidget *cachelist_create(appda
476      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
477    
478      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
479      int type = (cache->type<<8) +      int type = cache->type<<8;
480        (cache->notes?4:0) +      if(cache->notes) type |= 4;
481        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
482        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
483        if(cache->found) type |= 2;
484        if(cache->mine) type |= 8;
485    
486      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
487    
# Line 585  void cachelist_dialog(appdata_t *appdata Line 597  void cachelist_dialog(appdata_t *appdata
597  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
598    
599  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
600      printf("cachelist destroy\n");
601    
602      HildonWindowStack *stack = hildon_window_stack_get_default();
603      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
604    
605    if(appdata->search_results) {    if(appdata->search_results) {
606      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
607      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 601  void on_cachelist_destroy(GtkWidget *wid Line 618  void on_cachelist_destroy(GtkWidget *wid
618    
619  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
620    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
621      appdata->window = HILDON_WINDOW(window);
622    
623    /* store last "cur_view" in window */    /* store last "cur_view" in window */
624    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
625    
# Line 657  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 675  static GdkPixbuf *gpx_icon_get(gpx_t *gp
675    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
676  }  }
677    
678  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
679    char date_str[32], cnum[32];    char date_str[32], cnum[32];
680    
681    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 682  static void gpxlist_set(GtkListStore *st Line 700  static void gpxlist_set(GtkListStore *st
700                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
701                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
702  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
703                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
704  #endif  #endif
705                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
706                       -1);                       -1);
# Line 774  static void gpxlist_view_onRowActivated( Line 792  static void gpxlist_view_onRowActivated(
792      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
793        printf("clicked delete\n");        printf("clicked delete\n");
794    
795    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
796        /* ask user what he wants */        /* ask user what he wants */
797        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
798                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
799                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
                  /* this doesn't fix the text selection issues ... */  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)  
                  GTK_MESSAGE_OTHER,  
 #else  
800                   GTK_MESSAGE_QUESTION,                   GTK_MESSAGE_QUESTION,
 #endif  
801                   GTK_BUTTONS_CANCEL,                   GTK_BUTTONS_CANCEL,
802                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
803                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
# Line 793  static void gpxlist_view_onRowActivated( Line 807  static void gpxlist_view_onRowActivated(
807                               _("Close"), 2,                               _("Close"), 2,
808                               NULL);                               NULL);
809    
810          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
811    #else
812    
813          GtkWidget *dialog =
814            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
815                                GTK_WINDOW(appdata->window),
816                                GTK_DIALOG_DESTROY_WITH_PARENT,
817                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
818                                _("Remove"), 1,
819                                _("Close"), 2,
820                                NULL);
821    
822          GtkWidget *content_area =
823            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
824    
825          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
826    
827          gtk_box_pack_start(GTK_BOX(hbox),
828             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
829                                       GTK_ICON_SIZE_DIALOG),
830                             FALSE, FALSE, 0);
831    
832          GtkWidget *label = gtk_label_new(
833                      _("Do you want to close this entry only or do "
834                        "you want to remove it completely from the list?"));
835    
836          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
837          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
838    
839          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
840          gtk_container_add (GTK_CONTAINER (content_area), hbox);
841    
842          gtk_widget_show_all (dialog);
843    #endif
844    
845        if(gpx->closed)        if(gpx->closed)
846          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
847    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));  
   
848        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
849        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
850    
# Line 827  static void gpxlist_view_onRowActivated( Line 874  static void gpxlist_view_onRowActivated(
874          gpx_t *new = NULL;          gpx_t *new = NULL;
875    
876          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
877            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
878          else          else
879            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
880    
881          if(new) {          if(new) {
882            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 871  static void gpxlist_view_onRowActivated( Line 918  static void gpxlist_view_onRowActivated(
918    }    }
919  }  }
920    
921    /* search gpx file in gpx list */
922    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
923      GtkTreeModel *model =
924        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
925    
926      gboolean found =
927        gtk_tree_model_get_iter_first(model, iter);
928    
929      while(found) {
930        gpx_t *this_gpx;
931        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
932    
933        if(gpx == this_gpx)
934          return TRUE;
935    
936        found = gtk_tree_model_iter_next(model, iter);
937      }
938    
939      return FALSE;
940    }
941    
942    
943  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
944  static gboolean  static gboolean
945  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 1045  static GtkWidget *gpxlist_create_view_an Line 1114  static GtkWidget *gpxlist_create_view_an
1114  }  }
1115    
1116  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1117  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1118    GtkTreeIter         iter;    GtkTreeIter         iter;
1119    
1120    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1055  static void gpxlist_add(appdata_t *appda Line 1124  static void gpxlist_add(appdata_t *appda
1124    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1125    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1126    *gpx = new;    *gpx = new;
1127    
1128      /* select new iter */
1129      GtkTreeSelection *selection =
1130        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1131      gtk_tree_selection_select_iter(selection, &iter);
1132      GtkTreePath *path =
1133        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1134      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1135                                   path, NULL, TRUE, 0.0, 0.0);
1136      gtk_tree_path_free(path);
1137  }  }
1138    
1139  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 1115  cb_menu_about(GtkWidget *window, gpointe Line 1194  cb_menu_about(GtkWidget *window, gpointe
1194    
1195    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1196    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1197                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1198    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1199    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1200                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1331  typedef struct { Line 1410  typedef struct {
1410    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1411  } search_context_t;  } search_context_t;
1412    
1413    
1414    static GtkWidget *check_button_new_with_label(char *label) {
1415    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1416      return gtk_check_button_new_with_label(label);
1417    #else
1418      GtkWidget *cbut =
1419        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1420      gtk_button_set_label(GTK_BUTTON(cbut), label);
1421      return cbut;
1422    #endif
1423    }
1424    
1425    static void check_button_set_active(GtkWidget *button, gboolean active) {
1426    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1427      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1428    #else
1429      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1430    #endif
1431    }
1432    
1433    static gboolean check_button_get_active(GtkWidget *button) {
1434    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1435      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1436    #else
1437      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1438    #endif
1439    }
1440    
1441  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1442    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1443    
1444    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1445    
1446    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1447    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1365  cb_menu_search(GtkWidget *window, gpoint Line 1471  cb_menu_search(GtkWidget *window, gpoint
1471    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1472    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1473    
1474    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1475    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_id),    check_button_set_active(context.in_id, appdata->search & SEARCH_ID);
                                appdata->search & SEARCH_ID);  
1476    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);
1477    
1478    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1479    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_name),    check_button_set_active(context.in_name, appdata->search & SEARCH_NAME);
                                appdata->search & SEARCH_NAME);  
1480    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);
1481    
1482    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1483    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_desc),    check_button_set_active(context.in_desc, appdata->search & SEARCH_DESC);
                                appdata->search & SEARCH_DESC);  
1484    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);
1485    
1486    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1487    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_owner),    check_button_set_active(context.in_owner, appdata->search & SEARCH_OWNER);
                                appdata->search & SEARCH_OWNER);  
1488    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);
1489    
1490    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
# Line 1391  cb_menu_search(GtkWidget *window, gpoint Line 1493  cb_menu_search(GtkWidget *window, gpoint
1493    
1494    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1495                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1496      context.entry = entry_new();
1497    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1498                                context.entry = gtk_entry_new());                                context.entry);
1499    
1500    if(appdata->search_str)    if(appdata->search_str)
1501      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1502    
# Line 1403  cb_menu_search(GtkWidget *window, gpoint Line 1507  cb_menu_search(GtkWidget *window, gpoint
1507    
1508    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1509    
1510    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1511    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_finds),    check_button_set_active(context.in_finds, appdata->search & SEARCH_FINDS);
                                appdata->search & SEARCH_FINDS);  
1512    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1513    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1514                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1445  cb_menu_search(GtkWidget *window, gpoint Line 1548  cb_menu_search(GtkWidget *window, gpoint
1548                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1549  #endif  #endif
1550    
1551      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1552        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1553      else      else
1554        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1555    
1556      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1557        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1558      else      else
1559        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1560    
1561      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1562        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1563      else      else
1564        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1565    
1566      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1567        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1568      else      else
1569        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1570    
1571      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1572        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1573      else      else
1574        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1610  cb_menu_precpos(GtkWidget *window, gpoin Line 1713  cb_menu_precpos(GtkWidget *window, gpoin
1713    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1714  }  }
1715    
1716    static void
1717    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1718      geotoad((appdata_t *)data);
1719    }
1720    
1721  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1722  typedef struct {  typedef struct {
1723    char *label, *desc;    char *label, *desc;
# Line 1724  static const menu_entry_t submenu_tools_ Line 1832  static const menu_entry_t submenu_tools_
1832      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1833    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1834      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1835      { "GeoToad",          "Use GeoToad online downloader",
1836        G_CALLBACK(cb_menu_geotoad) },
1837    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1838  };  };
1839    
# Line 1925  void menu_create(appdata_t *appdata) { Line 2035  void menu_create(appdata_t *appdata) {
2035    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2036                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2037    
2038      item = gtk_menu_item_new_with_label( _("GeoToad") );
2039      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2040      g_signal_connect(item, "activate",
2041                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2042    
2043    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2044    
2045  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1964  void menu_create(appdata_t *appdata) { Line 2079  void menu_create(appdata_t *appdata) {
2079  /********************* end of menu **********************/  /********************* end of menu **********************/
2080    
2081  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2082      gconf_save_state(appdata);
2083    
2084    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
   if(appdata->path) free(appdata->path);  
   if(appdata->image_path) free(appdata->image_path);  
   if(appdata->search_str) free(appdata->search_str);  
2085    
2086  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2087    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2005  void cleanup(appdata_t *appdata) { Line 2119  void cleanup(appdata_t *appdata) {
2119  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2120    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2121    
   gconf_save_state(appdata);  
2122    gtk_main_quit();    gtk_main_quit();
2123    appdata->window = NULL;    appdata->window = NULL;
2124  }  }
# Line 2296  int main(int argc, char *argv[]) { Line 2409  int main(int argc, char *argv[]) {
2409    
2410    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2411    
2412      misc_init();
2413    
2414      curl_global_init(CURL_GLOBAL_ALL);
2415    
2416  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2417    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2418    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
Legend:
Removed from v.156  
changed lines
  Added in v.226