From 9fef706518ddb2d6369703d85f71793d8c9f8776 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sat, 24 Nov 2001 21:56:31 +0000
Subject: [PATCH] Fix in Merge.py for list handling

svn: r580
---
 gramps/src/AbiWordDoc.py    | 1 +
 gramps/src/EditPerson.py    | 1 +
 gramps/src/OpenOfficeDoc.py | 1 +
 gramps/src/RelImage.py      | 1 +
 gramps/src/const.py         | 7 -------
 gramps/src/plugins/Merge.py | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gramps/src/AbiWordDoc.py b/gramps/src/AbiWordDoc.py
index ee027e36b..87cca9be5 100644
--- a/gramps/src/AbiWordDoc.py
+++ b/gramps/src/AbiWordDoc.py
@@ -104,6 +104,7 @@ class AbiWordDoc(TextDoc):
         self.f.close()
 
     def add_photo(self,pos,name,x_cm,y_cm):
+        import gtk
         import GdkImlib
 
         image = GdkImlib.Image(name)
diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py
index 9c967ea95..df40ff746 100644
--- a/gramps/src/EditPerson.py
+++ b/gramps/src/EditPerson.py
@@ -30,6 +30,7 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
+import gtk
 from gnome.ui import GnomeErrorDialog, GnomeWarningDialog, GnomeQuestionDialog
 import libglade
 import GdkImlib
diff --git a/gramps/src/OpenOfficeDoc.py b/gramps/src/OpenOfficeDoc.py
index b55d54f71..ad28fd9f0 100644
--- a/gramps/src/OpenOfficeDoc.py
+++ b/gramps/src/OpenOfficeDoc.py
@@ -230,6 +230,7 @@ class OpenOfficeDoc(TextDoc):
         self._write_zip()
 
     def add_photo(self,name,pos,x_cm,y_cm):
+        import gtk
         import GdkImlib
 
         image = GdkImlib.Image(name)
diff --git a/gramps/src/RelImage.py b/gramps/src/RelImage.py
index 10fdb2e56..d56ed3cf7 100644
--- a/gramps/src/RelImage.py
+++ b/gramps/src/RelImage.py
@@ -31,6 +31,7 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
+import gtk
 from gnome.ui import GnomeErrorDialog, GnomeWarningDialog
 
 #-------------------------------------------------------------------------
diff --git a/gramps/src/const.py b/gramps/src/const.py
index 9b2c4e58f..cac39d1d0 100644
--- a/gramps/src/const.py
+++ b/gramps/src/const.py
@@ -33,13 +33,6 @@ import os
 from intl import gettext
 _ = gettext
 
-#-------------------------------------------------------------------------
-#
-# GNOME/GTK
-#
-#-------------------------------------------------------------------------
-from GdkImlib import create_image_from_xpm
-
 #-------------------------------------------------------------------------
 #
 # Paths to external programs
diff --git a/gramps/src/plugins/Merge.py b/gramps/src/plugins/Merge.py
index 17342d37f..ce37854bf 100644
--- a/gramps/src/plugins/Merge.py
+++ b/gramps/src/plugins/Merge.py
@@ -225,7 +225,7 @@ class Merge:
                 p2 = self.dellist[p2]
             if p1 == p2:
                 continue
-            list.append(c,p1,p2)
+            list.append((c,p1,p2))
         list.sort()
         list.reverse()