From d3b1e006fbfa5ad1210825b9cb9a77a9364561f1 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 11 Nov 2014 16:03:26 +0100
Subject: [PATCH] Add GUI option for message carbons

---
 data/gui/accounts_window.ui | 18 +++++++++++++++++-
 src/config.py               |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui
index ff23dadd5..74177230f 100644
--- a/data/gui/accounts_window.ui
+++ b/data/gui/accounts_window.ui
@@ -572,6 +572,22 @@
                                 <property name="position">3</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="carbons_checkbutton1">
+                                <property name="label" translatable="yes">Receive conversations from other resources (If server supports it)</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_carbons_checkbutton_toggled"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkCheckButton" id="use_ft_proxies_checkbutton1">
                                 <property name="label" translatable="yes">Use file transfer proxies</property>
@@ -586,7 +602,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">4</property>
+                                <property name="position">5</property>
                               </packing>
                             </child>
                           </object>
diff --git a/src/config.py b/src/config.py
index 006e4e4a8..494f77754 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1996,6 +1996,8 @@ class AccountsWindow:
         self.xml.get_object('sync_with_global_status_checkbutton1').set_active(
             gajim.config.get_per('accounts', account,
             'sync_with_global_status'))
+        self.xml.get_object('carbons_checkbutton1').set_active(
+            gajim.config.get_per('accounts', account, 'enable_message_carbons'))
         self.xml.get_object('use_ft_proxies_checkbutton1').set_active(
             gajim.config.get_per('accounts', account, 'use_ft_proxies'))
 
@@ -2351,6 +2353,12 @@ class AccountsWindow:
             account=self.current_account)
         gajim.interface.roster.update_status_combobox()
 
+    def on_carbons_checkbutton_toggled(self, widget):
+        if self.ignore_events:
+            return
+        self.on_checkbutton_toggled(widget, 'enable_message_carbons',
+            account=self.current_account)
+
     def on_use_ft_proxies_checkbutton1_toggled(self, widget):
         if self.ignore_events:
             return