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

Merge branch 'small-fixes' into 'master'

Browse source 
Small fixes

Closes #8542

See merge request !58
This commit is contained in:
Philipp Hörist 2017-02-12 19:10:55 +01:00
commit 1b2324ca97
3 changed files with 7 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

@ -746,13 +746,13 @@ def play_sound_file(path_to_soundfile):
path_to_soundfile = check_soundfile_path(path_to_soundfile) path_to_soundfile = check_soundfile_path(path_to_soundfile)
if path_to_soundfile is None: if path_to_soundfile is None:
return return
elif os.name == 'nt' and HAS_WINSOUND: elif sys.platform == 'win32' and HAS_WINSOUND:
try: try:
winsound.PlaySound(path_to_soundfile, winsound.PlaySound(path_to_soundfile,
winsound.SND_FILENAME|winsound.SND_ASYNC) winsound.SND_FILENAME|winsound.SND_ASYNC)
except Exception: except Exception:
log.exception('Sound Playback Error') log.exception('Sound Playback Error')
elif os.name == 'posix': elif sys.platform == 'linux':
if gajim.config.get('soundplayer') == '': if gajim.config.get('soundplayer') == '':
def _oss_play(): def _oss_play():
sndfile = wave.open(path_to_soundfile, 'rb') sndfile = wave.open(path_to_soundfile, 'rb')

4
src/config.py
View file

@ -3254,7 +3254,9 @@ class ManageBookmarksWindow:
self.xml.connect_signals(self) self.xml.connect_signals(self)
self.window.show_all() self.window.show_all()
# select root iter # select root iter
self.selection.select_iter(self.treestore.get_iter_first()) first_iter = self.treestore.get_iter_first()
if first_iter:
self.selection.select_iter(first_iter)
def on_key_press_event(self, widget, event): def on_key_press_event(self, widget, event):
if event.keyval == Gdk.KEY_Escape: if event.keyval == Gdk.KEY_Escape:

2
src/roster_window.py
View file

@ -1558,6 +1558,8 @@ class RosterWindow:
""" """
if not self.tree.get_model(): if not self.tree.get_model():
return return
if account not in gajim.connections:
return
delimiter = gajim.connections[account].nested_group_delimiter delimiter = gajim.connections[account].nested_group_delimiter
group_splited = group.split(delimiter) group_splited = group.split(delimiter)
i = 1 i = 1