aboutsummaryrefslogtreecommitdiffstats
path: root/libgnomecanvas/gnome-canvas-rich-text.c
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2011-02-09 00:57:50 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-02-09 00:57:50 +0800
commit2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec (patch)
treee311c2818c68f66126ee6879abd4a080b4b7ad6f /libgnomecanvas/gnome-canvas-rich-text.c
parenteef8eda70ed8f716eeaae7dd8d9c81640b0dd4f8 (diff)
downloadgsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar
gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.gz
gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.bz2
gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.lz
gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.xz
gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.zst
gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.zip
Bug 641756 - Fix warnings from GCC 4.6
GCC learned how to find dead assignments.
Diffstat (limited to 'libgnomecanvas/gnome-canvas-rich-text.c')
-rw-r--r--libgnomecanvas/gnome-canvas-rich-text.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c
index f836c12f1c..8c1e4142d9 100644
--- a/libgnomecanvas/gnome-canvas-rich-text.c
+++ b/libgnomecanvas/gnome-canvas-rich-text.c
@@ -2028,11 +2028,10 @@ gnome_canvas_rich_text_draw (GnomeCanvasItem *item,
gint height)
{
GnomeCanvasRichText *text = GNOME_CANVAS_RICH_TEXT (item);
- GtkStyle *style;
GtkWidget *widget;
cairo_matrix_t i2c;
gdouble ax, ay, ax2, ay2;
- gint x1, y1, x2, y2;
+ gint x1, x2;
gnome_canvas_item_i2c_matrix (item, &i2c);
@@ -2045,14 +2044,11 @@ gnome_canvas_rich_text_draw (GnomeCanvasItem *item,
cairo_matrix_transform_point (&i2c, &ax2, &ay2);
x1 = ax;
- y1 = ay;
x2 = ax2;
- y2 = ay2;
gtk_text_layout_set_screen_width (text->_priv->layout, x2 - x1);
widget = GTK_WIDGET (item->canvas);
- style = gtk_widget_get_style (widget);
/* FIXME: should last arg be NULL? */
gtk_text_layout_draw (text->_priv->layout, widget, cr, NULL);