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

fix get os info

This commit is contained in:
Denis Fomin 2013-01-03 20:50:01 +04:00
parent d5bf61ebf4
commit 35355e1fa2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/helpers.py
View File

@ -992,8 +992,10 @@ def get_os_info():
p.wait() p.wait()
output = temp_failure_retry(p.stdout.readline).strip() output = temp_failure_retry(p.stdout.readline).strip()
# some distros put n/a in places, so remove those # some distros put n/a in places, so remove those
output = output.replace('n/a', '').replace('N/A', '') output = output.decode('utf-8').replace('n/a', '').replace('N/A', '')
gajim.os_info = output gajim.os_info = output
p.stdout.close()
p.stdin.close()
return output return output
# lsb_release executable not available, so parse files # lsb_release executable not available, so parse files

4
src/roster_window.py
View File

@ -1518,7 +1518,7 @@ class RosterWindow:
self.tree.collapse_row(path) self.tree.collapse_row(path)
else: else:
self.tree.expand_row(path, False) self.tree.expand_row(path, False)
self.modelfilter.foreach(func) self.modelfilter.foreach(func, None)
def _adjust_account_expand_collapse_state(self, account): def _adjust_account_expand_collapse_state(self, account):
""" """
@ -4441,7 +4441,7 @@ class RosterWindow:
col = self.tree.get_column(0) col = self.tree.get_column(0)
self.tree.set_cursor_on_cell(path, col) self.tree.set_cursor_on_cell(path, col)
return True return True
self.modelfilter.foreach(_func) self.modelfilter.foreach(_func, None)
def on_rfilter_entry_icon_press(self, widget, icon, event): def on_rfilter_entry_icon_press(self, widget, icon, event):
""" """