From 2a0daad09049106faf17bc253b38eaf88cfa3a87 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 8 May 2012 20:41:15 -0700 Subject: Unified variable names as scoping now makes the code safe. (merge of local fix) (bzr r11349) --- src/widgets/eek-preview.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/widgets/eek-preview.cpp') diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index da094dd36..f6c0f99ce 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -263,9 +263,9 @@ static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr) cairo_paint(cr); if ( preview->_previewPixbuf ) { - GtkDrawingArea* da = &(preview->drawing); - GdkWindow* da_window = gtk_widget_get_window(GTK_WIDGET(da)); - cairo_t* cr2 = gdk_cairo_create(da_window); + GtkDrawingArea *da = &(preview->drawing); + GdkWindow *da_window = gtk_widget_get_window(GTK_WIDGET(da)); + cairo_t *cr = gdk_cairo_create(da_window); #if GTK_CHECK_VERSION(2,24,0) gint w = gdk_window_get_width(da_window); @@ -285,10 +285,10 @@ static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr) preview->_scaledH = h; } - GdkPixbuf* pix = (preview->_scaled) ? preview->_scaled : preview->_previewPixbuf; - gdk_cairo_set_source_pixbuf(cr2, pix, 0, 0); - cairo_paint(cr2); - cairo_destroy(cr2); + GdkPixbuf *pix = (preview->_scaled) ? preview->_scaled : preview->_previewPixbuf; + gdk_cairo_set_source_pixbuf(cr, pix, 0, 0); + cairo_paint(cr); + cairo_destroy(cr); } if ( preview->_linked ) { -- cgit v1.2.3