diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-09-15 19:26:40 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-09-15 19:26:40 +0000 |
| commit | d0f046b0aff8b4404c852990886f9afeca6d5c0f (patch) | |
| tree | 9f03e5af0f2126a7d9cd7a7d11d61b5b99e16a3a /src/widgets/stroke-marker-selector.cpp | |
| parent | Fix document unit change for disconnected connectors. (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.tar.gz inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.zip | |
Merge from trunk.
(bzr r12475.1.20)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 2d1c932d3..00b6b5c91 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -544,16 +544,16 @@ MarkerComboBox::create_marker_image(unsigned psize, gchar const *mname, gchar *cache_name = g_strconcat(combo_id, mname, NULL); Glib::ustring key = svg_preview_cache.cache_key(source->getURI(), cache_name, psize); g_free (cache_name); - Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::wrap(svg_preview_cache.get_preview_from_cache(key)); + GdkPixbuf *pixbuf = svg_preview_cache.get_preview_from_cache(key); // no ref created if (!pixbuf) { - pixbuf = Glib::wrap(render_pixbuf(drawing, 0.8, *dbox, psize)); - svg_preview_cache.set_preview_in_cache(key, pixbuf->gobj()); + pixbuf = render_pixbuf(drawing, 0.8, *dbox, psize); + svg_preview_cache.set_preview_in_cache(key, pixbuf); + g_object_unref(pixbuf); // reference is held by svg_preview_cache } // Create widget - Gtk::Image *pb = new Gtk::Image(pixbuf); - + Gtk::Image *pb = Glib::wrap(GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf))); return pb; } |