[evolution/kill-bonobo: 43/43] Merge branch 'master' into kill-bonobo

[Matthew Barnes <mbarnes src gnome org>]

commit c3e0648d8b5a1d73f82f0a7691b9ab1320248392
Merge: 5395bd3... fb970cc...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon May 4 09:08:32 2009 -0400

    Merge branch 'master' into kill-bonobo
    
    Conflicts:
    	addressbook/gui/Makefile.am
    	addressbook/gui/widgets/Makefile.am
    	addressbook/gui/widgets/eab-popup-control.c
    	calendar/gui/e-meeting-time-sel.c
    	calendar/gui/migration.c
    	calendar/modules/e-memo-shell-module-migrate.h
    	e-util/e-logger.c
    	mail/e-mail-attachment-bar.c
    	mail/em-composer-utils.c
    	mail/em-format-html-display.c
    	plugins/mail-account-disable/Makefile.am
    	plugins/select-one-source/Makefile.am
    	po/es.po
    	shell/Makefile.am
    	shell/e-shell-common.h
    	shell/e-shell-nm.c
    	shell/e-shell-window-commands.c
    	shell/e-shell-window.c
    	shell/e-sidebar.c
    	shell/e-user-creatable-items-handler.c
    	shell/importer/Makefile.am
    	shell/test/Makefile.am
    	widgets/misc/test-error.c
    	widgets/misc/test-info-label.c
    	widgets/misc/test-multi-config-dialog.c

 addressbook/addressbook.error.xml           |    3 +-
 addressbook/gui/component/ldap-config.glade |    2 +-
 calendar/gui/alarm-notify/alarm-queue.c     |    2 +-
 calendar/gui/alarm-notify/alarm.c           |    2 +-
 calendar/gui/e-meeting-time-sel.c           |    4 +-
 composer/e-composer-autosave.c              |    4 +-
 composer/evolution-composer.ui              |    3 ++
 configure.in                                |   10 +++++++++
 e-util/e-logger.c                           |    2 +-
 e-util/gconf-bridge.c                       |    6 ++--
 mail/em-folder-tree.c                       |    2 +-
 mail/evolution-mail.schemas.in              |    6 ++--
 mail/mail-folder-cache.c                    |    4 +-
 mail/mail-ops.c                             |    4 +-
 mail/mail-send-recv.c                       |    2 +-
 mail/mail-vfolder.c                         |   19 -----------------
 mail/message-list.c                         |   11 +++++----
 plugins/bbdb/bbdb.c                         |    2 +-
 plugins/bbdb/bbdb.h                         |    2 +-
 plugins/publish-calendar/publish-calendar.c |    8 +++---
 po/es.po                                    |    4 +-
 shell/Makefile.am                           |   16 ++++++++++++-
 shell/e-shell-nm.c                          |    2 +-
 shell/evolution-icon.rc                     |    4 +++
 shell/evolution-mail.ico                    |  Bin 0 -> 19622 bytes
 shell/evolution-memos.ico                   |  Bin 0 -> 19622 bytes
 shell/evolution-tasks.ico                   |  Bin 0 -> 19622 bytes
 shell/evolution.ico                         |  Bin 0 -> 19622 bytes
 widgets/table/e-table-search.c              |    2 +-
 widgets/table/e-tree-model.c                |   30 +++++++++++++++++++++++++++
 widgets/table/e-tree-model.h                |    2 +
 widgets/table/e-tree-table-adapter.c        |   27 ++++++++++++++++++++++++
 widgets/text/e-text.c                       |    2 +-
 33 files changed, 129 insertions(+), 58 deletions(-)

diff --cc composer/evolution-composer.ui
index 2f99708,dc77aae..44a0a51
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@@ -9,20 -9,11 +9,23 @@@
          <menuitem action='save'/>
          <menuitem action='save-as'/>
          <menuitem action='save-draft'/>
 -	<placeholder name='template-holder'/>
 +        <placeholder name='template-holder'/>
 +        <separator/>
 +	<placeholder name='external-editor-holder'/>
 +        <separator/>
 +        <separator/>
 +	<placeholder name='external-editor-holder'/>
 +        <separator/>
 +        <separator/>
 +	<placeholder name='external-editor-holder'/>
 +        <separator/>
 +        <separator/>
 +	<placeholder name='external-editor-holder'/>
 +        <separator/>
          <separator/>
+ 	<placeholder name='external-editor-holder'/>
+         <separator/>
+         <separator/>
          <menuitem action='print-preview'/>
          <menuitem action='print'/>
          <separator/>