diff options
| -rw-r--r-- | gajim/gtk/main.py | 8 | ||||
| -rw-r--r-- | gajim/gtk/status_icon.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gajim/gtk/main.py b/gajim/gtk/main.py index 73164013e..348e95b16 100644 --- a/gajim/gtk/main.py +++ b/gajim/gtk/main.py @@ -186,15 +186,15 @@ class MainWindow(Gtk.ApplicationWindow, EventHelper): self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar')) + self.show_all() + show_main_window = app.settings.get('show_main_window_on_startup') if show_main_window == 'never': - self.minimize() + self.hide() elif (show_main_window == 'last_state' and not app.settings.get('last_main_window_visible')): - self.minimize() - - self.show_all() + self.hide() def _on_account_enabled(self, event: events.AccountEnabled) -> None: self._account_side_bar.add_account(event.account) diff --git a/gajim/gtk/status_icon.py b/gajim/gtk/status_icon.py index 27dcdf8f9..736bf3e15 100644 --- a/gajim/gtk/status_icon.py +++ b/gajim/gtk/status_icon.py @@ -189,10 +189,10 @@ class GtkMenuBackend(EventHelper): self._on_activate() def _on_activate(self, *args: Any) -> None: - if app.settings.get('last_main_window_visible'): - app.window.hide() - else: + if app.window.is_minimized() or app.window.is_withdrawn(): app.window.unminimize() + else: + app.window.hide() @staticmethod def _on_preferences(_widget: Gtk.MenuItem) -> None: |