summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/text-tool.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-03-02 01:09:08 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-03-02 01:09:08 +0000
commitdc53920a347f1ac1157d863f91a18f206d134fd5 (patch)
treeff9765299345e61fc42590dc3f17c042895b438f /src/ui/tools/text-tool.cpp
parentupdate to trunk (diff)
parentAdded some consts. Turned functions to member functions. (diff)
downloadinkscape-dc53920a347f1ac1157d863f91a18f206d134fd5.tar.gz
inkscape-dc53920a347f1ac1157d863f91a18f206d134fd5.zip
Resolving conflicts, maybe broken
(bzr r11950.1.264)
Diffstat (limited to 'src/ui/tools/text-tool.cpp')
-rw-r--r--src/ui/tools/text-tool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 00f6a853c..4a171d1bd 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -602,7 +602,7 @@ bool TextTool::root_handler(GdkEvent* event) {
g_string_free(xs, FALSE);
g_string_free(ys, FALSE);
- } else if (!sp_event_context_knot_mouseover(this)) {
+ } else if (!this->sp_event_context_knot_mouseover()) {
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);