From efb53a0ecdb846804e5b96098df26d171f3474b0 Mon Sep 17 00:00:00 2001
From: mzn <mzn@opencascade.com>
Date: Wed, 11 Feb 2009 15:52:43 +0000
Subject: [PATCH] Patch provided for bug 0020152 (New tooltip functionality on
 GUI object browser induces a crash in YACS).

---
 src/SalomeApp/SalomeApp_DataObject.cxx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index 7f31277ae..72fd38592 100644
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -33,6 +33,7 @@
 #include <SUIT_ResourceMgr.h>
 
 #include <SALOME_LifeCycleCORBA.hxx>
+#include <Basics_Utils.hxx>
 
 #include <QObject>
 #include <QVariant>
@@ -263,8 +264,13 @@ QString SalomeApp_DataObject::toolTip( const int /*id*/ ) const
     SalomeApp_Application* app = 
       dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
     if ( app ) {
-      Engines::Component_var aComponent = 
-	app->lcc()->FindOrLoad_Component( "FactoryServer", componentDataType().toLatin1().constData() );
+      // --- try to find (and not load) the component instance, like GEOM instance,
+      //     registered in naming service under Containers/<hostname>/...
+      //     with any container name, on every machine available
+      Engines::MachineParameters params;
+      app->lcc()->preSet(params); // --- any container name, anywhere
+      Engines::Component_var aComponent =
+        app->lcc()->FindComponent(params, componentDataType().toLatin1().constData() );
       
       if ( !CORBA::is_nil(aComponent) && aComponent->hasObjectInfo() ) {
 	LightApp_RootObject* aRoot = dynamic_cast<LightApp_RootObject*>( root() );
-- 
2.39.2