summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2009-07-16 14:55:16 +0000
committercilix42 <cilix42@users.sourceforge.net>2009-07-16 14:55:16 +0000
commit49a274f32919fa63e96bb66e76b691afafda66ff (patch)
tree6ef36db56a95d6fc012151d3674c77fac89a0bb9 /src/ui
parentKhmer translation updated (diff)
downloadinkscape-49a274f32919fa63e96bb66e76b691afafda66ff.tar.gz
inkscape-49a274f32919fa63e96bb66e76b691afafda66ff.zip
Implement guide behaviour as discussed on the mailing list
(bzr r8293)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/guides.cpp2
-rw-r--r--src/ui/widget/selected-style.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index c5d2ae488..3a7964ba2 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -241,7 +241,7 @@ void GuidelinePropertiesDialog::_setup() {
g_free(label);
}
{
- gchar *guide_description = sp_guide_description(_guide);
+ gchar *guide_description = sp_guide_description(_guide, false);
gchar *label = g_strdup_printf(_("Current: %s"), guide_description);
g_free(guide_description);
_label_descr.set_markup(label);
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 9a5364874..e7b0188d8 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1252,6 +1252,7 @@ RotateableSwatch::do_motion(double by, guint modifier) {
g_object_unref (bitmap);
g_object_unref (mask);
gdk_window_set_cursor(w->window, cr);
+ gdk_cursor_unref(cr);
cr_set = true;
}
}