Fixed GetSelectedItem subroutine for getting the selected data value.

[xestiaab/.git] / source / contacteditor / frmContactEditor.cpp

diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index 8ad025b..34711b0 100644 (file)
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -5928,10 +5928,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ContactData.Add(wxT("UID"), UIDToken, FALSE);
     
-    // Generate ETag data for the contact if it does not exist.
-    // If X-XAB-ETAG-ORIG exists, leave alone and update X-XAB-ETAG.
-    
-    srand (time(NULL));
+    // End the vCard File.
     
     ContactData.Add(wxT("END"), wxT("VCARD"), FALSE);
     
@@ -5951,6 +5948,12 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 #if defined(__HAIKU__)
     
     //preffilename = wxT("noo");
+
+#elif defined(__APPLE__)
+    
+    PrefDir = GetUserPrefDir();
+    
+    wxStringTokenizer wSTFilename(wxSContactFilename, wxT("/"));
     
 #elif defined(__WIN32__)
     
@@ -6618,6 +6621,8 @@ bool frmContactEditor::GetSelectedItem(wxListCtrl *ListCtrlPtr,
                                              wxLIST_NEXT_ALL,
                                              wxLIST_STATE_SELECTED);
     
+    *intSelectedData = (int)ListCtrlPtr->GetItemData(*longSelected);
+    
     if (*longSelected == -1){
         return FALSE;
     }
@@ -6625,8 +6630,6 @@ bool frmContactEditor::GetSelectedItem(wxListCtrl *ListCtrlPtr,
         return TRUE;
     }
     
-    *intSelectedData = ListCtrlPtr->GetItemData(*longSelected);  
-    
 }
 
 void frmContactEditor::DeleteMapDataProcess(int IndexNum, std::map<int, std::string>* MapData){