changeset 264c08b5285c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=264c08b5285c description: fix get os info
diffstat:
src/common/helpers.py | 4 +++- src/roster_window.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)
diffs (36 lines):
diff -r 0bb88fc343a5 -r 264c08b5285c src/common/helpers.py --- a/src/common/helpers.py Thu Jan 03 20:09:40 2013 +0400 +++ b/src/common/helpers.py Thu Jan 03 20:50:01 2013 +0400 @@ -992,8 +992,10 @@ p.wait() output = temp_failure_retry(p.stdout.readline).strip() # 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 + p.stdout.close() + p.stdin.close() return output
# lsb_release executable not available, so parse files diff -r 0bb88fc343a5 -r 264c08b5285c src/roster_window.py --- a/src/roster_window.py Thu Jan 03 20:09:40 2013 +0400 +++ b/src/roster_window.py Thu Jan 03 20:50:01 2013 +0400 @@ -1518,7 +1518,7 @@ self.tree.collapse_row(path) else: self.tree.expand_row(path, False) - self.modelfilter.foreach(func) + self.modelfilter.foreach(func, None)
def _adjust_account_expand_collapse_state(self, account): """ @@ -4441,7 +4441,7 @@ col = self.tree.get_column(0) self.tree.set_cursor_on_cell(path, col) return True - self.modelfilter.foreach(_func) + self.modelfilter.foreach(_func, None)
def on_rfilter_entry_icon_press(self, widget, icon, event): """