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>

12 files changed, 85 insertions, 67 deletions

diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 4fcb47b..8958d60 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -283,6 +283,8 @@ class CellRendererActivityIcon(CellRendererIcon):
         self._tree_view = tree_view
 
     def create_palette(self):
+        pass
+        '''
         model = self._tree_view.get_model()
         row = model[self.props.palette_invoker.path]
         bundle_id = row[ListModel.COLUMN_BUNDLE_ID]
@@ -291,7 +293,7 @@ class CellRendererActivityIcon(CellRendererIcon):
         palette = ActivityListPalette(registry.get_bundle(bundle_id))
         palette.connect('erase-activated', self.__erase_activated_cb)
         return palette
-
+        '''
     def __erase_activated_cb(self, palette, bundle_id):
         self.emit('erase-activated', bundle_id)
 
@@ -415,7 +417,7 @@ class ActivityListPalette(ActivityPalette):
                 self.__activity_changed_cb)
         self._update_favorite_item()
 
-        self.connect('destroy', self.__destroy_cb)
+        #self.connect('destroy', self.__destroy_cb)
 
     def _add_erase_option(self, registry, activity_info):
         menu_item = MenuItem(_('Erase'), 'list-remove')
diff --git a/src/jarabe/journal/detailview.py b/src/jarabe/journal/detailview.py
index 31c2ef3..c7748ed 100644
--- a/src/jarabe/journal/detailview.py
+++ b/src/jarabe/journal/detailview.py
@@ -88,17 +88,17 @@ class BackBar(Gtk.EventBox):
         hbox.set_border_width(style.DEFAULT_PADDING)
         icon = Icon(icon_name='go-previous', icon_size=Gtk.IconSize.MENU,
                     fill_color=style.COLOR_TOOLBAR_GREY.get_svg())
-        hbox.pack_start(icon, False, False)
+        hbox.pack_start(icon, False, False, 0)
 
         label = Gtk.Label()
         label.set_text(_('Back'))
         halign = Gtk.Alignment.new(0, 0.5, 0, 1)
         halign.add(label)
-        hbox.pack_start(halign, True, True)
+        hbox.pack_start(halign, True, True, 0)
         hbox.show()
         self.add(hbox)
 
-        if Gtk.widget_get_default_direction() == Gtk.TextDirection.RTL:
+        if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL:
             hbox.reverse()
 
         self.connect('enter-notify-event', self.__enter_notify_event_cb)
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index f3eb1a1..e200481 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -103,7 +103,7 @@ class ExpandedEntry(Gtk.EventBox):
         self._date = self._create_date()
         header.pack_start(self._date, False, False, style.DEFAULT_SPACING)
 
-        if Gtk.widget_get_default_direction() == Gtk.TextDirection.RTL:
+        if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL:
             header.reverse()
 
         # First body column
@@ -111,7 +111,7 @@ class ExpandedEntry(Gtk.EventBox):
         first_column.pack_start(self._preview_box, False, True, 0)
 
         self._technical_box = Gtk.VBox()
-        first_column.pack_start(self._technical_box, True)
+        first_column.pack_start(self._technical_box, True, False, 0)
 
         # Second body column
         description_box, self._description = self._create_description()
@@ -123,7 +123,7 @@ class ExpandedEntry(Gtk.EventBox):
                                  style.DEFAULT_SPACING)
 
         self._buddy_list = Gtk.VBox()
-        second_column.pack_start(self._buddy_list, True)
+        second_column.pack_start(self._buddy_list, True, False, 0)
 
         self.show_all()
 
@@ -136,7 +136,7 @@ class ExpandedEntry(Gtk.EventBox):
 
         self._icon = self._create_icon()
         self._icon_box.foreach(self._icon_box.remove)
-        self._icon_box.pack_start(self._icon, False, False)
+        self._icon_box.pack_start(self._icon, False, False, 0)
 
         self._date.set_text(misc.get_date(metadata))
 
