GitLab

at 2017-02-12T19:09:48+01:00

Dont try to select iter if there is none

Fix key error on removing account

Use platform identifier with better granularity

Fixes #8542

Merge branch 'small-fixes' into 'master'

Small fixes

Closes #8542

See merge request !58
     path_to_soundfile = check_soundfile_path(path_to_soundfile)

     if path_to_soundfile is None:

         return

-    elif os.name == 'nt' and HAS_WINSOUND:

+    elif sys.platform == 'win32' and HAS_WINSOUND:

         try:

             winsound.PlaySound(path_to_soundfile,

                     winsound.SND_FILENAME|winsound.SND_ASYNC)

         except Exception:

             log.exception('Sound Playback Error')

-    elif os.name == 'posix':

+    elif sys.platform == 'linux':

         if gajim.config.get('soundplayer') == '':

             def _oss_play():

                 sndfile = wave.open(path_to_soundfile, 'rb')

         self.xml.connect_signals(self)

         self.window.show_all()

         # 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):

         if event.keyval == Gdk.KEY_Escape:

         """

         if not self.tree.get_model():

             return

+        if account not in gajim.connections:

+            return

         delimiter = gajim.connections[account].nested_group_delimiter

         group_splited = group.split(delimiter)

         i = 1

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes: