Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 10711) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 10712) @@ -59,7 +59,7 @@ static void draw_lead_user(render_priv_t *priv_); -static const gchar *get_color_name(GdkColor * color) +static const gchar *get_color_name(pcb_gtk_color_t * color) { static char tmp[16]; Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 10711) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 10712) @@ -71,7 +71,7 @@ static void draw_lead_user(render_priv_t * priv); -static const gchar *get_color_name(GdkColor * color) +static const gchar *get_color_name(pcb_gtk_color_t * color) { static char tmp[16]; Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 10711) +++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 10712) @@ -98,11 +98,6 @@ static void draw_lead_user(render_priv_t * priv_); -#warning TODO: replace GdkRGBA with pcb_gtk_color_t to avoid incompatible pointer type -/*../src_plugins/hid_gtk3_cairo/gtkhid-cairo.c:1541:26: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] - common->get_color_name = get_color_name; -*/ - /** Duplicates the source fields to destination. */ static void copy_color(GdkRGBA * dest, GdkRGBA * source) { @@ -112,7 +107,7 @@ dest->alpha = source->alpha; } -static const gchar *get_color_name(GdkRGBA * color) +static const gchar *get_color_name(pcb_gtk_color_t * color) { static char tmp[16]; @@ -1594,7 +1589,6 @@ common->draw_grid_local = ghid_cairo_draw_grid_local; common->drawing_area_configure_hook = ghid_cairo_drawing_area_configure_hook; common->shutdown_renderer = ghid_cairo_shutdown_renderer; -#warning TODO: change common API to use compatibility layer : pcb_gtk_color_t common->get_color_name = get_color_name; common->map_color_string = map_color_string; } Index: trunk/src_plugins/lib_gtk_common/glue.h =================================================================== --- trunk/src_plugins/lib_gtk_common/glue.h (revision 10711) +++ trunk/src_plugins/lib_gtk_common/glue.h (revision 10712) @@ -59,7 +59,7 @@ void (*main_destroy)(void *gport); /* only for config: */ - const gchar *(*get_color_name)(GdkColor * color); + const gchar *(*get_color_name)(pcb_gtk_color_t * color); pcb_bool (*map_color_string)(const char *color_string, GdkColor * color); void (*set_special_colors)(conf_native_t *cfg); void (*layer_buttons_update)(void);