diff --git a/src/common/config.py b/src/common/config.py
index 100aa3333..a549c432b 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -86,8 +86,8 @@ class Config:
'after_time': [ opt_str, ']' ],
'before_nickname': [ opt_str, '<' ],
'after_nickname': [ opt_str, '>' ],
- 'do_not_send_os_info': [ opt_bool, False ],
- 'do_not_check_for_new_version': [ opt_bool, False ],
+ 'send_os_info': [ opt_bool, False ],
+ 'check_for_new_version': [ opt_bool, False ],
'usegpg': [ opt_bool, False ],
'lognotusr': [ opt_bool, True ],
'lognotsep': [ opt_bool, True ],
diff --git a/src/common/connection.py b/src/common/connection.py
index aaca0d430..0e1b750b6 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -383,8 +383,8 @@ class Connection:
qp = iq_obj.getTag('query')
qp.insertTag('name').insertData('Gajim')
qp.insertTag('version').insertData(gajim.version)
- no_send_os = gajim.config.get('do_not_send_os_info')
- if not no_send_os:
+ send_os = gajim.config.get('send_os_info')
+ if send_os:
qp.insertTag('os').insertData(get_os_info())
self.connection.send(iq_obj)
diff --git a/src/config.py b/src/config.py
index baf200948..b9560b7e4 100644
--- a/src/config.py
+++ b/src/config.py
@@ -390,13 +390,12 @@ class Preferences_window:
gajim.config.set('lognotsep', widget.get_active())
self.plugin.save_config()
- def on_do_not_send_os_info_checkbutton_toggled(self, widget):
- gajim.config.set('do_not_send_os_info', widget.get_active())
+ def on_send_os_info_checkbutton_toggled(self, widget):
+ gajim.config.set('send_os_info', widget.get_active())
self.plugin.save_config()
- def on_do_not_check_for_new_version_checkbutton_toggled(self, widget):
- gajim.config.set('do_not_check_for_new_version',
- widget.get_active())
+ def on_check_for_new_version_checkbutton_toggled(self, widget):
+ gajim.config.set('check_for_new_version', widget.get_active())
self.plugin.save_config()
def fill_msg_treeview(self):
@@ -771,12 +770,12 @@ class Preferences_window:
self.xml.get_widget('log_in_extern_checkbutton').set_active(st)
# don't send os info
- st = gajim.config.get('do_not_send_os_info')
- self.xml.get_widget('do_not_send_os_info_checkbutton').set_active(st)
+ st = gajim.config.get('send_os_info')
+ self.xml.get_widget('send_os_info_checkbutton').set_active(st)
# don't check for new version
- st = gajim.config.get('do_not_check_for_new_version')
- btn = self.xml.get_widget('do_not_check_for_new_version_checkbutton')
+ st = gajim.config.get('check_for_new_version')
+ btn = self.xml.get_widget('check_for_new_version_checkbutton')
btn.set_active(st)
self.xml.signal_autoconnect(self)
diff --git a/src/gajim.py b/src/gajim.py
index aa2065872..6213fd3c9 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -686,7 +686,7 @@ class Interface:
if self.systray_capabilities:
self.show_systray()
- if not gajim.config.get('do_not_check_for_new_version'):
+ if not gajim.config.get('check_for_new_version'):
common.check_for_new_version.Check_for_new_version_dialog(self)
self.init_regexp()
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 47bcf2efa..77959b870 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -5548,17 +5548,17 @@ Custom
0
-
+
True
True
- Do not send _OS information
+ Allow _OS information to be sent
True
GTK_RELIEF_NORMAL
True
False
False
True
-
+
0
@@ -5568,17 +5568,17 @@ Custom
-
+
True
True
- Do not check for new _version at startup
+ Check for new _version at startup
True
GTK_RELIEF_NORMAL
True
False
False
True
-
+
0