diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui index ff23dadd5ea936fd84ab8ae8fed2d135fd9e7606..74177230f43a0020ed26a91997ed84f00061f6c6 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 92b25c2da995ad1be153eadb07becc70e26c3aa9..50cb7eb0557ff3118fa348923e3134c63b4b9d89 100644 --- a/src/config.py +++ b/src/config.py @@ -1971,6 +1971,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')) @@ -2328,6 +2330,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