fixed Issue 282

[chaz/tint2] / src / taskbar / task.c

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index d4fa72f5d854a4ab6480fdda149715a9e85a3661..a096af30d7332b43b7069c8f4a777f97b20f2bf5 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -221,7 +221,7 @@ void get_icon (Task *tsk)
        }
 
        data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
-       if (data) {
+       if (data && i) {
                // get ARGB icon
                int w, h;
                long *tmp_data;
@@ -352,20 +352,18 @@ void draw_task (void *obj, cairo_t *c)
 
                /* Drawing width and Cut text */
                // pango use U+22EF or U+2026
-               pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
                pango_layout_set_width(layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE);
                pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE);
                pango_layout_set_wrap(layout, PANGO_WRAP_CHAR);
+               pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
                /* Center text */
                if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
                else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
 
                pango_layout_get_pixel_size (layout, &width, &height);
-               //printf("nombre de lignes  %d, w %d, h %d, text_height %d\n", pango_layout_get_line_count(layout), width, height, (int)panel->g_task.text_height);
 
                config_text = &panel->g_task.font[tsk->current_state];
-
                cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
 
                pango_cairo_update_layout (c, layout);