Journal: initial port

- pack_start: we have to pass all arguments now with the dynamic bindings
- Gtk.widget_get_default_direction() -> Gtk.Widget.get_default_direction()
- window.window -> window.get_window()
- ListModel: on_* -> do_* and fix up the arguments and return values
  Gtk.TREE_MODEL_ITERS_PERSIST, Gtk.TREE_MODEL_LIST_ONLY ->
  Gtk.TreeModelFlags.ITERS_PERSIST, Gtk.TreeModelFlags.LIST_ONLY
- replace Pango.PIXELS(width) and use Pango.Layout get_pixel_size
- Gtk.TreeViewColumn: get_cell_renderers -> get_cells
- Gio.volume_monitor_get() -> Gio.VolumeMonitor.get()
- Volume BaseButton: fixup drag_dest_set
- Gtk.Alignment: pass all required arguments
- Gio.content_type_guess: pass all required arguments as named parameters
- MimeRegistry: fix issue introduced by the automatic conversion

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>

1 files changed, 31 insertions, 24 deletions

diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py
index b5de0b1..b98d01c 100644
--- a/src/jarabe/journal/listmodel.py
+++ b/src/jarabe/journal/listmodel.py
@@ -34,7 +34,7 @@ DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
 DS_DBUS_PATH = '/org/laptop/sugar/DataStore'
 
 
-class ListModel(Gtk.GenericTreeModel, Gtk.TreeDragSource):
+class ListModel(GObject.GObject, Gtk.TreeModel, Gtk.TreeDragSource):
     __gtype_name__ = 'JournalListModel'
 
     __gsignals__ = {
@@ -102,22 +102,23 @@ class ListModel(Gtk.GenericTreeModel, Gtk.TreeDragSource):
     def get_metadata(self, path):
         return model.get(self[path][ListModel.COLUMN_UID])
 
-    def on_get_n_columns(self):
+    def do_get_n_columns(self):
         return len(ListModel._COLUMN_TYPES)
 
-    def on_get_column_type(self, index):
+    def do_get_column_type(self, index):
         return ListModel._COLUMN_TYPES[index]
 
-    def on_iter_n_children(self, iterator):
+    def do_iter_n_children(self, iterator):
         if iterator == None:
             return self._result_set.length
         else:
             return 0
 
-    def on_get_value(self, index, column):
+    def do_get_value(self, iterator, column):
         if self.view_is_resizing:
             return None
 
+        index = iterator.user_data
         if index == self._last_requested_index:
             return self._cached_row[column]
 
@@ -200,33 +201,39 @@ class ListModel(Gtk.GenericTreeModel, Gtk.TreeDragSource):
 
         return self._cached_row[column]
 
-    def on_iter_nth_child(self, iterator, n):
-        return n
+    def do_iter_nth_child(self, parent_iter, n):
+        return (False, None)
 
-    def on_get_path(self, iterator):
-        return (iterator)
+    def do_get_path(self, iterator):
+        treepath = Gtk.TreePath((iterator.user_data,))
+        return treepath
 
-    def on_get_iter(self, path):
-        return path[0]
+    def do_get_iter(self, path):
+        idx = path.get_indices()[0]
+        iterator = Gtk.TreeIter()
+        iterator.user_data = idx
+        return (True, iterator)
 
-    def on_iter_next(self, iterator):
-        if iterator != None:
-            if iterator >= self._result_set.length - 1:
-                return None
-            return iterator + 1
-        return None
+    def do_iter_next(self, iterator):
+        idx = iterator.user_data + 1
+        if idx >= self._result_set.length:
+            iterator.stamp = -1
+            return (False, iterator)
+        else:
+            iterator.user_data = idx
+            return (True, iterator)
 
-    def on_get_flags(self):
-        return Gtk.TREE_MODEL_ITERS_PERSIST | Gtk.TREE_MODEL_LIST_ONLY
+    def do_get_flags(self):
+        return Gtk.TreeModelFlags.ITERS_PERSIST | Gtk.TreeModelFlags.LIST_ONLY
 
-    def on_iter_children(self, iterator):
-        return None
+    def do_iter_children(self, iterator):
+        return (False, iterator)
 
-    def on_iter_has_child(self, iterator):
+    def do_iter_has_child(self, iterator):
         return False
 
-    def on_iter_parent(self, iterator):
-        return None
+    def do_iter_parent(self, iterator):
+        return (False, Gtk.TreeIter())
 
     def do_drag_data_get(self, path, selection):
         uid = self[path][ListModel.COLUMN_UID]