From 523d10017e7b19e232a2a402b040fcdb6611dd82 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 27 Sep 2012 15:48:23 +0200
Subject: [IMP] mail/chatter: in progress

bzr revid: chm@openerp.com-20120927134823-tkwllczna72hb1th
---
 addons/mail/mail_thread_view.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'addons/mail/mail_thread_view.xml')

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index b4b1aade755..3507e7c449f 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -12,16 +12,22 @@
         <menuitem id="mail_feeds" name="Feeds" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
         <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/>
 
-        <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">My Feeds</field>
+        <record id="mail_inboxfeeds" model="ir.ui.menu">
+          <field name="name">Inbox</field>
           <field name="sequence" eval="10"/>
-          <field name="action" ref="action_mail_all_feeds"/>
+          <field name="action" ref="action_mail_inbox_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-        <record id="mail_myfeeds" model="ir.ui.menu">
-          <field name="name">My Posts</field>
+        <record id="mail_archivesfeeds" model="ir.ui.menu">
+          <field name="name">Archives</field>
           <field name="sequence" eval="11"/>
-          <field name="action" ref="action_mail_my_feeds"/>
+          <field name="action" ref="action_mail_archives_feeds"/>
+          <field name="parent_id" ref="mail_feeds"/>
+        </record>
+        <record id="mail_sentfeeds" model="ir.ui.menu">
+          <field name="name">Sent</field>
+          <field name="sequence" eval="12"/>
+          <field name="action" ref="action_mail_sent_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
 
-- 
cgit v1.2.3


From 40f04361c047801bf1723dbd1910e19bf65b3ece Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 3 Oct 2012 12:09:52 +0200
Subject: fixes

bzr revid: chm@openerp.com-20121003100952-e5v8ncgshra3uitc
---
 addons/mail/mail_thread_view.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'addons/mail/mail_thread_view.xml')

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 3507e7c449f..f607238276b 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -18,15 +18,21 @@
           <field name="action" ref="action_mail_inbox_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
+        <record id="mail_inboxfeeds" model="ir.ui.menu">
+          <field name="name">Wall</field>
+          <field name="sequence" eval="11"/>
+          <field name="action" ref="action_mail_wall_feeds"/>
+          <field name="parent_id" ref="mail_feeds"/>
+        </record>
         <record id="mail_archivesfeeds" model="ir.ui.menu">
           <field name="name">Archives</field>
-          <field name="sequence" eval="11"/>
+          <field name="sequence" eval="12"/>
           <field name="action" ref="action_mail_archives_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
         <record id="mail_sentfeeds" model="ir.ui.menu">
           <field name="name">Sent</field>
-          <field name="sequence" eval="12"/>
+          <field name="sequence" eval="13"/>
           <field name="action" ref="action_mail_sent_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-- 
cgit v1.2.3


From 121836232a9ff0b3983c6009d0470c82b16585ec Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 3 Oct 2012 15:03:18 +0200
Subject: [FIX]mail: attachment

bzr revid: chm@openerp.com-20121003130318-os2ybnics3zvrsed
---
 addons/mail/mail_thread_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/mail_thread_view.xml')

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index f607238276b..4b6709dd2d8 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -18,7 +18,7 @@
           <field name="action" ref="action_mail_inbox_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-        <record id="mail_inboxfeeds" model="ir.ui.menu">
+        <record id="mail_wallfeeds" model="ir.ui.menu">
           <field name="name">Wall</field>
           <field name="sequence" eval="11"/>
           <field name="action" ref="action_mail_wall_feeds"/>
-- 
cgit v1.2.3


From 3744f5c402b05edf50bd4562d0daedbc7cbc08e1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 3 Oct 2012 17:33:06 +0200
Subject: [REV] Revert last commit, breaks tests

bzr revid: odo@openerp.com-20121003153306-e2ugphdyijvq8x6l
---
 addons/mail/mail_thread_view.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'addons/mail/mail_thread_view.xml')

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 4b6709dd2d8..3507e7c449f 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -18,21 +18,15 @@
           <field name="action" ref="action_mail_inbox_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-        <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">Wall</field>
-          <field name="sequence" eval="11"/>
-          <field name="action" ref="action_mail_wall_feeds"/>
-          <field name="parent_id" ref="mail_feeds"/>
-        </record>
         <record id="mail_archivesfeeds" model="ir.ui.menu">
           <field name="name">Archives</field>
-          <field name="sequence" eval="12"/>
+          <field name="sequence" eval="11"/>
           <field name="action" ref="action_mail_archives_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
         <record id="mail_sentfeeds" model="ir.ui.menu">
           <field name="name">Sent</field>
-          <field name="sequence" eval="13"/>
+          <field name="sequence" eval="12"/>
           <field name="action" ref="action_mail_sent_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-- 
cgit v1.2.3