Changeset 6476 for trunk/qt4-gui/src

Timestamp:

08/07/08 04:39:50 (4 months ago)

Author:

flynd

Message:

Don't trigger rename of contact when alias hasn't actually changed.

Location:

trunk/qt4-gui/src/userdlg

Files:

• info.cpp (modified) (3 diffs)
• info.h (modified) (1 diff)

trunk/qt4-gui/src/userdlg/info.cpp

@@ -89 +89 @@
 UserPages::Info::Info(bool isOwner, UserDlg* parent)
   : QObject(parent),
-    m_bOwner(isOwner)
+    m_bOwner(isOwner),
+    myAliasHasChanged(false)
 {
   m_Interests = m_Organizations = m_Backgrounds = NULL;
@@ -148 +149 @@
 void UserPages::Info::apply2(const QString& id, unsigned long ppid)
 {
-  if (!m_bOwner)
-  {
+  if (myAliasHasChanged)
     gLicqDaemon->ProtoRenameUser(id.toLatin1(), ppid);
-  }
+  myAliasHasChanged = false;
 
 #ifdef USE_KABC
@@ -325 +325 @@
 void UserPages::Info::savePageGeneral(ICQUser* u)
 {
+  myAliasHasChanged = (u->GetAlias() != nfoAlias->text().toUtf8());
   u->SetAlias(nfoAlias->text().toUtf8());
   if (!m_bOwner)

trunk/qt4-gui/src/userdlg/info.h

@@ -435 +435 @@
   QLabel* lblICQHomepage;
   TimeZoneEdit* tznZone;
+  bool myAliasHasChanged;
 
   // More info