@@ -296,7 +296,7 @@ class ExpandedEntry(Gtk.EventBox):
 
         if self._metadata.get('buddies'):
             buddies = simplejson.loads(self._metadata['buddies']).values()
-            vbox.pack_start(BuddyList(buddies, True, True, 0), False, False, 0)
+            vbox.pack_start(BuddyList(buddies), False, False, 0)
             return vbox
         else:
             return vbox
@@ -317,7 +317,8 @@ class ExpandedEntry(Gtk.EventBox):
         scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
         scrolled_window.set_border_width(style.LINE_WIDTH)
         text_buffer = Gtk.TextBuffer()
-        text_view = Gtk.TextView(text_buffer)
+        text_view = Gtk.TextView()
+        text_view.set_buffer(text_buffer)
         text_view.set_left_margin(style.DEFAULT_PADDING)
         text_view.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
         scrolled_window.add_with_viewport(text_view)
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 773ca88..7cd0c41 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -157,7 +157,7 @@ class JournalActivity(JournalWindow):
         self.remove_alert(alert)
 
     def __realize_cb(self, window):
-        xid = window.window.get_xid()
+        xid = window.get_window().get_xid()
         SugarExt.wm_set_bundle_id(xid, _BUNDLE_ID)
         activity_id = activityfactory.create_activity_id()
         SugarExt.wm_set_activity_id(xid, str(activity_id))
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index d688250..a4f80fc 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -471,7 +471,7 @@ class DetailToolbox(ToolbarBox):
             palette.menu.append(journal_menu)
             journal_menu.show()
 
-        volume_monitor = Gio.volume_monitor_get()
+        volume_monitor = Gio.VolumeMonitor.get()
         icon_theme = Gtk.IconTheme.get_default()
         for mount in volume_monitor.get_mounts():
             if self._metadata['mountpoint'] == mount.get_root().get_path():
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]
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 61bf4ff..1699ece 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -184,16 +184,16 @@ class BaseListView(Gtk.Bin):
             buddies_column.pack_start(cell_icon, True)
             buddies_column.props.fixed_width += cell_icon.props.width
             buddies_column.add_attribute(cell_icon, 'buddy', column_index)
-            return;buddies_column.set_cell_data_func(cell_icon,
-                    self.__buddies_set_data_cb)
+            buddies_column.set_cell_data_func(cell_icon,
+                                              self.__buddies_set_data_cb)
 
         cell_progress = Gtk.CellRendererProgress()
         cell_progress.props.ypad = style.GRID_CELL_SIZE / 4
         buddies_column.pack_start(cell_progress, True)
         buddies_column.add_attribute(cell_progress, 'value',
                 ListModel.COLUMN_PROGRESS)
-        return;buddies_column.set_cell_data_func(cell_progress,
-                self.__progress_data_cb)
+        buddies_column.set_cell_data_func(cell_progress,
+                                          self.__progress_data_cb)
 
         cell_text = Gtk.CellRendererText()
         cell_text.props.xalign = 1
@@ -222,9 +222,9 @@ class BaseListView(Gtk.Bin):
         widget = Gtk.Label(label='')
         context = widget.get_pango_context()
         layout = Pango.Layout(context)
-        layout.set_text(text)
-        width, height_ = layout.get_size()
-        return Pango.PIXELS(width)
+        layout.set_text(text, len(text))
+        width, height_ = layout.get_pixel_size()
+        return width
 
     def do_size_allocate(self, allocation):
         self.set_allocation(allocation)
@@ -237,15 +237,18 @@ class BaseListView(Gtk.Bin):
         if self._model is not None:
             self._model.stop()
 
-    def __buddies_set_data_cb(self, column, cell, tree_model, tree_iter):
+    def __buddies_set_data_cb(self, column, cell, tree_model,
+                              tree_iter, data):
         progress = tree_model[tree_iter][ListModel.COLUMN_PROGRESS]
         cell.props.visible = progress >= 100
 
