[M-git] Mahogany sources repository. branch master updated. v0.67-631-g668d4de

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Mahogany sources repository.".

The branch, master has been updated
       via  668d4de46b2e612f7c4c300247ffb8d10e1a32e0 (commit)
      from  0f647bd33786cc5b54fc6836d5db8e74ec7d7d1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 668d4de46b2e612f7c4c300247ffb8d10e1a32e0
Author: Vadim Zeitlin <[email protected]>
Date:   Thu May 10 17:59:15 2012 +0200

    Only save the entered components of the return address in "Quick Filter".
    
    If the email or the personal name, don't save empty values for them
    (wrongly overriding any inherited/default values).

diff --git a/src/gui/wxFiltersDialog.cpp b/src/gui/wxFiltersDialog.cpp
index 5fd9c1c..2eee5ac 100644
--- a/src/gui/wxFiltersDialog.cpp
+++ b/src/gui/wxFiltersDialog.cpp
@@ -2775,8 +2775,13 @@ bool wxQuickFilterDialog::TransferDataFromWindow()
                             addr->GetAddress().c_str());
             }
 
-            profileTargetFolder->writeEntry(MP_FROM_ADDRESS, addr->GetEMail());
-            profileTargetFolder->writeEntry(MP_PERSONALNAME, addr->GetName());
+            const String& email = addr->GetEMail();
+            if ( !email.empty() )
+               profileTargetFolder->writeEntry(MP_FROM_ADDRESS, email);
+
+            const String& name = addr->GetName();
+            if ( !name.empty() )
+               profileTargetFolder->writeEntry(MP_PERSONALNAME, name);
          }
       }
    }

-----------------------------------------------------------------------

Summary of changes:
 src/gui/wxFiltersDialog.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Mahogany sources repository.

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/