Diff of /trunk/src/main.c

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

revision 11 by harbaum, Fri Jun 26 12:24:24 2009 UTC revision 12 by harbaum, Fri Jun 26 20:07:33 2009 UTC
# Line 811  static void gpxlist_view_onRowActivated( Line 811  static void gpxlist_view_onRowActivated(
811          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
812        }        }
813  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
814    #ifdef USE_STACKABLE_WINDOW
815        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
816    #endif
817          cachelist_dialog(appdata, gpx);          cachelist_dialog(appdata, gpx);
818    #ifdef USE_STACKABLE_WINDOW
819        else        else
820          printf("selected gpx, but cachelist window already present\n");          printf("selected gpx, but cachelist window already present\n");
821    #endif
822  #else  #else
823        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
824        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 1382  cb_menu_search(GtkWidget *window, gpoint Line 1386  cb_menu_search(GtkWidget *window, gpoint
1386        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1387    
1388  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1389        appdata->search_results =        gpx_t *found =
1390          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1391    
1392        /* do search result dialog here ... */        /* do search result dialog here ... */
1393        cachelist_dialog(appdata, appdata->search_results);        cachelist_dialog(appdata, found);
1394  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1395        search_result_free(appdata->search_results);        search_result_free(found);
1396        appdata->search_results = NULL;  #else
1397          appdata->search_results = found;
1398  #endif  #endif
1399  #else  #else
1400        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1656  HildonAppMenu *menu_create(appdata_t *ap Line 1661  HildonAppMenu *menu_create(appdata_t *ap
1661                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1662    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1663    
1664    gtk_widget_show(GTK_WIDGET(menu));    //  gtk_widget_show(GTK_WIDGET(menu));
1665    
1666    return menu;    return menu;
1667  }  }
# Line 2184  int main(int argc, char *argv[]) { Line 2189  int main(int argc, char *argv[]) {
2189    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2190  #endif  #endif
2191    
2192    #if MAEMO_VERSION_MAJOR == 5
2193    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2194    #endif
2195    
2196    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2197                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2198    
Legend:
Removed from v.11  
changed lines
  Added in v.12