From 91725d175bbadc5bef886aafb46694ce92663135 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Mon, 21 Apr 2014 17:08:47 -0300
Subject: [PATCH] Avoid pulsing icon at startup - WITH LOG
---
src/jarabe/model/shell.py | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index f67e31d..d46c82d 100644
a
|
b
|
class ShellModel(GObject.GObject): |
563 | 563 | them. |
564 | 564 | |
565 | 565 | """ |
| 566 | logging.debug('shell.py _window_opened_cb') |
| 567 | |
566 | 568 | if window.get_window_type() == Wnck.WindowType.NORMAL or \ |
567 | 569 | window.get_window_type() == Wnck.WindowType.SPLASHSCREEN: |
568 | 570 | home_activity = None |
569 | 571 | xid = window.get_xid() |
570 | 572 | |
571 | 573 | activity_id = SugarExt.wm_get_activity_id(xid) |
| 574 | logging.debug('shell.py __realize_cb getting wm activity id %s', activity_id) |
572 | 575 | |
573 | 576 | service_name = SugarExt.wm_get_bundle_id(xid) |
| 577 | logging.debug('shell.py __realize_cb getting wm bundle id %s', service_name) |
574 | 578 | if service_name: |
575 | 579 | registry = get_registry() |
576 | 580 | activity_info = registry.get_bundle(service_name) |
… |
… |
class ShellModel(GObject.GObject): |
579 | 583 | |
580 | 584 | if activity_id: |
581 | 585 | home_activity = self.get_activity_by_id(activity_id) |
582 | | |
583 | 586 | display = Gdk.Display.get_default() |
584 | 587 | gdk_window = GdkX11.X11Window.foreign_new_for_display(display, |
585 | 588 | xid) |
… |
… |
class ShellModel(GObject.GObject): |
594 | 597 | Wnck.WindowType.SPLASHSCREEN and \ |
595 | 598 | home_activity.get_launch_status() == Activity.LAUNCHING |
596 | 599 | |
597 | | if home_activity is None: |
| 600 | if home_activity is None and \ |
| 601 | window.get_window_type() != Wnck.WindowType.SPLASHSCREEN: |
598 | 602 | logging.debug('first window registered for %s', activity_id) |
599 | 603 | color = self._shared_activities.get(activity_id, None) |
600 | 604 | home_activity = Activity(activity_info, activity_id, |
… |
… |
class ShellModel(GObject.GObject): |
604 | 608 | |
605 | 609 | else: |
606 | 610 | logging.debug('window registered for %s', activity_id) |
607 | | home_activity.add_window(window, is_main_window(window, |
608 | | home_activity)) |
| 611 | _is_main_window = is_main_window(window, home_activity) |
| 612 | logging.error('_is_main_window %s', _is_main_window) |
| 613 | home_activity.add_window(window, _is_main_window) |
| 614 | |
| 615 | _is_main_window = is_main_window(window, home_activity) |
| 616 | logging.error('_is_main_window %s', _is_main_window) |
609 | 617 | |
610 | | if is_main_window(window, home_activity): |
| 618 | if _is_main_window: |
611 | 619 | self.emit('launch-completed', home_activity) |
612 | 620 | startup_time = time.time() - home_activity.get_launch_time() |
613 | 621 | logging.debug('%s launched in %f seconds.', |