Diff of /trunk/src/main.c

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

revision 238 by harbaum, Sat Dec 12 12:54:37 2009 UTC revision 243 by harbaum, Mon Dec 14 20:07:54 2009 UTC
# Line 1856  HildonAppMenu *menu_create(appdata_t *ap Line 1856  HildonAppMenu *menu_create(appdata_t *ap
1856      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1857    }    }
1858    
1859    if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {    /* if search results exist, don't allow another search */
1860      if(!appdata->search_results &&
1861         ((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST))) {
1862      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1863      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1864                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
# Line 2056  void menu_create(appdata_t *appdata) { Line 2058  void menu_create(appdata_t *appdata) {
2058    
2059  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2060    gconf_save_state(appdata);    gconf_save_state(appdata);
2061    
2062    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2063    
2064  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
# Line 2068  void cleanup(appdata_t *appdata) { Line 2070  void cleanup(appdata_t *appdata) {
2070    icons_free();    icons_free();
2071    gps_release(appdata);    gps_release(appdata);
2072    
 #ifdef USE_MAEMO  
2073    if(appdata->search_results) {    if(appdata->search_results) {
2074      printf("freeing pending search\n");      printf("freeing pending search\n");
2075      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
2076    }    }
2077    
2078    #ifdef USE_MAEMO
2079    if(appdata->osso_context)    if(appdata->osso_context)
2080      osso_deinitialize(appdata->osso_context);      osso_deinitialize(appdata->osso_context);
2081    
# Line 2254  crumb_back(gpointer data) { Line 2256  crumb_back(gpointer data) {
2256    
2257  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
2258                        gpointer user_data) {                        gpointer user_data) {
2259    crumb_t *crumb = malloc(sizeof(crumb_t));    crumb_t *crumb = g_new0(crumb_t, 1);
2260    crumb->level = level;    crumb->level = level;
2261    crumb->appdata = appdata;    crumb->appdata = appdata;
2262    crumb->data = user_data;    crumb->data = user_data;
Legend:
Removed from v.238  
changed lines
  Added in v.243