Skip to content

Commit 9b65656

Browse files
committed
Revert "Journal - iconify again if Metacity misbehaves (RHBZ #1519042)"
This reverts commit 258235c. Now that Metacity fix is released, the Journal does not appear on first request.
1 parent 5a1e02a commit 9b65656

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

src/jarabe/journal/journalactivity.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ def __init__(self):
226226

227227
self._dbus_service = JournalActivityDBusService(self)
228228

229-
self._unwanted = True # user has not asked to see Journal
230229
self.iconify()
231230

232231
self._critical_space_alert = None
@@ -521,16 +520,10 @@ def _focus_out_event_cb(self, window, event):
521520
self._set_is_visible(False)
522521

523522
def __window_state_event_cb(self, window, event):
524-
logging.debug('window_state_event_cb %r', event.new_window_state)
523+
logging.debug('window_state_event_cb %r', self)
525524
if event.changed_mask & Gdk.WindowState.ICONIFIED:
526525
state = event.new_window_state
527526
visible = not state & Gdk.WindowState.ICONIFIED
528-
if self._unwanted and visible:
529-
self._unwanted = False
530-
self.iconify()
531-
logging.warning('Journal premature deiconify '
532-
'by Metacity (RHBZ #1519042), try again.')
533-
return
534527
self._set_is_visible(visible)
535528

536529
def _set_is_visible(self, visible):
@@ -566,7 +559,6 @@ def set_active_volume(self, mount):
566559

567560
def show_journal(self):
568561
"""Become visible and show main view"""
569-
self._unwanted = False
570562
self.reveal()
571563
self.show_main_view()
572564

0 commit comments

Comments
 (0)