Changeset 657:a9af3febe251 in qutecom-2.2 for qutecom/src/presentation/main.cpp

Timestamp:

Sep 10, 2010 1:51:30 PM (3 years ago)

Author:

laurent

Branch:

default

Message:

bug fix : FactoryHelper?

File:

• qutecom/src/presentation/main.cpp (modified) (2 diffs)

qutecom/src/presentation/main.cpp

@@ -113 +113 @@
                 _imFactory = new NullIMFactory();
 
+                SipWrapperFactory::setFactory(_sipFactory);
+                IMWrapperFactory::setFactory(_imFactory);
+
         #elif defined(PHAPIWRAPPER)
-                _sipFactory = new PhApiFactory();
-                _imFactory = new NullIMFactory();
+                PhApiFactory* phApiFactory = new PhApiFactory();
+                _sipFactory = phApiFactory;
+                
+                _imFactory = phApiFactory;
+                
+                SipWrapperFactory::setFactory(phApiFactory);
+                IMWrapperFactory::setFactory(_imFactory);
 
         #elif defined(MULTIIMWRAPPER)
@@ -122 +130 @@
                 _purpleIMFactory = new PurpleIMFactory();
                 _imFactory = new MultiIMFactory(*phApiFactory, *_purpleIMFactory);
+                
+                SipWrapperFactory::setFactory(phaApiFactory);
+                IMWrapperFactory::setFactory(_imFactory);
+        
 
         #else
                 _sipFactory = new NullSipFactory();
                 _imFactory = new NullIMFactory();
-        #endif
 
                 SipWrapperFactory::setFactory(_sipFactory);
                 IMWrapperFactory::setFactory(_imFactory);
+
+                
+        #endif
+
         }
 
         ~FactoryHelper() {
                 OWSAFE_DELETE(_sipFactory);
+#ifndef PHAPIWRAPPER
                 OWSAFE_DELETE(_imFactory);
-
+#endif
+                
         #ifdef MULTIIMWRAPPER
                 OWSAFE_DELETE(_purpleIMFactory);