From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 ui/ChangeLog                  | 23 +++++++++++++++++++++++
 ui/evolution-editor.xml       |  0
 ui/evolution-event-editor.xml |  0
 ui/evolution-mail-message.xml |  4 ----
 ui/evolution-memo-editor.xml  |  0
 ui/evolution-task-editor.xml  |  0
 ui/evolution.xml              |  2 +-
 7 files changed, 24 insertions(+), 5 deletions(-)
 delete mode 100644 ui/evolution-editor.xml
 delete mode 100644 ui/evolution-event-editor.xml
 delete mode 100644 ui/evolution-memo-editor.xml
 delete mode 100644 ui/evolution-task-editor.xml

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 0e592dd46f..b6402cb979 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,26 @@
+2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #546788
+
+	* evolution-mail-message.xml: Drop unused "ViewNormal" cmd entry.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #517825
+
+	* evolution.xml:
+	Fix duplicate mnemonic.  "_Work Offline" -> "Work _Offline"
+
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542125
+
+	* evolution-editor.xml:
+	* evolution-event-editor.xml:
+	* evolution-memo-editor.xml:
+	* evolution-task-editor.xml:
+	Remove these files from source control.
+
 2008-06-21  Roshan Kumar Singh  <roshan.singh08@yahoo.com>
 
 	** Fix for bug #395636
diff --git a/ui/evolution-editor.xml b/ui/evolution-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 5b0a29c57d..0acbc44647 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -214,10 +214,6 @@
      _tip="Force images in HTML mail to be loaded"
      accel="*Control*i" pixtype="pixbuf"/>
 
-    <cmd name="ViewNormal"
-     _tip="Show messages in the normal style"
-     type="radio" group="message_display"/>
-
     <cmd name="ViewSource"
      _tip="Show the raw email source of the message"
      accel="*Control*u"/>
diff --git a/ui/evolution-memo-editor.xml b/ui/evolution-memo-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ui/evolution.xml b/ui/evolution.xml
index b17f6050ce..9b4231e888 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -52,7 +52,7 @@
     <cmd name="Settings" pixtype="stock" pixname="gtk-preferences"/>
 
     <cmd name="ToggleOffline" 
-      _label="_Work Offline"
+      _label="Work _Offline"
       _tip="Toggle whether we are working offline."/>
 
     <cmd name="HelpAbout" _label="About Evolution..."
-- 
cgit