X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-General.cpp;h=2fe3b1d0c6c52bed22aa1077c81f9e1ff45ffd18;hb=04a1ebb415bc0291b376d649d0d1ff680f4c6c7c;hp=e1be3d58c333aad89da11dbc3a372af24d50c642;hpb=5bce52e6a1c5a222d19c762aeed58aaf2e222672;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp
index e1be3d5..2fe3b1d 100644
--- a/source/contacteditor/frmContactEditor-General.cpp
+++ b/source/contacteditor/frmContactEditor-General.cpp
@@ -282,6 +282,7 @@ void frmContactEditor::AddGeneralIM( wxCommandEvent& event )
                              &ContactEditorData.GeneralIMListAltID,
                              &ContactEditorData.GeneralIMListPID,
                              &ContactEditorData.GeneralIMListType,
+			     &ContactEditorData.GeneralIMListTypeInfo,
                              &ContactEditorData.GeneralIMListTokens,
                              &ContactEditorData.GeneralIMListMediatype,
                              &ContactEditorData.GeneralIMListPref,
@@ -302,12 +303,13 @@ void frmContactEditor::ModifyGeneralIM( wxCommandEvent& event )
                          &intSelectedData)){
         return;
     }
-    
+
     frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this );
     frameCEIM->SetupPointers(&ContactEditorData.GeneralIMList,
                              &ContactEditorData.GeneralIMListAltID,
                              &ContactEditorData.GeneralIMListPID,
                              &ContactEditorData.GeneralIMListType,
+			     &ContactEditorData.GeneralIMListTypeInfo,
                              &ContactEditorData.GeneralIMListTokens,
                              &ContactEditorData.GeneralIMListMediatype,
                              &ContactEditorData.GeneralIMListPref,
@@ -334,8 +336,9 @@ void frmContactEditor::DeleteGeneralIM( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.GeneralIMList,
                   &ContactEditorData.GeneralIMListAltID, &ContactEditorData.GeneralIMListPID,
-                  &ContactEditorData.GeneralIMListType, &ContactEditorData.GeneralIMListTokens,
-                  &ContactEditorData.GeneralIMListMediatype, &ContactEditorData.GeneralIMListPref);
+                  &ContactEditorData.GeneralIMListType, &ContactEditorData.GeneralIMListTypeInfo,
+		  &ContactEditorData.GeneralIMListTokens, &ContactEditorData.GeneralIMListMediatype, 
+		  &ContactEditorData.GeneralIMListPref);
     
 }
 
@@ -350,6 +353,7 @@ void frmContactEditor::AddGeneralTelephone( wxCommandEvent& event )
                               &ContactEditorData.GeneralTelephoneListAltID,
                               &ContactEditorData.GeneralTelephoneListPID,
                               &ContactEditorData.GeneralTelephoneListType,
+                              &ContactEditorData.GeneralTelephoneListTypeInfo,
                               &ContactEditorData.GeneralTelephoneListTokens,
                               &ContactEditorData.GeneralTelephoneListPref,
                               lboTelephone,
@@ -375,6 +379,7 @@ void frmContactEditor::ModifyGeneralTelephone( wxCommandEvent& event )
                               &ContactEditorData.GeneralTelephoneListAltID,
                               &ContactEditorData.GeneralTelephoneListPID,
                               &ContactEditorData.GeneralTelephoneListType,
+                              &ContactEditorData.GeneralTelephoneListTypeInfo,
                               &ContactEditorData.GeneralTelephoneListTokens,
                               &ContactEditorData.GeneralTelephoneListPref,
                               lboTelephone,
@@ -400,8 +405,8 @@ void frmContactEditor::DeleteGeneralTelephone( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.GeneralTelephoneList,
                   &ContactEditorData.GeneralTelephoneListAltID, &ContactEditorData.GeneralTelephoneListPID,
-                  &ContactEditorData.GeneralTelephoneListType, &ContactEditorData.GeneralTelephoneListTokens,
-                  &ContactEditorData.GeneralTelephoneListPref);
+                  &ContactEditorData.GeneralTelephoneListType, &ContactEditorData.GeneralTelephoneListTypeInfo,
+		  &ContactEditorData.GeneralTelephoneListTokens, &ContactEditorData.GeneralTelephoneListPref);
     
 }
 
@@ -550,6 +555,7 @@ void frmContactEditor::AddGeneralGeoposition( wxCommandEvent& event )
                               &ContactEditorData.GeneralGeographyListAltID,
                               &ContactEditorData.GeneralGeographyListPID,
                               &ContactEditorData.GeneralGeographyListType,
+                              &ContactEditorData.GeneralGeographyListDataType,
                               &ContactEditorData.GeneralGeographyListTokens,
                               &ContactEditorData.GeneralGeographyListMediatype,
                               &ContactEditorData.GeneralGeographyListPref,
@@ -576,6 +582,7 @@ void frmContactEditor::ModifyGeneralGeoposition( wxCommandEvent& event )
                               &ContactEditorData.GeneralGeographyListAltID,
                               &ContactEditorData.GeneralGeographyListPID,
                               &ContactEditorData.GeneralGeographyListType,
+                              &ContactEditorData.GeneralGeographyListDataType,
                               &ContactEditorData.GeneralGeographyListTokens,
                               &ContactEditorData.GeneralGeographyListMediatype,
                               &ContactEditorData.GeneralGeographyListPref,
@@ -602,8 +609,9 @@ void frmContactEditor::DeleteGeneralGeoposition( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.GeneralGeographyList,
                   &ContactEditorData.GeneralGeographyListAltID, &ContactEditorData.GeneralGeographyListPID,
-                  &ContactEditorData.GeneralGeographyListType, &ContactEditorData.GeneralGeographyListTokens,
-                  &ContactEditorData.GeneralGeographyListMediatype, &ContactEditorData.GeneralGeographyListPref);
+                  &ContactEditorData.GeneralGeographyListType, &ContactEditorData.GeneralGeographyListDataType,
+		  &ContactEditorData.GeneralGeographyListTokens, &ContactEditorData.GeneralGeographyListMediatype, 
+		  &ContactEditorData.GeneralGeographyListPref);
     
 }
 
@@ -668,13 +676,11 @@ void frmContactEditor::DeleteGeneralRelated( wxCommandEvent& event )
     
     lboRelated->DeleteItem(longSelected);
     
-    GeneralRelatedList.erase(intSelectedData);
-    GeneralRelatedListRelType.erase(intSelectedData);
-    GeneralRelatedListAltID.erase(intSelectedData);
-    GeneralRelatedListPID.erase(intSelectedData);
-    GeneralRelatedListType.erase(intSelectedData);
-    GeneralRelatedListTokens.erase(intSelectedData);
-    GeneralRelatedListPref.erase(intSelectedData);
+    DeleteMapData(intSelectedData, &ContactEditorData.GeneralRelatedList,
+	&ContactEditorData.GeneralRelatedListRelType, &ContactEditorData.GeneralRelatedListAltID,
+	&ContactEditorData.GeneralRelatedListPID, &ContactEditorData.GeneralRelatedListType,
+	&ContactEditorData.GeneralRelatedListTokens, &ContactEditorData.GeneralRelatedListPref);
+    
 }
 
 void frmContactEditor::AddGeneralWebsite( wxCommandEvent& event )