-    def __progress_data_cb(self, column, cell, tree_model, tree_iter):
+    def __progress_data_cb(self, column, cell, tree_model,
+                           tree_iter, data):
         progress = tree_model[tree_iter][ListModel.COLUMN_PROGRESS]
         cell.props.visible = progress < 100
 
-    def __favorite_set_data_cb(self, column, cell, tree_model, tree_iter):
+    def __favorite_set_data_cb(self, column, cell, tree_model,
+                               tree_iter, data):
         favorite = tree_model[tree_iter][ListModel.COLUMN_FAVORITE]
         if favorite:
             client = GConf.Client.get_default()
@@ -271,7 +274,7 @@ class BaseListView(Gtk.Bin):
             query_dict['order_by'] = ['+timestamp']
         if query_dict['order_by'] != self._query.get('order_by'):
             property_ = query_dict['order_by'][0][1:]
-            cell_text = self.sort_column.get_cell_renderers()[0]
+            cell_text = self.sort_column.get_cells()[0]
             self.sort_column.set_attributes(cell_text,
                 text=getattr(ListModel, 'COLUMN_' + property_.upper(),
                              ListModel.COLUMN_TIMESTAMP))
@@ -298,7 +301,9 @@ class BaseListView(Gtk.Bin):
         self._scroll_position = self.tree_view.props.vadjustment.props.value
         logging.debug('ListView.__model_ready_cb %r', self._scroll_position)
 
-        if self.tree_view.window is not None:
+        x11_window = self.tree_view.get_window()
+
+        if x11_window is not None:
             # prevent glitches while later vadjustment setting, see #1235
             self.tree_view.get_bin_window().hide()
 
@@ -309,7 +314,7 @@ class BaseListView(Gtk.Bin):
         self.tree_view.props.vadjustment.props.value = self._scroll_position
         self.tree_view.props.vadjustment.value_changed()
 
-        if self.tree_view.window is not None:
+        if x11_window is not None:
             # prevent glitches while later vadjustment setting, see #1235
             self.tree_view.get_bin_window().show()
 
@@ -353,7 +358,8 @@ class BaseListView(Gtk.Bin):
             self._last_progress_bar_pulse = time.time()
 
     def _start_progress_bar(self):
-        alignment = Gtk.Alignment.new(xalign=0.5, yalign=0.5, xscale=0.5)
+        alignment = Gtk.Alignment.new(xalign=0.5, yalign=0.5,
+                                      xscale=0.5, yscale=0)
         self.remove(self.get_child())
         self.add(alignment)
         alignment.show()
@@ -389,20 +395,20 @@ class BaseListView(Gtk.Bin):
                          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)
+        box.pack_start(icon, expand=True, fill=False, padding=0)
 
         label = Gtk.Label()
         color = style.COLOR_BUTTON_GREY.get_html()
         label.set_markup('<span weight="bold" color="%s">%s</span>' % ( \
                 color, glib.markup_escape_text(message)))
-        box.pack_start(label, expand=True, fill=False)
+        box.pack_start(label, expand=True, fill=False, padding=0)
 
         if show_clear_query:
             button = Gtk.Button(label=_('Clear search'))
             button.connect('clicked', self.__clear_button_clicked_cb)
             button.props.image = Icon(icon_name='dialog-cancel',
                                       icon_size=Gtk.IconSize.BUTTON)
-            box.pack_start(button, expand=True, fill=False)
+            box.pack_start(button, expand=True, fill=False, padding=0)
 
         background_box.show_all()
 
@@ -429,10 +435,12 @@ class BaseListView(Gtk.Bin):
         tree_model = self.tree_view.get_model()
 
         while True:
-            x, y, width, height = self.tree_view.get_cell_area(path,
-                self.sort_column)
-            x, y = self.tree_view.convert_tree_to_widget_coords(x, y)
-            self.tree_view.queue_draw_area(x, y, width, height)
+            cel_rect = self.tree_view.get_cell_area(path,
+                                                    self.sort_column)
+            x, y = self.tree_view.convert_tree_to_widget_coords(cel_rect.x,
+                                                                cel_rect.y)
+            self.tree_view.queue_draw_area(x, y, cel_rect.width,
+                                           cel_rect.height)
             if path == end_path:
                 break
             else:
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 4c9a2db..fb73db7 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -394,7 +394,7 @@ class InplaceResultSet(BaseResultSet):
             return
 
         if self._mime_types:
