fix memory leak and some minor things

(bzr r11190)

3 files changed, 23 insertions, 18 deletions

diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index e5a3ab155..e239457fd 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -175,7 +175,6 @@ gboolean gr_vector_list(GtkWidget *combo_box, SPDesktop *desktop, bool selection
     gl = g_slist_reverse (gl);
 
     guint pos = 0;
-    guint idx = 0;
 
     if (!gl) {
         // The document has no gradients
@@ -205,6 +204,7 @@ gboolean gr_vector_list(GtkWidget *combo_box, SPDesktop *desktop, bool selection
             sensitive = FALSE;
         }
 
+        guint idx = 0;
         while (gl) {
             SPGradient *gradient = SP_GRADIENT (gl->data);
             gl = g_slist_remove (gl, gradient);
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 2739a47b0..d5e55661a 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -289,7 +289,6 @@ static void sp_gvs_rebuild_gui_full(SPGradientVectorSelector *gvs)
     gl = g_slist_reverse(gl);
 
     gint pos = 0;
-    gint idx = 0;
 
     if (!gvs->doc) {
         gtk_list_store_append (gvs->store, &iter);
@@ -307,6 +306,7 @@ static void sp_gvs_rebuild_gui_full(SPGradientVectorSelector *gvs)
         gtk_widget_set_sensitive (gvs->combo_box, FALSE);
 
     } else {
+        gint idx = 0;
         while (gl) {
             SPGradient *gr;
             gr = SP_GRADIENT(gl->data);
@@ -457,7 +457,7 @@ static gboolean blocked = FALSE;
 static void grad_edit_dia_stop_added_or_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, gpointer data)
 {
     GtkWidget *vb = GTK_WIDGET(data);
-    SPGradient *gradient = (SPGradient *)g_object_get_data(G_OBJECT(vb), "gradient");
+    SPGradient *gradient = static_cast<SPGradient *>(g_object_get_data(G_OBJECT(vb), "gradient"));
     update_stop_list(vb, gradient, NULL);
 }
 
@@ -996,14 +996,14 @@ static void sp_gradient_vector_widget_load_gradient(GtkWidget *widget, SPGradien
 
     SPGradient *old;
 
-    old = (SPGradient*)g_object_get_data(G_OBJECT(widget), "gradient");
+    old = static_cast<SPGradient*>(g_object_get_data(G_OBJECT(widget), "gradient"));
 
     if (old != gradient) {
         sigc::connection *release_connection;
         sigc::connection *modified_connection;
 
-        release_connection = (sigc::connection *)g_object_get_data(G_OBJECT(widget), "gradient_release_connection");
-        modified_connection = (sigc::connection *)g_object_get_data(G_OBJECT(widget), "gradient_modified_connection");
+        release_connection = static_cast<sigc::connection *>(g_object_get_data(G_OBJECT(widget), "gradient_release_connection"));
+        modified_connection = static_cast<sigc::connection *>(g_object_get_data(G_OBJECT(widget), "gradient_modified_connection"));
 
         if (old) {
             g_assert( release_connection != NULL );
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 427112f9b..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());
     }