Fresco/Berlin/modules/Desktop DesktopKitImpl.cc,1.51,1.52 DesktopKitImpl.hh,1.22,1.23

Update of /cvs/fresco/Fresco/Berlin/modules/Desktop
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Desktop

Modified Files:
	DesktopKitImpl.cc DesktopKitImpl.hh 
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92

Index: DesktopKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Desktop/DesktopKitImpl.cc,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- DesktopKitImpl.cc	25 Jan 2003 12:43:47 -0000	1.51
+++ DesktopKitImpl.cc	18 Feb 2003 07:26:25 -0000	1.52
@@ -43,8 +43,9 @@
 using namespace Berlin::DesktopKit;
 
 DesktopKitImpl::DesktopKitImpl(const std::string &id,
-			       const Fresco::Kit::PropertySeq &p)
-  : KitImpl(id, p) { }
+			       const Fresco::Kit::PropertySeq &p,
+			       ServerContextImpl *c)
+  : KitImpl(id, p, c) { }
 DesktopKitImpl::~DesktopKitImpl() { }
 
 void DesktopKitImpl::bind(ServerContext_ptr context)
@@ -345,5 +346,5 @@
 extern "C" KitImpl *load()
 {
   static std::string properties[] = {"implementation", "DesktopKitImpl"};
-  return create_kit<DesktopKitImpl> ("IDL:fresco.org/Fresco/DesktopKit:1.0", properties, 2);
+  return create_prototype<DesktopKitImpl> ("IDL:fresco.org/Fresco/DesktopKit:1.0", properties, 2);
 }

Index: DesktopKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Desktop/DesktopKitImpl.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- DesktopKitImpl.hh	5 Jan 2003 16:21:29 -0000	1.22
+++ DesktopKitImpl.hh	18 Feb 2003 07:26:25 -0000	1.23
@@ -35,8 +35,10 @@
 #include <Berlin/KitImpl.hh>
 #include <Berlin/RefCountVar.hh>
 
-namespace Berlin {
-namespace DesktopKit {
+namespace Berlin 
+{
+namespace DesktopKit 
+{
 
 class WindowImpl;
 class DesktopImpl;
@@ -44,10 +46,13 @@
 class DesktopKitImpl : public virtual POA_Fresco::DesktopKit,
 		       public KitImpl
 {
- public:
-  DesktopKitImpl(const std::string &, const Fresco::Kit::PropertySeq &);
+public:
+  DesktopKitImpl(const std::string &,
+		 const Fresco::Kit::PropertySeq &,
+		 ServerContextImpl *);
   virtual ~DesktopKitImpl();
-  virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p) { return new DesktopKitImpl(repo_id(), p);}
+  virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+  { return new DesktopKitImpl(repo_id(), p, c);}
   virtual void bind(Fresco::ServerContext_ptr);
   virtual Fresco::Desktop_ptr desk();
   virtual Fresco::Window_ptr shell(Fresco::Controller_ptr, Fresco::ClientContext_ptr);