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

[Matthew Barnes <mbarnes src gnome org>]

commit cbaa9eb7432b11d9bd6cb38fe5ef027612720623
Merge: 84c2e37... 1f65552...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu May 21 18:23:14 2009 -0400

    Merge branch 'master' into kill-bonobo
    
    Conflicts:
    	plugins/audio-inline/org-gnome-audio-inline.eplug.xml
    	plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
    	plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
    	plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
    	plugins/select-one-source/org-gnome-select-one-source.eplug.xml

 .../org-gnome-addressbook-file.eplug.xml           |    2 +-
 ...g-gnome-evolution-attachment-reminder.eplug.xml |    3 +--
 .../org-gnome-backup-restore.eplug.xml             |    4 ++--
 plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml    |    4 +++-
 .../org-gnome-bogo-junk-plugin.eplug.xml           |    4 ++--
 .../caldav/org-gnome-evolution-caldav.eplug.xml    |    4 ++--
 .../org-gnome-calendar-file.eplug.xml              |    2 +-
 .../org-gnome-calendar-http.eplug.xml              |    4 ++--
 .../org-gnome-calendar-weather.eplug.xml           |    2 +-
 plugins/copy-tool/org-gnome-copy-tool.eplug.xml    |    4 ++--
 .../org-gnome-default-mailer.eplug.xml             |    4 ++--
 .../org-gnome-default-source.eplug.xml             |    2 +-
 .../org-gnome-email-custom-header.eplug.xml        |    2 +-
 .../org-gnome-exchange-operations.eplug.xml        |    2 +-
 .../org-gnome-external-editor.eplug.xml            |    2 +-
 plugins/face/org-gnome-face.eplug.xml              |    4 +++-
 .../org-gnome-mail-folder-unsubscribe.eplug.xml    |    2 +-
 .../org-gnome-evolution-google.eplug.xml           |    4 ++--
 .../org-gnome-gw-account-setup.eplug.xml           |    2 +-
 plugins/groupwise-features/Makefile.am             |    2 --
 .../org-gnome-groupwise-features.eplug.xml         |    2 +-
 ...rg-gnome-evolution-hula-account-setup.eplug.xml |    4 ++--
 .../org-gnome-imap-features.eplug.xml              |    2 +-
 .../org-gnome-ipod-sync-evolution.eplug.xml        |    2 +-
 .../org-gnome-itip-formatter.eplug.xml             |    2 +-
 .../org-gnome-mail-notification.eplug.xml          |    2 +-
 .../mail-to-task/org-gnome-mail-to-task.eplug.xml  |    4 ++--
 .../org-gnome-mailing-list-actions.eplug.xml       |    2 +-
 .../org-gnome-mark-all-read.eplug.xml              |    2 +-
 plugins/mono/org-gnome-evolution-mono.eplug.xml    |    3 +--
 .../org-gnome-plugin-manager.eplug.xml             |    2 +-
 .../prefer-plain/org-gnome-prefer-plain.eplug.xml  |    7 ++-----
 .../org-gnome-evolution-profiler.eplug.xml         |    2 +-
 .../org-gnome-publish-calendar.eplug.xml           |    2 +-
 .../org-gnome-sa-junk-plugin.eplug.xml             |    4 ++--
 .../org-gnome-save-calendar.eplug.xml              |    2 +-
 .../org-gnome-subject-thread.eplug.xml             |    2 +-
 .../org-gnome-tnef-attachments.eplug.xml           |    4 ++--
 .../org-gnome-evolution-webdav.eplug.xml           |    2 +-
 39 files changed, 54 insertions(+), 57 deletions(-)

diff --cc plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
index 76c0864,356b8a5..a254e1e
--- a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
+++ b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
@@@ -1,21 -1,18 +1,21 @@@
  <?xml version="1.0"?>
  <e-plugin-list>
 -		<e-plugin
 -			id="org.gnome.evolution.mail.folder.mark_all_read"
 -			type="shlib"
 -			domain="@GETTEXT_PACKAGE@"
 -			_name="Mark All Read"
 -			location="@PLUGINDIR@/liborg-gnome-mark-all-read SOEXT@">
 -		<author name="Chenthill Palanisamy" email="pchenthill novell com"/>
 -		<_description>Mark all messages in a folder as read.</_description>
 +  <e-plugin id="org.gnome.evolution.mail.folder.mark_all_read"
 +        type="shlib"
 +        domain="@GETTEXT_PACKAGE@"
 +        _name="Mark All Read"
 +        location="@PLUGINDIR@/liborg-gnome-mark-all-read SOEXT@">
 +    <author name="Chenthill Palanisamy" email="pchenthill novell com"/>
-     <_description>Used for marking all the messages under a folder as read</_description>
++    <_description>Mark all messages in a folder as read.</_description>
  
 -		<hook class="org.gnome.evolution.mail.popup:1.0">
 -			<menu id="org.gnome.evolution.mail.foldertree.popup" target="folder">
 -				<item type="item" path="30.emc.01" icon="mail-mark-read" _label="Mark Me_ssages as Read" activate="org_gnome_mark_all_read" enable="folder" visible="folder"/>
 -			</menu>
 -		</hook>
 -	</e-plugin>
 +    <hook class="org.gnome.evolution.ui:1.0">
 +      <ui-manager id="org.gnome.evolution.mail">
 +        <popup name="mail-folder-popup">
 +          <placeholder name="mail-folder-popup-actions">
 +            <menuitem action="mail-mark-read-recursive"/>
 +          </placeholder>
 +        </popup>
 +      </ui-manager>
 +    </hook>
 +  </e-plugin>
  </e-plugin-list>
diff --cc plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
index c931b5c,406f19b..da27076
--- a/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
+++ b/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
@@@ -6,19 -6,18 +6,19 @@@
      location="@PLUGINDIR@/liborg-gnome-plugin-manager SOEXT@"
      _name="Plugin Manager"
      system_plugin="true">
 -    <_description>Manage your Evolution plugins.</_description>
      <author name="Michael Zucchi" email="notzed ximian com"/>
-     <_description>A plugin for managing which plugins are enabled or disabled.</_description>
 -    <hook class="org.gnome.evolution.shell.bonobomenu:1.0">
 -      <menu id="org.gnome.evolution.shell" target="shell">
 -	<!-- the path to the bonobo menu description -->
 -	<ui file="@PLUGINDIR@/org-gnome-plugin-manager.xml"/>
 -	<item
 -	  type="item"
 -	  verb="EPluginManagerManage"
 -	  path="/commands/EPluginManagerManage"
 -	  activate="org_gnome_plugin_manager_manage"/>
 -      </menu>
++    <_description>Manage your Evolution plugins.</_description>
 +
 +    <hook class="org.gnome.evolution.ui:1.0">
 +      <ui-manager id="org.gnome.evolution.shell">
 +        <menubar name="main-menu">
 +          <menu action="edit-menu">
 +            <placeholder name="administrative-actions">
 +              <menuitem action="plugin-manager"/>
 +            </placeholder>
 +          </menu>
 +        </menubar>
 +      </ui-manager>
      </hook>
    </e-plugin>
  </e-plugin-list>