Changeset 652:4e269b078fa3 in qutecom-2.2

Timestamp:

Sep 9, 2010 12:31:42 AM (3 years ago)

Author:

laurent

Branch:

default

Message:

bug fix : hangup on exit if not previously logged

Files:

• libs/imwrapper/src/purple/PurpleIMFactory.cpp (modified) (2 diffs)
• qutecom/src/model/profile/UserProfileHandler.cpp (modified) (1 diff)

libs/imwrapper/src/purple/PurpleIMFactory.cpp

@@ -357 +357 @@
         // want to keep the loop running for the whole time the application is
         // running.
-        PurpleIMFactory::getFactory().terminatedEvent();
+        //PurpleIMFactory::getFactory().terminatedEvent();
 }
 
@@ -365 +365 @@
         }
 
-        g_idle_add(purple_wg_destroy_lib, this);
-
-        purpleStatusChangeWait(false);
+        if(purple_init)
+        {
+                g_idle_add(purple_wg_destroy_lib, this);
+                purpleStatusChangeWait(false);
+        }
+        
+        PurpleIMFactory::getFactory().terminatedEvent();
 }
 

qutecom/src/model/profile/UserProfileHandler.cpp

@@ -67 +67 @@
                 OWSAFE_DELETE(_currentUserProfile);
 
-                uninitExtLibraries();
-        }
+        }
+
+        uninitExtLibraries();
 }