From cdf669d01c5b35cad39a4c7a2bd16041c2216e1b Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Sun, 6 Oct 2013 13:24:36 -0400
Subject: Order of message setting for tools

Fixed bugs:
  - https://launchpad.net/bugs/1235792

(bzr r12664)
---
 src/tools-switch.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/tools-switch.cpp')

diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index a3c0f2daa..1c07f07cc 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -143,7 +143,9 @@ tools_active(SPDesktop *dt)
 void
 tools_switch(SPDesktop *dt, int num)
 {
+    dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, gettext( tool_msg[num] ) );
     if (dt) {
+        // This event may change the above message
         dt->_tool_changed.emit(num);
     }
 
@@ -152,7 +154,6 @@ tools_switch(SPDesktop *dt, int num)
     /* First 4 tools use guides, first is undefined but we don't care */
     dt->activate_guides(num < 5);
     inkscape_eventcontext_set(dt->getEventContext());
-    dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, gettext( tool_msg[num] ) );
 }
 
 void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p)
-- 
cgit v1.2.3


From 30422af227381c9aa900690586d25adec4fa262f Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Wed, 9 Oct 2013 21:09:49 +0200
Subject: Documentation/Translation. Fix for Bug #1236382 (Typos in comments
 and message, localization context needed) by Yuri Chornoivan.

Fixed bugs:
  - https://launchpad.net/bugs/1236382

(bzr r12673)
---
 src/tools-switch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/tools-switch.cpp')

diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index 1c07f07cc..5f54ad15a 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -88,7 +88,7 @@ static char const *const tool_names[] = {
 };
 static char const *const tool_msg[] = {
     NULL,
-    N_("<b>Click</b> to Select and Tranform objects, <b>Drag</b> to select many objects."),
+    N_("<b>Click</b> to Select and Transform objects, <b>Drag</b> to select many objects."),
     N_("Modify selected path points (nodes) directly."),
     N_("To tweak a path by pushing, select it and drag over it."),
     N_("<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected objects."),
-- 
cgit v1.2.3