Changeset 6093 for trunk/qt4-gui/src/core

Timestamp:

03/14/08 05:48:57 (9 months ago)

Author:

flynd

Message:

Simplified LicqGui::userInfoDlgFinished by supplying dialog pointer directly in signal. This also fixes strange crash in kde4-gui when opening user info for a contact a second time.

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (2 diffs)
• licqgui.h (modified) (1 diff)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -823 +823 @@
   {
     f = new UserInfoDlg(id, ppid);
-    connect(f, SIGNAL(finished(QString, unsigned long)),
-        SLOT(userInfoDlgFinished(QString, unsigned long)));
+    connect(f, SIGNAL(finished(UserInfoDlg*)),
+        SLOT(userInfoDlgFinished(UserInfoDlg*)));
     f->show();
     myUserInfoList.append(f);
@@ -1084 +1084 @@
 }
 
-void LicqGui::userInfoDlgFinished(QString id, unsigned long ppid)
-{
-  for (int i = 0; i < myUserInfoList.size(); ++i)
-  {
-    UserInfoDlg* item = myUserInfoList.at(i);
-    if (item->PPID() == ppid && item->Id() == id)
-    {
-      myUserInfoList.removeAll(item);
-      return;
-    }
-  }
+void LicqGui::userInfoDlgFinished(UserInfoDlg* dialog)
+{
+  if (myUserInfoList.removeAll(dialog) > 0)
+    return;
 
   gLog.Warn("%sUser Info finished signal for user with no window (%s)!\n",
-      L_WARNxSTR, id.toLatin1().data());
+      L_WARNxSTR, dialog->Id().toLatin1().data());
 }
 

trunk/qt4-gui/src/core/licqgui.h

@@ -220 +220 @@
 #endif
 
-  void userInfoDlgFinished(QString id, unsigned long ppid);
+  void userInfoDlgFinished(UserInfoDlg* dialog);
   void userEventTabDlgDone();
   void userEventFinished(QString id, unsigned long ppid);