Merge branch 'master' of git.sugarlabs.org:sugar/mainline

6 files changed, 19 insertions, 15 deletions

diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
index 587c530..085ec10 100644
--- a/extensions/cpsection/keyboard/view.py
+++ b/extensions/cpsection/keyboard/view.py
@@ -77,9 +77,9 @@ class LayoutCombo(Gtk.HBox):
         cell = Gtk.CellRendererText()
         cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE
         cell.props.ellipsize_set = True
-        self._klang_combo.pack_start(cell, True, True, 0)
+        self._klang_combo.pack_start(cell, True)
         self._klang_combo.add_attribute(cell, 'text', 1)
-        self.pack_start(self._klang_combo, expand=True, fill=True)
+        self.pack_start(self._klang_combo, expand=True, fill=True, padding=0)
 
         self._kvariant_store = None
         self._kvariant_combo = Gtk.ComboBox(model=None)
@@ -89,9 +89,9 @@ class LayoutCombo(Gtk.HBox):
         cell = Gtk.CellRendererText()
         cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE
         cell.props.ellipsize_set = True
-        self._kvariant_combo.pack_start(cell, True, True, 0)
+        self._kvariant_combo.pack_start(cell, True)
         self._kvariant_combo.add_attribute(cell, 'text', 1)
-        self.pack_start(self._kvariant_combo, expand=True, fill=True)
+        self.pack_start(self._kvariant_combo, expand=True, fill=True, padding=0)
 
         self._klang_combo.set_active(self._index)
 
@@ -205,7 +205,7 @@ class Keyboard(SectionView):
         cell = Gtk.CellRendererText()
         cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE
         cell.props.ellipsize_set = True
-        kmodel_combo.pack_start(cell, True, True, 0)
+        kmodel_combo.pack_start(cell, True)
         kmodel_combo.add_attribute(cell, 'text', 1)
 
         self._kmodel = self._keyboard_manager.get_current_model()
@@ -265,7 +265,7 @@ class Keyboard(SectionView):
         cell = Gtk.CellRendererText()
         cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE
         cell.props.ellipsize_set = True
-        group_option_combo.pack_start(cell, True, True, 0)
+        group_option_combo.pack_start(cell, True)
         group_option_combo.add_attribute(cell, 'text', 1)
 
         self._group_switch_option = \
diff --git a/extensions/cpsection/power/view.py b/extensions/cpsection/power/view.py
index 715768f..f84885d 100644
--- a/extensions/cpsection/power/view.py
+++ b/extensions/cpsection/power/view.py
@@ -68,10 +68,12 @@ class Power(SectionView):
         label_automatic_pm_error = Gtk.Label()
         group.add_widget(label_automatic_pm_error)
         self._automatic_pm_alert_box.pack_start(label_automatic_pm_error,
-                                                expand=False)
+                                                expand=False, fill=True,
+                                                padding=0)
         label_automatic_pm_error.show()
         self._automatic_pm_alert_box.pack_start(self._automatic_pm_alert,
-                                                expand=False)
+                                                expand=False, fill=True,
+                                                padding=0)
         box_pm.pack_end(self._automatic_pm_alert_box, False, True, 0)
         self._automatic_pm_alert_box.show()
         if 'automatic_pm' in self.restart_alerts:
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 5d3dc20..b111164 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -426,7 +426,7 @@ class ActivitiesList(Gtk.VBox):
         if self._alert is not None:
             self.remove_alert()
         self._alert = alert
-        self.pack_start(alert, False)
+        self.pack_start(alert, False, True, 0)
         self.reorder_child(alert, 0)
 
     def remove_alert(self):
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 125637a..b73d016 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -89,7 +89,7 @@ class FavoritesBox(Gtk.VBox):
         if self._alert is not None:
             self.remove_alert()
         self._alert = alert
-        self.pack_start(alert, False)
+        self.pack_start(alert, False, True, 0)
         self.reorder_child(alert, 0)
 
     def remove_alert(self):
diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
index 7b87cc3..27c81e8 100644
--- a/src/jarabe/desktop/homewindow.py
+++ b/src/jarabe/desktop/homewindow.py
@@ -196,16 +196,19 @@ class HomeWindow(Gtk.Window):
         if level == ShellModel.ZOOM_HOME:
             self._box.pack_start(self._home_box, True, True, 0)
             self._home_box.show()
+            self._toolbar.clear_query()
             self._toolbar.search_entry.grab_focus()
             self._toolbar.show_view_buttons()
         elif level == ShellModel.ZOOM_GROUP:
             self._box.pack_start(self._group_box, True, True, 0)
             self._group_box.show()
+            self._toolbar.clear_query()
             self._toolbar.search_entry.grab_focus()
             self._toolbar.hide_view_buttons()
         elif level == ShellModel.ZOOM_MESH:
             self._box.pack_start(self._mesh_box, True, True, 0)
             self._mesh_box.show()
+            self._toolbar.clear_query()
             self._toolbar.search_entry.grab_focus()
             self._toolbar.hide_view_buttons()
 
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 1699ece..369f364 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -27,7 +27,6 @@ from gi.repository import Pango
 
 from sugar3.graphics import style
 from sugar3.graphics.icon import Icon, CellRendererIcon
-from sugar3.graphics.icon import EventIcon
 from sugar3.graphics.xocolor import XoColor
 from sugar3 import util
 
@@ -391,10 +390,10 @@ class BaseListView(Gtk.Bin):
         box = Gtk.VBox()
         alignment.add(box)
 
-        icon = EventIcon(pixel_size=style.LARGE_ICON_SIZE,
-                         icon_name='activity-journal',
-                         stroke_color=style.COLOR_BUTTON_GREY.get_svg(),
-                         fill_color=style.COLOR_TRANSPARENT.get_svg())
+        icon = Icon(pixel_size=style.LARGE_ICON_SIZE,
+                    icon_name='activity-journal',
+                    stroke_color=style.COLOR_BUTTON_GREY.get_svg(),
+                    fill_color=style.COLOR_TRANSPARENT.get_svg())
         box.pack_start(icon, expand=True, fill=False, padding=0)
 
         label = Gtk.Label()