diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2011-02-09 00:57:50 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:31 +0800 |
| commit | 8efc1bc6f91e06ca61b00eb8119c9c36697e43a6 (patch) | |
| tree | 95ec3e7ac41deec84bfd02de6ee05faf245b3dea /widgets/table/e-table-header-utils.c | |
| parent | be15d6730130da3f9e2fa6579233d5a9b304a7ea (diff) | |
| download | gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.gz gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.bz2 gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.lz gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.xz gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.zst gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.zip | |
Bug 641756 - Fix warnings from GCC 4.6
GCC learned how to find dead assignments.
Diffstat (limited to 'widgets/table/e-table-header-utils.c')
| -rw-r--r-- | widgets/table/e-table-header-utils.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 55e90159c6..2fe6a56089 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -327,16 +327,14 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol, /* Pixbuf or label */ if (ecol->icon_name != NULL) { gint pwidth, pheight; - gint clip_width, clip_height; + gint clip_height; gint xpos; - /* GdkPixmap *pixmap; */ g_return_if_fail (ecol->pixbuf != NULL); pwidth = gdk_pixbuf_get_width (ecol->pixbuf); pheight = gdk_pixbuf_get_height (ecol->pixbuf); - clip_width = MIN (pwidth, inner_width); clip_height = MIN (pheight, inner_height); xpos = inner_x; @@ -360,26 +358,6 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol, pango_cairo_show_layout (cr, layout); } - /* FIXME: For some reason, under clutter gdk_draw_rgb_image_dithalign crashes - * Debug that later */ -#if 0 - pixmap = make_composite_pixmap (drawable, gc, - ecol->pixbuf, &style->bg[state], - clip_width, clip_height, - xpos, - inner_y + (inner_height - clip_height) / 2); - - gdk_gc_set_clip_rectangle (gc, NULL); - - if (pixmap) { - gdk_draw_drawable (drawable, gc, pixmap, - 0, 0, - xpos, - inner_y + (inner_height - clip_height) / 2, - clip_width, clip_height); - g_object_unref (pixmap); - } -#endif gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf, xpos, inner_y + (inner_height - clip_height) / 2); cairo_paint (cr); |