Send event to reload contact list and ensure that Display As name has right ordering.

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

diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index dd17d98..02e605b 100644 (file)
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -3142,6 +3142,14 @@ void frmContactEditor::LoadPicture( wxListEvent& event )
             
         }
         
+    } else if (pictypeiter->second == wxT("image/gif")){
+        
+        if (!photo.LoadFile(istream, wxBITMAP_TYPE_GIF)){
+            
+            return;
+            
+        }
+        
     } else {
     
         return;
@@ -6064,6 +6072,10 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
             FMTimer.SetFilename(FilenameFinal);
             FMTimer.UpdateTimestamp();
             FMTimer.Start(10000, FALSE);
+           
+           wxCommandEvent reloadevent(RELOADCONTACTLIST);
+           reloadevent.SetString(wxSContactAccount);
+           wxPostEvent(this->GetParent(), reloadevent);
             
         }
         else {
@@ -7735,7 +7747,7 @@ void frmContactEditor::UpdateDisplayAs( wxCommandEvent &event ){
         
     }
     if (!txtTitle->GetValue().IsEmpty()){
-        cmbDisplayAs->Append(txtTitle->GetValue() + wxT(" ") + txtSurname->GetValue() + wxT(" ") + txtForename->GetValue());
+        cmbDisplayAs->Append(txtTitle->GetValue() + wxT(" ") + txtForename->GetValue() + wxT(" ") + txtSurname->GetValue());
     }
     
     cmbDisplayAs->SetValue(SetValue);