diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2012-05-09 03:41:15 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2012-05-09 03:41:15 +0000 |
| commit | 2a0daad09049106faf17bc253b38eaf88cfa3a87 (patch) | |
| tree | ad8f06f2a05491596c29f6cbf9f0c0d06013539e /src/widgets/eek-preview.cpp | |
| parent | Fix drawing of eek-preview in GTK+3 (diff) | |
| download | inkscape-2a0daad09049106faf17bc253b38eaf88cfa3a87.tar.gz inkscape-2a0daad09049106faf17bc253b38eaf88cfa3a87.zip | |
Unified variable names as scoping now makes the code safe.
(merge of local fix)
(bzr r11349)
Diffstat (limited to 'src/widgets/eek-preview.cpp')
| -rw-r--r-- | src/widgets/eek-preview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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 ) { |