From 03851db458a64457328268169ce66ea48834294a Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Mon, 31 Dec 2012 18:57:02 +0000 Subject: [PATCH] Changes for gtk3 clipboard to work svn: r20913 --- gramps/gui/clipboard.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gramps/gui/clipboard.py b/gramps/gui/clipboard.py index 0c692720c..1c6e7ccf4 100644 --- a/gramps/gui/clipboard.py +++ b/gramps/gui/clipboard.py @@ -1163,7 +1163,7 @@ class ClipboardListView(object): def object_drag_data_get(self, widget, context, sel_data, info, time): tree_selection = widget.get_selection() model, paths = tree_selection.get_selected_rows() - tgs = context.list_targets() + tgs = context.targets if len(paths) == 1: path = paths[0] node = model.get_iter(path) @@ -1181,7 +1181,7 @@ class ClipboardListView(object): time, title=None, value=None, dbid=None, dbname=None): model = widget.get_model() - sel_data = selection.get_data() + sel_data = selection.data # In Windows time is always zero. Until that is fixed, use the seconds # of the local time to filter out double drops. realTime = strftime("%S") @@ -1212,7 +1212,7 @@ class ClipboardListView(object): if dragtype in self._target_type_to_wrapper_class_map: possible_wrappers = [dragtype] else: - tgs = [atm.name() for atm in context.list_targets()] + tgs = context.targets possible_wrappers = [target for target in tgs if target in self._target_type_to_wrapper_class_map] @@ -1246,7 +1246,7 @@ class ClipboardListView(object): data = [o.__class__.DRAG_TARGET.drag_type, o, None, o._type, o._value, o._dbid, o._dbname] contains = model_contains(model, data) - if context.get_actions() != Gdk.DragAction.MOVE and contains: + if context.action != Gdk.DragAction.MOVE and contains: continue drop_info = widget.get_dest_row_at_pos(x, y) if drop_info: @@ -1263,7 +1263,7 @@ class ClipboardListView(object): # FIXME: there is one bug here: if you multi-select and drop # on self, then it moves the first, and copies the rest. - if context.get_actions() == Gdk.DragAction.MOVE: + if context.action == Gdk.DragAction.MOVE: context.finish(True, True, time) # remember time for double drop workaround.