[evolution/express2: 40/40] Merge branch 'gnome-2-30' into express2

[Matthew Barnes <mbarnes src gnome org>]

commit ea1a5fca456b891f8bb9ab248ad65651b66b54b2
Merge: c20b170 99ebc23
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon May 17 09:49:21 2010 -0400

    Merge branch 'gnome-2-30' into express2

 addressbook/gui/widgets/e-addressbook-view.c     |    1 -
 addressbook/importers/evolution-vcard-importer.c |   31 +-
 calendar/gui/alarm-notify/Makefile.am            |    1 +
 calendar/gui/alarm-notify/notify-main.c          |    4 +
 doc/reference/shell/tmpl/e-util.sgml             |    1 +
 e-util/Makefile.am                               |    2 +-
 e-util/e-win32-defaults.c                        |  277 +
 e-util/e-win32-defaults.h                        |   36 +
 help/de/de.po                                    |   70 +-
 help/de/figures/categories_a.png                 |  Bin 0 -> 75778 bytes
 help/de/figures/contacts_mainwindow_a.png        |  Bin 0 -> 60203 bytes
 help/de/figures/evo_caltasks_a.png               |  Bin 0 -> 151937 bytes
 help/de/figures/evo_edit_search.png              |  Bin 0 -> 100400 bytes
 help/de/figures/evo_junk_a.png                   |  Bin 0 -> 186690 bytes
 help/de/figures/evo_label_a.png                  |  Bin 0 -> 66364 bytes
 help/de/figures/evo_labels_a.png                 |  Bin 0 -> 74563 bytes
 help/de/figures/evo_mail_a.png                   |  Bin 0 -> 178821 bytes
 help/de/figures/evo_memo_a.png                   |  Bin 26980 -> 60784 bytes
 help/de/figures/evo_rule_a.png                   |  Bin 0 -> 61556 bytes
 help/de/figures/evo_shd_memo_a.png               |  Bin 0 -> 67958 bytes
 help/de/figures/evolution_contact_preference.png |  Bin 0 -> 69203 bytes
 help/de/figures/evolution_mail_preference.png    |  Bin 0 -> 141040 bytes
 help/de/figures/exchng-rec-mails.png             |  Bin 0 -> 85101 bytes
 help/de/figures/filter-new-fig.png               |  Bin 0 -> 70449 bytes
 help/de/figures/local_ics_calendar.png           |  Bin 0 -> 50831 bytes
 help/de/figures/mailer_preferences.png           |  Bin 82364 -> 186927 bytes
 help/de/figures/ver_view_a.png                   |  Bin 0 -> 217200 bytes
 mail/e-mail-reader.c                             |    6 +-
 mail/e-mail-reader.h                             |    3 +-
 mail/em-folder-tree.c                            |   26 +-
 mail/em-folder-utils.c                           |    6 +-
 modules/calendar/e-memo-shell-view-actions.c     |   19 +-
 modules/calendar/e-task-shell-view-actions.c     |   19 +-
 modules/mail/e-mail-shell-view-actions.c         |    2 +-
 po/lv.po                                         |24090 ++++++++++++----------
 shell/main.c                                     |    9 +
 widgets/misc/e-attachment-tree-view.c            |    7 +-
 widgets/misc/e-attachment-view.c                 |   19 +-
 widgets/table/e-table-item.c                     |   22 +-
 39 files changed, 13275 insertions(+), 11376 deletions(-)
---
diff --cc mail/e-mail-reader.c
index b5bcd15,53d45fd..6b1fa7d
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@@ -2300,9 -2314,9 +2300,9 @@@ mail_reader_update_actions (EMailReade
  	action_name = "mail-mark-junk";
  	sensitive = selection_has_not_junk_messages;
  	action = e_mail_reader_get_action (reader, action_name);
- 	gtk_action_set_sensitive (action, sensitive);
+ 	gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK));
  
 -	action_name = "mail-mark-notjunk";
 +	action_name = "mail-mark-not-junk";
  	sensitive = selection_has_junk_messages;
  	action = e_mail_reader_get_action (reader, action_name);
  	gtk_action_set_sensitive (action, sensitive);