Diff of /trunk/src/main.c

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

revision 164 by harbaum, Thu Nov 5 20:37:16 2009 UTC revision 233 by harbaum, Wed Dec 9 19:45:36 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>  #include <curl/curl.h>
# Line 33  Line 35 
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
37  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39  #endif  #endif
40  #endif  #endif
41    
# Line 153  gpx_t *choose_file(appdata_t *appdata, g Line 156  gpx_t *choose_file(appdata_t *appdata, g
156        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
157    
158        if(!whole_dir)        if(!whole_dir)
159          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
160        else {        else {
161          /* cur trailing '/' if present */          /* cur trailing '/' if present */
162          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
163            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
164    
165          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
166        }        }
167    
168        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
169    
170        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 219  void cachelist_goto_cache(appdata_t *app Line 222  void cachelist_goto_cache(appdata_t *app
222  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
223      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
224  #else  #else
225        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
226    
227      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
228      appdata->cur_view = cache_view(appdata, cache);      appdata->cur_view = cache_view(appdata, cache);
229      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
230      gtk_widget_show_all(appdata->vbox);      gtk_widget_show_all(appdata->vbox);
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
231  #endif  #endif
232  }  }
233    
# Line 472  static GtkWidget *cachelist_create(appda Line 475  static GtkWidget *cachelist_create(appda
475      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
476    
477      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
478      int type = (cache->type<<8) +      int type = cache->type<<8;
479        (cache->notes?4:0) +      if(cache->notes) type |= 4;
480        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
481        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
482        if(cache->found) type |= 2;
483        if(cache->mine) type |= 8;
484    
485      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
486    
# Line 591  void cachelist_dialog(appdata_t *appdata Line 596  void cachelist_dialog(appdata_t *appdata
596  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
597    
598  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
599      printf("cachelist destroy\n");
600    
601      HildonWindowStack *stack = hildon_window_stack_get_default();
602      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
603    
604    if(appdata->search_results) {    if(appdata->search_results) {
605      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
606      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 607  void on_cachelist_destroy(GtkWidget *wid Line 617  void on_cachelist_destroy(GtkWidget *wid
617    
618  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
619    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
620      appdata->window = HILDON_WINDOW(window);
621    
622    /* store last "cur_view" in window */    /* store last "cur_view" in window */
623    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
624    
625    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
626    char *title = g_strdup_printf("%s - GPXView", gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
   gtk_window_set_title(GTK_WINDOW(window), title);  
   g_free(title);  
627    
628    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
629    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 663  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 672  static GdkPixbuf *gpx_icon_get(gpx_t *gp
672    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
673  }  }
674    
675  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
676    char date_str[32], cnum[32];    char date_str[32], cnum[32];
677    
678    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 688  static void gpxlist_set(GtkListStore *st Line 697  static void gpxlist_set(GtkListStore *st
697                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
698                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
699  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
700                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
701  #endif  #endif
702                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
703                       -1);                       -1);
# Line 797  static void gpxlist_view_onRowActivated( Line 806  static void gpxlist_view_onRowActivated(
806    
807        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
808  #else  #else
809    
810        GtkWidget *dialog =        GtkWidget *dialog =
811          hildon_note_new_confirmation_add_buttons(GTK_WINDOW(appdata->window),          gtk_dialog_new_with_buttons(_("Close or remove entry?"),
812                                GTK_WINDOW(appdata->window),
813                                GTK_DIALOG_DESTROY_WITH_PARENT,
814                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
815                                _("Remove"), 1,
816                                _("Close"), 2,
817                                NULL);
818    
819          GtkWidget *content_area =
820            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
821    
822          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
823    
824          gtk_box_pack_start(GTK_BOX(hbox),
825             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
826                                       GTK_ICON_SIZE_DIALOG),
827                             FALSE, FALSE, 0);
828    
829          GtkWidget *label = gtk_label_new(
830                    _("Do you want to close this entry only or do "                    _("Do you want to close this entry only or do "
831                      "you want to remove it completely from the list?"),                      "you want to remove it completely from the list?"));
832                   GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,  
833                    _("Remove"), 1,        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
834                    _("Close"), 2,        gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
835                    NULL);  
836          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
837          gtk_container_add (GTK_CONTAINER (content_area), hbox);
838    
839          gtk_widget_show_all (dialog);
840  #endif  #endif
841    
842        if(gpx->closed)        if(gpx->closed)
# Line 839  static void gpxlist_view_onRowActivated( Line 871  static void gpxlist_view_onRowActivated(
871          gpx_t *new = NULL;          gpx_t *new = NULL;
872    
873          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
874            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
875          else          else
876            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
877    
878          if(new) {          if(new) {
879            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 883  static void gpxlist_view_onRowActivated( Line 915  static void gpxlist_view_onRowActivated(
915    }    }
916  }  }
917    
918    /* search gpx file in gpx list */
919    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
920      GtkTreeModel *model =
921        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
922    
923      gboolean found =
924        gtk_tree_model_get_iter_first(model, iter);
925    
926      while(found) {
927        gpx_t *this_gpx;
928        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
929    
930        if(gpx == this_gpx)
931          return TRUE;
932    
933        found = gtk_tree_model_iter_next(model, iter);
934      }
935    
936      return FALSE;
937    }
938    
939    
940  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
941  static gboolean  static gboolean
942  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 1057  static GtkWidget *gpxlist_create_view_an Line 1111  static GtkWidget *gpxlist_create_view_an
1111  }  }
1112    
1113  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1114  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1115    GtkTreeIter         iter;    GtkTreeIter         iter;
1116    
1117    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1067  static void gpxlist_add(appdata_t *appda Line 1121  static void gpxlist_add(appdata_t *appda
1121    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1122    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1123    *gpx = new;    *gpx = new;
1124    
1125      /* select new iter */
1126      GtkTreeSelection *selection =
1127        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1128      gtk_tree_selection_select_iter(selection, &iter);
1129      GtkTreePath *path =
1130        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1131      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1132                                   path, NULL, TRUE, 0.0, 0.0);
1133      gtk_tree_path_free(path);
1134  }  }
1135    
1136  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
1137    
1138  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1139    
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *dialog;  
 } about_context_t;  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
 void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {  
   gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);  
   browser_url(context->appdata,  
               "https://www.paypal.com/cgi-bin/webscr"  
               "?cmd=_s-xclick&hosted_button_id=7400558");  
 }  
 #endif  
   