-            mime_type = Gio.content_type_guess(filename=full_path)
+            mime_type = Gio.content_type_guess(filename=full_path, data=None)
             if mime_type not in self._mime_types:
                 return
 
@@ -440,7 +440,7 @@ def _get_file_metadata(path, stat, fetch_preview=True):
             'title': os.path.basename(path),
             'timestamp': stat.st_mtime,
             'filesize': stat.st_size,
-            'mime_type': Gio.content_type_guess(filename=path),
+            'mime_type': Gio.content_type_guess(filename=path, data=None),
             'activity': '',
             'activity_id': '',
             'icon-color': '#000000,#ffffff',
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 8b67294..43f9905 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -223,7 +223,7 @@ class CopyMenu(Gtk.Menu):
             self.append(journal_menu)
             journal_menu.show()
 
-        volume_monitor = Gio.volume_monitor_get()
+        volume_monitor = Gio.VolumeMonitor.get()
         icon_theme = Gtk.IconTheme.get_default()
         for mount in volume_monitor.get_mounts():
             if self._metadata['mountpoint'] == mount.get_root().get_path():
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index a592b21..1b86cb2 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -186,14 +186,14 @@ class VolumesToolbar(Gtk.Toolbar):
         GObject.idle_add(self._set_up_volumes)
 
     def __destroy_cb(self, widget):
-        volume_monitor = Gio.volume_monitor_get()
+        volume_monitor = Gio.VolumeMonitor.get()
         volume_monitor.disconnect(self._mount_added_hid)
         volume_monitor.disconnect(self._mount_removed_hid)
 
     def _set_up_volumes(self):
         self._set_up_documents_button()
 
-        volume_monitor = Gio.volume_monitor_get()
+        volume_monitor = Gio.VolumeMonitor.get()
         self._mount_added_hid = volume_monitor.connect('mount-added',
                                                        self.__mount_added_cb)
         self._mount_removed_hid = volume_monitor.connect('mount-removed',
@@ -292,7 +292,7 @@ class BaseButton(RadioToolButton):
         self.mount_point = mount_point
 
         self.drag_dest_set(Gtk.DestDefaults.ALL,
-                           [('journal-object-id', 0, 0)],
+                           [Gtk.TargetEntry.new('journal-object-id', 0, 0)],
                            Gdk.DragAction.COPY)
         self.connect('drag-data-received', self._drag_data_received_cb)
 
diff --git a/src/jarabe/model/mimeregistry.py b/src/jarabe/model/mimeregistry.py
index 87e14cd..cb908b6 100644
--- a/src/jarabe/model/mimeregistry.py
+++ b/src/jarabe/model/mimeregistry.py
@@ -32,10 +32,10 @@ class MimeRegistry(object):
         self._gconf = GConf.Client.get_default()
 
     def get_default_activity(self, mime_type):
-        return self._GConf.get_string(_key_name(mime_type))
+        return self._gconf.get_string(_key_name(mime_type))
 
     def set_default_activity(self, mime_type, bundle_id):
-        self._GConf.set_string(_key_name(mime_type), bundle_id)
+        self._gconf.set_string(_key_name(mime_type), bundle_id)
 
 
 def get_registry():
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index 3721dac..0d42c3f 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -39,7 +39,7 @@ class TabbingHandler(object):
 
             screen = Gdk.Screen.get_default()
             window = screen.get_root_window()
-            keyboard_grab_result = Gdk.keyboard_grab(window)
+            keyboard_grab_result = Gdk.keyboard_grab(window, False)
             pointer_grab_result = Gdk.pointer_grab(window)
 
             self._tabbing = (keyboard_grab_result == Gdk.GrabStatus.SUCCESS and