diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-09-04 11:24:23 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-09-04 16:59:33 (GMT) |
commit | fbf9a8b12457c5556c6f8bc1e5c580b66209b63c (patch) | |
tree | 3a971c5aa494770afc4f5adc1ca05fbcbb15a017 | |
parent | 6c832e5681e9dbdf26d1260558659db2f5ff2fbc (diff) |
Fix minor issues to cleanup sugar log #1267
-rw-r--r-- | src/jarabe/desktop/favoriteslayout.py | 3 | ||||
-rw-r--r-- | src/jarabe/journal/journalactivity.py | 6 | ||||
-rw-r--r-- | src/jarabe/journal/listview.py | 6 | ||||
-rw-r--r-- | src/jarabe/model/shell.py | 3 | ||||
-rw-r--r-- | src/jarabe/view/launcher.py | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/src/jarabe/desktop/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py index 3ff0ba8..85e1b59 100644 --- a/src/jarabe/desktop/favoriteslayout.py +++ b/src/jarabe/desktop/favoriteslayout.py @@ -281,6 +281,9 @@ class RingLayout(FavoritesLayout): min_w_, child_width = child.get_width_request() min_h_, child_height = child.get_height_request(child_width) + if child_width <= 0 or child_height <= 0: + return + child.allocate(int(x), int(y), child_width, child_height, origin_changed) diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index a6e85d4..1d24d7f 100644 --- a/src/jarabe/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -199,8 +199,8 @@ class JournalActivity(Window): self.show_main_view() def show_main_view(self): - if self.toolbox != self._main_toolbox: - self.set_toolbox(self._main_toolbox) + if self.toolbar_box != self._main_toolbox: + self.set_toolbar_box(self._main_toolbox) self._main_toolbox.show() if self.canvas != self._main_view: @@ -215,7 +215,7 @@ class JournalActivity(Window): logging.error('Exception while displaying entry:\n' + \ ''.join(traceback.format_exception(*sys.exc_info()))) - self.set_toolbox(self._detail_toolbox) + self.set_toolbar_box(self._detail_toolbox) self._detail_toolbox.show() try: diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index 251388d..057b7c4 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -388,10 +388,14 @@ class BaseListView(gtk.Bin): self._scrolled_window.show() def update_dates(self): - logging.debug('ListView.update_dates') + if not self.tree_view.flags() & gtk.REALIZED: + return visible_range = self.tree_view.get_visible_range() if visible_range is None: return + + logging.debug('ListView.update_dates') + path, end_path = visible_range while True: x, y, width, height = self.tree_view.get_cell_area(path, diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index d967e53..7da81d5 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -463,7 +463,8 @@ class ShellModel(gobject.GObject): if wm.get_sugar_window_type(window) != 'launcher': home_activity.props.launching = False - self.emit('launch-completed', home_activity) + if not home_activity.is_journal(): + self.emit('launch-completed', home_activity) startup_time = time.time() - home_activity.get_launch_time() logging.debug('%s launched in %f seconds.', diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py index 643baee..d4b9967 100644 --- a/src/jarabe/view/launcher.py +++ b/src/jarabe/view/launcher.py @@ -120,7 +120,7 @@ class _Animation(animator.Animation): def next_frame(self, current): d = (self.end_size - self.start_size) * current - self._icon.props.size = self.start_size + d + self._icon.props.size = int(self.start_size + d) _launchers = {} |