1140  static void  static void
1141  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1142    about_context_t context;    about_box((appdata_t*)data);
   
   context.appdata = (appdata_t *)data;  
   
 #ifdef ENABLE_LIBLOCATION  
   char *uses = "uses liblocation";  
 #elif defined(ENABLE_GPSBT)  
   char *uses = "uses gpsbt and gpsd";  
 #else  
   char *uses = "uses gpsd";  
 #endif  
   
   const gchar *authors[] = {  
     "Till Harbaum <till@harbaum.org>",  
     "John Stowers <john.stowers@gmail.com>",  
     "GCVote: Guido Wegener <guido.wegener@gmx.de>",  
     NULL };  
   
   context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,  
                         "name", "GPXView",  
                         "version", VERSION,  
                         "copyright", _("Copyright 2008-2009"),  
                         "authors", authors,  
                         "website", _("http://www.harbaum.org/till/maemo"),  
                         "comments", _(uses),  
                         NULL);  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
   /* add a way to donate to the project */  
   GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);  
   
   GtkWidget *hbox = gtk_hbox_new(FALSE, 8);  
   gtk_box_pack_start(GTK_BOX(hbox),  
                      gtk_label_new(_("Do you like GPXView?")),  
                      FALSE, FALSE, 0);  
   
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        icon_get_widget(ICON_MISC, 8));  
   gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(on_paypal_button_clicked), &context);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), hbox);  
   gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),  
                               alignment);  
   
   gtk_widget_show_all(alignment);  
 #endif  
   
   gtk_dialog_run(GTK_DIALOG(context.dialog));  
   gtk_widget_destroy(context.dialog);  
