Fix remaining issues in Combobox

- pack_end and pack_start of the combobox only take three parameters
- set_row_separator_func has a second parameter, the user data to pass
  to @func, or None

1 files changed, 4 insertions, 4 deletions

diff --git a/src/sugar3/graphics/combobox.py b/src/sugar3/graphics/combobox.py
index 6bc84f1..71b72ba 100644
--- a/src/sugar3/graphics/combobox.py
+++ b/src/sugar3/graphics/combobox.py
@@ -38,7 +38,7 @@ class ComboBox(Gtk.ComboBox):
                                     GObject.TYPE_BOOLEAN)
         self.set_model(self._model)
 
-        self.set_row_separator_func(self._is_separator)
+        self.set_row_separator_func(self._is_separator, None)
 
     def get_value(self):
         """
@@ -94,12 +94,12 @@ class ComboBox(Gtk.ComboBox):
                                             settings, Gtk.IconSize.MENU)
             self._icon_renderer.props.stock_size = max(w, h)
 
-            self.pack_start(self._icon_renderer, False, False, 0)
+            self.pack_start(self._icon_renderer, False)
             self.add_attribute(self._icon_renderer, 'pixbuf', 2)
 
         if not self._text_renderer and text:
             self._text_renderer = Gtk.CellRendererText()
-            self.pack_end(self._text_renderer, True, False, 0)
+            self.pack_end(self._text_renderer, True)
             self.add_attribute(self._text_renderer, 'text', 1)
 
         if icon_name or file_name:
@@ -165,5 +165,5 @@ class ComboBox(Gtk.ComboBox):
         """
         self._model.clear()
 
-    def _is_separator(self, model, row):
+    def _is_separator(self, model, row, data):
         return model[row][3]