[f-spot: 3/3] Merge commit 'jmberg/bgo-540556-automatic-tag-icon-optional'

[Ruben Vermeersch <rubenv src gnome org>]

commit 0e93befc66a8f31df351cbe4a63124dd42301b37
Merge: e6b7c47... 4c3da13...
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sun Jun 14 12:33:48 2009 +0200

    Merge commit 'jmberg/bgo-540556-automatic-tag-icon-optional'
    
    Patch looks good and having been annoyed by it too in the past, I'd like
    it in (so do the guys on IRC).
    
    Closes Bug 540556 â?? Option to turn off automatic tag icons
    
    Signed-off-by: Ruben Vermeersch <ruben savanne be>

 extensions/Services/DBusService/DBusProxy.cs |    2 +-
 extensions/Tools/MergeDb/MergeDb.cs          |    2 +-
 src/Core/Tag.cs                              |    7 ++++
 src/ImportCommand.cs                         |    4 +-
 src/MainWindow.cs                            |    4 +-
 src/Preferences.cs                           |    4 ++
 src/TagCommands.cs                           |    9 ++++-
 src/TagStore.cs                              |   44 ++++++++++++++++---------
 src/XmpTagsImporter.cs                       |    3 +-
 src/f-spot.glade                             |   21 ++++++++++++
 10 files changed, 75 insertions(+), 25 deletions(-)
---