Trunk merge

(bzr r11073.1.15)

1 files changed, 18 insertions, 13 deletions

diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index a39ebf8be..9b2c3bb42 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -177,14 +177,21 @@ const gchar * MarkerComboBox::get_active_marker_uri()
 
     gchar const *marker = "";
     if (strcmp(markid, "none")) {
-       bool stockid = get_active()->get_value(marker_columns.isstock);
-
-       gchar *markurn = g_strdup(markid);
-       if (stockid) markurn = g_strconcat("urn:inkscape:marker:",markid,NULL);
-       SPObject *mark = get_stock_item(markurn);
-       g_free(markurn);
-       if (mark) {
-           Inkscape::XML::Node *repr = mark->getRepr();
+        bool stockid = get_active()->get_value(marker_columns.isstock);
+
+        gchar *markurn;
+        if (stockid)
+        {
+            markurn = g_strconcat("urn:inkscape:marker:",markid,NULL);
+        }
+        else
+        {
+            markurn = g_strdup(markid);
+        }
+        SPObject *mark = get_stock_item(markurn);
+        g_free(markurn);
+        if (mark) {
+            Inkscape::XML::Node *repr = mark->getRepr();
             marker = g_strconcat("url(#", repr->attribute("id"), ")", NULL);
         }
     } else {
@@ -211,7 +218,7 @@ void MarkerComboBox::set_selected(const gchar *name) {
         iter != marker_store->children().end(); ++iter) {
             Gtk::TreeModel::Row row = (*iter);
             if (row[marker_columns.marker] &&
-            		!strcmp(row[marker_columns.marker], name)) {
+                    !strcmp(row[marker_columns.marker], name)) {
                 set_active(iter);
                 if (strcmp(name, "none"))
                     set_history(row);
@@ -373,15 +380,13 @@ MarkerComboBox::create_marker_image(unsigned psize, gchar const *mname,
     }
 
     /* Update to renderable state */
-    double sf = 0.8;
-
     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));
 
     if (!pixbuf) {
-        pixbuf = Glib::wrap(render_pixbuf(drawing, sf, *dbox, psize));
+        pixbuf = Glib::wrap(render_pixbuf(drawing, 0.8, *dbox, psize));
         svg_preview_cache.set_preview_in_cache(key, pixbuf->gobj());
     }
 
@@ -405,7 +410,7 @@ void MarkerComboBox::prepareImageRenderer( Gtk::TreeModel::const_iterator const
         image_renderer.property_pixbuf() = empty_image->get_pixbuf();
 }
 
-gboolean MarkerComboBox::separator_cb (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) {
+gboolean MarkerComboBox::separator_cb (GtkTreeModel *model, GtkTreeIter *iter, gpointer /*data*/) {
 
     gboolean sep = FALSE;
     gtk_tree_model_get(model, iter, 5, &sep, -1);