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