From 8f9f45ea948d1ffecb79601e860d522fc6686c2d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Aug 2011 19:16:59 +0200
Subject: [IMP] all: next pass of review/renaming for new mail API

bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
---
 addons/fetchmail/fetchmail_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index bdf25b40f74..d3470cec6eb 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -109,8 +109,8 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-	      <field name="name">email.message.tree</field>
-	      <field name="model">email.message</field>
+	      <field name="name">mail.message.tree</field>
+	      <field name="model">mail.message</field>
 	      <field name="type">tree</field>
 	      <field name="inherit_id" ref="mail.view_email_message_tree"/>
 	      <field name="arch" type="xml">
@@ -121,8 +121,8 @@
       </record>
 
       <record model="ir.ui.view" id="email_message_search_view">
-	      <field name="name">email.message.inherit.search</field>
-	      <field name="model">email.message</field>
+	      <field name="name">mail.message.inherit.search</field>
+	      <field name="model">mail.message</field>
 	      <field name="type">search</field>
 	      <field name="inherit_id" ref="mail.view_email_message_search"/>
 	      <field name="arch" type="xml">
@@ -134,7 +134,7 @@
 
       <record id="action_view_mail_message_emails" model="ir.actions.act_window">
             <field name="name">Messages</field>
-            <field name="res_model">email.message</field>
+            <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_emails': 1}</field>
@@ -143,8 +143,8 @@
 
       <act_window
             context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
-            id="act_server_history" name="Messages" domain="[('history', '=', True), ('server_id', '=', active_id)]"
-            res_model="email.message" src_model="email.server"/>
+            id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]"
+            res_model="mail.message" src_model="email.server"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3