copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

change do_not_send_os_info to send_os_info and do_not_check_for_new_version

Browse source 
to check_for_new_version
This commit is contained in:
Vincent Hanquez 2005-04-24 00:31:48 +00:00
parent 9f463820c2
commit 6dafb51c37
5 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/config.py
View file

@ -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 ],

4
src/common/connection.py
View file

@ -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)

17
src/config.py
View file

@ -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)

2
src/gajim.py
View file

@ -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()

12
src/gtkgui.glade
View file

@ -5548,17 +5548,17 @@ Custom</property>
<property name="spacing">0</property>
<child>
<widget class="GtkCheckButton" id="do_not_send_os_info_checkbutton">
<widget class="GtkCheckButton" id="send_os_info_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not send _OS information</property>
<property name="label" translatable="yes">Allow _OS information to be sent</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_do_not_send_os_info_checkbutton_toggled" last_modification_time="Wed, 06 Apr 2005 14:43:56 GMT"/>
<signal name="toggled" handler="on_send_os_info_checkbutton_toggled" last_modification_time="Wed, 06 Apr 2005 14:43:56 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -5568,17 +5568,17 @@ Custom</property>
</child>
<child>
<widget class="GtkCheckButton" id="do_not_check_for_new_version_checkbutton">
<widget class="GtkCheckButton" id="check_for_new_version_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not check for new _version at startup</property>
<property name="label" translatable="yes">Check for new _version at startup</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_do_not_check_for_new_version_checkbutton_toggled" last_modification_time="Mon, 18 Apr 2005 12:41:51 GMT"/>
<signal name="toggled" handler="on_check_for_new_version_checkbutton_toggled" last_modification_time="Mon, 18 Apr 2005 12:41:51 GMT"/>
</widget>
<packing>
<property name="padding">0</property>