Shift GTK+ compatibility definitions into vik_compat.h

[andy/viking.git] / src / garminsymbols.c

diff --git a/src/garminsymbols.c b/src/garminsymbols.c
index 28ee8238837e38036161cf0b323f459b156abc0a..4c7d3f1501616dc05540204bf90995553c01df4c 100644 (file)
--- a/src/garminsymbols.c
+++ b/src/garminsymbols.c
@@ -66,7 +66,7 @@ static struct {
   { "Skull and Crossbones",  "skull",          14,    "white skull and crossbones symbol", &wp_skull_pixbuf,           &wp_skull_large_pixbuf,          NULL },
   { "Green Square",          "square_grn",     15,    "green square symbol",               &wp_square_grn_pixbuf,      NULL,            NULL },
   { "Red Square",            "square_red",     16,    "red square symbol",                 &wp_square_red_pixbuf,      NULL,            NULL },
   { "Skull and Crossbones",  "skull",          14,    "white skull and crossbones symbol", &wp_skull_pixbuf,           &wp_skull_large_pixbuf,          NULL },
   { "Green Square",          "square_grn",     15,    "green square symbol",               &wp_square_grn_pixbuf,      NULL,            NULL },
   { "Red Square",            "square_red",     16,    "red square symbol",                 &wp_square_red_pixbuf,      NULL,            NULL },

-  { "White Buoy",            "wbuoy",          17,    "white buoy waypoint symbol",        &wp_wbuoy_pixbuf,           &wp_wbuoy_large_pixbuf,           NULL },
+  { "Buoy, White",           "wbuoy",          17,    "white buoy waypoint symbol",        &wp_wbuoy_pixbuf,           &wp_wbuoy_large_pixbuf,           NULL },

   { "Waypoint",              "wpt_dot",        18,    "waypoint dot",                      &wp_wpt_dot_pixbuf,         NULL,            NULL },
   { "Shipwreck",             "wreck",          19,    "white wreck symbol",                &wp_wreck_pixbuf,           &wp_wreck_large_pixbuf,           NULL },
   { "None",                  "null",           20,    "null symbol (transparent)",         &wp_null_pixbuf,            NULL,            NULL },
   { "Waypoint",              "wpt_dot",        18,    "waypoint dot",                      &wp_wpt_dot_pixbuf,         NULL,            NULL },
   { "Shipwreck",             "wreck",          19,    "white wreck symbol",                &wp_wreck_pixbuf,           &wp_wreck_large_pixbuf,           NULL },
   { "None",                  "null",           20,    "null symbol (transparent)",         &wp_null_pixbuf,            NULL,            NULL },


@@ -98,7 +98,7 @@ static struct {
   { "Parking Area",          "parking",        158,   "parking symbol",                    &wp_parking_pixbuf,         &wp_parking_large_pixbuf,         NULL },
   { "Park",                  "park",           159,   "park symbol",                       &wp_park_pixbuf,            &wp_park_large_pixbuf,            NULL },
   { "Picnic Area",           "picnic",         160,   "picnic symbol",                     &wp_picnic_pixbuf,          &wp_picnic_large_pixbuf,          NULL },
   { "Parking Area",          "parking",        158,   "parking symbol",                    &wp_parking_pixbuf,         &wp_parking_large_pixbuf,         NULL },
   { "Park",                  "park",           159,   "park symbol",                       &wp_park_pixbuf,            &wp_park_large_pixbuf,            NULL },
   { "Picnic Area",           "picnic",         160,   "picnic symbol",                     &wp_picnic_pixbuf,          &wp_picnic_large_pixbuf,          NULL },

-  { "Scenic",                "scenic",         161,   "scenic area symbol",                &wp_scenic_pixbuf,          &wp_scenic_large_pixbuf,          NULL },
+  { "Scenic Area",           "scenic",         161,   "scenic area symbol",                &wp_scenic_pixbuf,          &wp_scenic_large_pixbuf,          NULL },

   { "Skiing Area",           "skiing",         162,   "skiing symbol",                     &wp_skiing_pixbuf,          &wp_skiing_large_pixbuf,          NULL },
   { "Swimming Area",         "swimming",       163,   "swimming symbol",                   &wp_swimming_pixbuf,        &wp_swimming_large_pixbuf,        NULL },
   { "Dam",                   "dam",            164,   "dam symbol",                        &wp_dam_pixbuf,             &wp_dam_large_pixbuf,            NULL },
   { "Skiing Area",           "skiing",         162,   "skiing symbol",                     &wp_skiing_pixbuf,          &wp_skiing_large_pixbuf,          NULL },
   { "Swimming Area",         "swimming",       163,   "swimming symbol",                   &wp_swimming_pixbuf,        &wp_swimming_large_pixbuf,        NULL },
   { "Dam",                   "dam",            164,   "dam symbol",                        &wp_dam_pixbuf,             &wp_dam_large_pixbuf,            NULL },


@@ -114,7 +114,7 @@ static struct {
   { "Mine",                  "mine",           174,   "mine symbol",                       &wp_mine_pixbuf,            &wp_mine_large_pixbuf,            NULL },
   { "Trail Head",            "trail_head",     175,   "trail head symbol",                 NULL,                &wp_trail_head_large_pixbuf,            NULL },
   { "Truck Stop",            "truck_stop",     176,   "truck stop symbol",                 NULL,                &wp_truck_stop_large_pixbuf,            NULL },
   { "Mine",                  "mine",           174,   "mine symbol",                       &wp_mine_pixbuf,            &wp_mine_large_pixbuf,            NULL },
   { "Trail Head",            "trail_head",     175,   "trail head symbol",                 NULL,                &wp_trail_head_large_pixbuf,            NULL },
   { "Truck Stop",            "truck_stop",     176,   "truck stop symbol",                 NULL,                &wp_truck_stop_large_pixbuf,            NULL },

-  { "Exit",                  "user_exit",      177,   "user exit symbol",                  NULL,                NULL,            NULL },
+  { "Exit",                  "user_exit",      177,   "user exit symbol",                  NULL,                       &wp_exit_large_pixbuf,            NULL },

   { "Flag",                  "flag",           178,   "flag symbol",                       &wp_flag_pixbuf,            NULL,            NULL },
   { "Circle with X",         "circle_x",       179,   "circle with x in the center",       NULL,                NULL,            NULL },
   { "Open 24 Hours",          "open_24hr",      180,   "open 24 hours symbol",              NULL,                NULL,            NULL },
   { "Flag",                  "flag",           178,   "flag symbol",                       &wp_flag_pixbuf,            NULL,            NULL },
   { "Circle with X",         "circle_x",       179,   "circle with x in the center",       NULL,                NULL,            NULL },
   { "Open 24 Hours",          "open_24hr",      180,   "open 24 hours symbol",              NULL,                NULL,            NULL },


@@ -299,7 +299,7 @@ static struct {
   { "Intersection",           "int",            16385, "intersection symbol",               NULL,                NULL,            NULL },
   { "Non-directional beacon", "ndb",            16386, "non-directional beacon symbol",     NULL,                NULL,            NULL },
   { "VHF Omni-range",         "vor",            16387, "VHF omni-range symbol",             NULL,                NULL,            NULL },
   { "Intersection",           "int",            16385, "intersection symbol",               NULL,                NULL,            NULL },
   { "Non-directional beacon", "ndb",            16386, "non-directional beacon symbol",     NULL,                NULL,            NULL },
   { "VHF Omni-range",         "vor",            16387, "VHF omni-range symbol",             NULL,                NULL,            NULL },

-  { "Heliport",               "heliport",       16388, "heliport symbol",                   NULL,                NULL,            NULL },
+  { "Heliport",               "heliport",       16388, "heliport symbol",                   NULL,                       &wp_helipad_large_pixbuf,         NULL },

   { "Private Field",          "private",        16389, "private field symbol",              NULL,                NULL,            NULL },
   { "Soft Field",             "soft_fld",       16390, "soft field symbol",                 NULL,                NULL,            NULL },
   { "Tall Tower",             "tall_tower",     16391, "tall tower symbol",                 NULL,                &wp_tall_tower_large_pixbuf,           NULL },
   { "Private Field",          "private",        16389, "private field symbol",              NULL,                NULL,            NULL },
   { "Soft Field",             "soft_fld",       16390, "soft field symbol",                 NULL,                NULL,            NULL },
   { "Tall Tower",             "tall_tower",     16391, "tall tower symbol",                 NULL,                &wp_tall_tower_large_pixbuf,           NULL },


@@ -419,6 +419,8 @@ const gchar *a_get_hashed_sym ( const gchar *sym ) {
   }
   if (g_hash_table_lookup_extended(icons, sym, &x, &gp))
     return garmin_syms[GPOINTER_TO_INT(gp)].sym;
   }
   if (g_hash_table_lookup_extended(icons, sym, &x, &gp))
     return garmin_syms[GPOINTER_TO_INT(gp)].sym;

+  else if (g_hash_table_lookup_extended(old_icons, sym, &x, &gp))
+    return garmin_syms[GPOINTER_TO_INT(gp)].sym;

   else
     return NULL;
 }
   else
     return NULL;
 }