__ses_xchg_cx()

diff --git a/ses_layout.c b/ses_layout.c
index c274cdb6548276b119b45ea199fd87922236ce99..e80bdec63666b2920e60d6cdb55dd153d08a7b1e 100644 (file)
--- a/ses_layout.c
+++ b/ses_layout.c
@@ -1132,7 +1132,7 @@ static void __ses_xchg_cx(ScfEfunction* f, int d)
                for (j = i + 1; j < f->n_components; j++) {
                        c1 =            f->components[j];
 
-                       if (c0->color != c1->color)
+                       if ((c0->color != c1->color) && (0 != c1->color || c0->color > 2))
                                continue;
 
                        int y2 = INT_MAX;
@@ -1455,7 +1455,7 @@ int ses_layout_draw(ScfEboard* b, uint32_t bx, uint32_t by, uint32_t bw, uint32_
                        for (k = 0; k < el->n_lines; k++) {
                                l  =        el->lines[k];
 
-                               snprintf(text, sizeof(text) - 1, "%ld,%ld", el->id, k);
+                               snprintf(text, sizeof(text) - 1, "%ld_%ld", el->id, k);
 
                                cairo_move_to  (cr, l->x0 - 30, l->y0 - 5);
                                cairo_show_text(cr, text);