From dcaef8c77ce21098439c144ea82749941a05fdf5 Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Tue, 2 Nov 2010 16:35:07 +0100
Subject: [PATCH 1/2] [FIX] Fetchmail module was using domain 'type' on
 mailgate.message, real name was 'server_type'

lp bug: https://launchpad.net/bugs/669957 fixed

bzr revid: niels@bubbles-it.be-20101102153507-xy0yp3vouif0holl
---
 addons/fetchmail/fetchmail_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1d0cf21be08..11a988b7093 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -71,8 +71,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="context">{'server_type':'pop'}</field>
+            <field name="domain">[('server_type','=','pop')]</field>
         </record>
 
         <menuitem 
@@ -93,8 +93,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="context">{'server_type':'imap'}</field>
+            <field name="domain">[('server_type','=','imap')]</field>
         </record>
         
         <menuitem 
@@ -128,8 +128,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="context">{'server_type':'imap'}</field>
+            <field name="domain">[('server_type','=','imap')]</field>
         </record>
         
         <menuitem 
@@ -143,8 +143,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="context">{'server_type':'pop'}</field>
+            <field name="domain">[('server_type','=','pop')]</field>
         </record>
         
         <menuitem 

From b1c4debf3868996d919282020a02612dd5c22b68 Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Tue, 2 Nov 2010 16:53:51 +0100
Subject: [PATCH 2/2] [REV] Reverted some changes to actions for servers (there
 the field IS 'type')

bzr revid: niels@bubbles-it.be-20101102155351-byhpbklwf7t3ep12
---
 addons/fetchmail/fetchmail_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 11a988b7093..7f751f7c5a2 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -71,8 +71,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'server_type':'pop'}</field>
-            <field name="domain">[('server_type','=','pop')]</field>
+            <field name="context">{'type':'pop'}</field>
+            <field name="domain">[('type','=','pop')]</field>
         </record>
 
         <menuitem 
@@ -93,8 +93,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'server_type':'imap'}</field>
-            <field name="domain">[('server_type','=','imap')]</field>
+            <field name="context">{'type':'imap'}</field>
+            <field name="domain">[('type','=','imap')]</field>
         </record>
         
         <menuitem