Ticket #1267: sugar-1267.patch

src/jarabe/desktop/favoriteslayout.py

@@ -281 +281 @@
             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)
 

src/jarabe/journal/journalactivity.py

@@ -199 +199 @@
         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 +215 @@
             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:

src/jarabe/journal/listview.py

@@ -426 +426 @@
         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,

src/jarabe/model/shell.py

@@ -463 +463 @@
 
             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.',

src/jarabe/view/launcher.py

@@ -120 +120 @@
 
     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 = {}