Fix for new accel syntax; update bonobo to get working accelerators.

svn path=/trunk/; revision=5457

ui/evolution-calendar.xml

@@ -25,7 +25,7 @@
 				<menuitem name="Print" verb="CalendarPrint"
 				_label="_Print this calendar"
 				pixtype="stock" pixname="Menu_Print"
-				accel="&lt;Control&gt;p"/>
+				accel="*Control*p"/>
 				
 			</placeholder>
 
@@ -84,4 +84,4 @@
 
 	</dockitem>
 
-</Root>
+</Root>

ui/evolution-mail.xml

@@ -47,7 +47,7 @@
 
 				<menuitem name="MessageOpenNewWnd" verb=""
 				_label="_Open in New Window"
-				accel="&lt;Control&gt;o"/>
+				accel="*Control*o"/>
 
 				<menuitem name="MessageEdit" verb=""
 				_label="_Edit Message"/>
@@ -165,4 +165,4 @@
 		pixtype="stock" pixname="Trash"/>
 
 	</dockitem>
-</Root>
+</Root>

ui/evolution.xml

@@ -3,34 +3,34 @@
 		<submenu name="File" _label="_File">
 			<submenu name="New" _label="_New">
 				<menuitem name="View" verb="NewView" _label="_View"
-				accel="&lt;Control&gt;&lt;Shift&gt;v"
+				accel="*Control**Shift*v"
 				pixtype="stock" pixname="Menu_New"/>
 
 				<menuitem name="Folder" verb="NewFolder"
 				_label="_Folder"
-				accel="&lt;Control&gt;&lt;Shift&gt;f"/>
+				accel="*Control**Shift*f"/>
 
 				<menuitem name="Shortcut" verb="NewBarShortcut"
 				_label="Evolution bar _shortcut"
-				accel="&lt;Control&gt;&lt;Shift&gt;s"/>
+				accel="*Control**Shift*s"/>
 
 				<menuitem/>
 
 				<menuitem name="Mail" verb="NewMailMessage"
 				_label="_Mail message (FIXME)"
-				accel="&lt;Control&gt;&lt;Shift&gt;m"/>
+				accel="*Control**Shift*m"/>
 
 				<menuitem name="Appointment" verb="NewAppointment"
 				_label="_Appointment (FIXME)"
-				accel="&lt;Control&gt;&lt;Shift&gt;a"/>
+				accel="*Control**Shift*a"/>
 
 				<menuitem name="Contact" verb="NewContact"
 				_label="_Contact (FIXME)"
-				accel="&lt;Control&gt;&lt;Shift&gt;c"/>
+				accel="*Control**Shift*c"/>
 
 				<menuitem name="Task" verb="NewTask"
 				_label="_Task (FIXME)"
-				accel="&lt;Control&gt;&lt;Shift&gt;t"/>
+				accel="*Control**Shift*t"/>
 			</submenu>
 
 			<menuitem/>
@@ -48,7 +48,7 @@
 			<menuitem name="FileExit" verb=""
 			_label="E_xit" _descr="Exit the program"
 			pixtype="stock" pixname="Menu_Quit"
-			accel="&lt;Control&gt;q"/>
+			accel="*Control*q"/>
 			
 		</submenu>
 
@@ -109,4 +109,4 @@
 		<item name="main"/>
 		<control name="Progress"/>
 	</status>
-</Root>
+</Root>