1143  }  }
1144    
1145  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1343  typedef struct { Line 1341  typedef struct {
1341    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1342  } search_context_t;  } search_context_t;
1343    
1344    
1345  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1346    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1347    
1348    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1349    
1350    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1351    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1377  cb_menu_search(GtkWidget *window, gpoint Line 1375  cb_menu_search(GtkWidget *window, gpoint
1375    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1376    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1377    
1378    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1379    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);  
1380    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);
1381    
1382    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1383    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);  
1384    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);
1385    
1386    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1387    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);  
1388    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);
1389    
1390    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1391    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);  
1392    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);
1393    
1394    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 1403  cb_menu_search(GtkWidget *window, gpoint Line 1397  cb_menu_search(GtkWidget *window, gpoint
1397    
1398    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1399                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1400      context.entry = entry_new();
1401    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1402                                context.entry = gtk_entry_new());                                context.entry);
1403    
1404    if(appdata->search_str)    if(appdata->search_str)
1405      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1406    
# Line 1415  cb_menu_search(GtkWidget *window, gpoint Line 1411  cb_menu_search(GtkWidget *window, gpoint
1411    
1412    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1413    
1414    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1415    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);  
1416    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1417    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1418                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1457  cb_menu_search(GtkWidget *window, gpoint Line 1452  cb_menu_search(GtkWidget *window, gpoint
1452                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1453  #endif  #endif
1454    
1455      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1456        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1457      else      else
1458        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1459    
1460      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1461        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1462      else      else
1463        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1464    
1465      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1466        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1467      else      else
1468        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1469    
1470      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1471        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1472      else      else
1473        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1474    
1475      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1476        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1477      else      else
1478        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1622  cb_menu_precpos(GtkWidget *window, gpoin Line 1617  cb_menu_precpos(GtkWidget *window, gpoin
1617    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1618  }  }
1619    
1620    static void
1621    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1622      geotoad((appdata_t *)data);
1623    }
1624    
1625  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1626  typedef struct {  typedef struct {
1627    char *label, *desc;    char *label, *desc;
# Line 1736  static const menu_entry_t submenu_tools_ Line 1736  static const menu_entry_t submenu_tools_
1736      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1737    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1738      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1739      { "GeoToad",          "Use GeoToad online downloader",
1740        G_CALLBACK(cb_menu_geotoad) },
1741    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1742  };  };
1743    
# Line 1937  void menu_create(appdata_t *appdata) { Line 1939  void menu_create(appdata_t *appdata) {
1939    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1940                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
1941    
1942      item = gtk_menu_item_new_with_label( _("GeoToad") );
1943      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1944      g_signal_connect(item, "activate",
1945                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
1946    
1947    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1948    
1949  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1976  void menu_create(appdata_t *appdata) { Line 1983  void menu_create(appdata_t *appdata) {
1983  /********************* end of menu **********************/  /********************* end of menu **********************/
1984    
1985  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
1986      gconf_save_state(appdata);
1987    
1988    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);  
1989    
1990  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1991    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2017  void cleanup(appdata_t *appdata) { Line 2023  void cleanup(appdata_t *appdata) {
2023  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2024    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2025    
   gconf_save_state(appdata);  
2026    gtk_main_quit();    gtk_main_quit();
2027    appdata->window = NULL;    appdata->window = NULL;
2028  }  }
# Line 2308  int main(int argc, char *argv[]) { Line 2313  int main(int argc, char *argv[]) {
2313    
2314    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2315    
2316      misc_init();
2317    
2318    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2319    
2320  #ifdef USE_MAEMO  #ifdef USE_MAEMO
Legend:
Removed from v.164  
changed lines
  Added in v.233