--- trunk/src/main.c 2009/09/23 11:23:45 123 +++ trunk/src/main.c 2009/09/28 19:01:03 126 @@ -35,7 +35,7 @@ extern char *strcasestr (__const char *__haystack, __const char *__needle); -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT) static void crumb_add(appdata_t *appdata, char *name, int level, gpointer user_data); @@ -226,7 +226,7 @@ if(gtk_tree_model_get_iter(model, &iter, path)) { cache_t *cache; gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1); -#ifndef USE_BREAD_CRUMB_TRAIL +#if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT) cache_dialog(appdata, cache); #else gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view); @@ -838,7 +838,7 @@ gpx_busy_dialog_destroy(dialog); } -#ifndef USE_BREAD_CRUMB_TRAIL +#if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT) #ifdef USE_STACKABLE_WINDOW if(!appdata->cur_gpx) #endif @@ -1461,7 +1461,7 @@ printf("Search for %s (flags = %x)...\n", p, appdata->search); -#ifndef USE_BREAD_CRUMB_TRAIL +#if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT) gpx_t *found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE); @@ -1789,7 +1789,7 @@ GtkWidget *menu, *item; menu = gtk_menu_new(); -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT) appdata->menu_import = #endif item = gtk_menu_item_new_with_label(_("Import")); @@ -1819,7 +1819,7 @@ g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata); #endif -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT) appdata->menu_export = #endif item = gtk_menu_item_new_with_label(_("Export")); @@ -1844,7 +1844,7 @@ g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata); -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT) appdata->menu_search = #endif item = gtk_menu_item_new_with_label( _("Search") ); @@ -2051,7 +2051,7 @@ return handled; } -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT) typedef struct { int level; appdata_t *appdata; @@ -2183,8 +2183,12 @@ #endif } +#ifdef USE_BREAD_CRUMB_TRAIL hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct), name, crumb, (GDestroyNotify)crumb_back); +#else +#warning replacement missing +#endif } #endif // USE_BREAD_CRUMB_TRAIL @@ -2347,6 +2351,13 @@ hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct)); crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL); +#else +#ifdef MY_BCT + /* on non-hildon machines we use some custom made breadcrumbtrail */ + /* replacement */ + appdata.bct = my_bct_new(); + gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0); +#endif #endif /* wait for main gui to appear */