From bdf703831ff93438d49324ab842052ccaf390a5d Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Sun, 26 Jun 2011 22:00:36 +0200 Subject: =?UTF-8?q?-=20Add=20a=20third=20group=20of=20snap=20sources/targe?= =?UTF-8?q?ts,=20called=20=C2=A8others=C2=A8=20(before=20we=20had=20only?= =?UTF-8?q?=20=C2=A8bounding=20box=C2=A8=20and=20nodes=20(see=20bug=20#788?= =?UTF-8?q?178)=20-=20Fix=20the=20display=20of=20the=20snap=20source=20-?= =?UTF-8?q?=20Fix=20snapping=20of=20guides=20to=20other=20guides=20&=20gri?= =?UTF-8?q?ds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (bzr r10372) --- src/text-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/text-context.cpp') diff --git a/src/text-context.cpp b/src/text-context.cpp index b709d4d24..3ef346ebe 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -675,7 +675,7 @@ sp_text_context_root_handler(SPEventContext *const event_context, GdkEvent *cons Geom::Point const motion_w(event->motion.x, event->motion.y); Geom::Point motion_dt(desktop->w2d(motion_w)); - m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE)); + m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE)); m.unSetup(); } break; -- cgit v1.2.3 From f7c10de0c22d6bc367d6791e98aa12065b797a56 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 3 Jul 2011 13:07:22 +0100 Subject: GTK+ cleanup: gtk_timeout_add (bzr r10412) --- src/text-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/text-context.cpp') diff --git a/src/text-context.cpp b/src/text-context.cpp index 3ef346ebe..89944a602 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -215,7 +215,7 @@ sp_text_context_setup(SPEventContext *ec) SP_CTRLRECT(tc->frame)->setColor(0x0000ff7f, false, 0); sp_canvas_item_hide(tc->frame); - tc->timeout = gtk_timeout_add(timeout, (GtkFunction) sp_text_context_timeout, ec); + tc->timeout = g_timeout_add(timeout, (GSourceFunc) sp_text_context_timeout, ec); tc->imc = gtk_im_multicontext_new(); if (tc->imc) { -- cgit v1.2.3 From 1e42fa6eb9150761c2f089a0650afcc96f21b992 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 3 Jul 2011 13:35:29 +0100 Subject: GTK+ cleanup: gtk_timeout_remove (bzr r10413) --- src/text-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/text-context.cpp') diff --git a/src/text-context.cpp b/src/text-context.cpp index 89944a602..a27ad3ee4 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -297,7 +297,7 @@ sp_text_context_finish(SPEventContext *ec) } if (tc->timeout) { - gtk_timeout_remove(tc->timeout); + g_source_remove(tc->timeout); tc->timeout = 0; } -- cgit v1.2.3