Fix in Merge.py for list handling

svn: r580

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)

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

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)

gramps/src/RelImage.py

@@ -31,6 +31,7 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
+import gtk
 from gnome.ui import GnomeErrorDialog, GnomeWarningDialog
 
 #-------------------------------------------------------------------------

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

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()