From 6708e3b6b59a7439615db997a5dfabd330f2df87 Mon Sep 17 00:00:00 2001
From: Nick Hall <nick__hall@hotmail.com>
Date: Wed, 12 Sep 2012 21:35:11 +0000
Subject: [PATCH] Disable loading of pyexiv2 - see bug #6042

svn: r20374
---
 src/gui/utils.py                     |  2 +-
 src/plugins/gramplet/gramplet.gpr.py | 84 ++++++++++++++--------------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/gui/utils.py b/src/gui/utils.py
index 0390ab349..2980cabb3 100644
--- a/src/gui/utils.py
+++ b/src/gui/utils.py
@@ -329,7 +329,7 @@ class SystemFonts(object):
         """
         if SystemFonts.__FONTS is None:
             families = PangoCairo.font_map_get_default().list_families()
-            print ('GRAMPS GTK3: a g_value_get_object warning:')
+            #print ('GRAMPS GTK3: a g_value_get_object warning:')
             SystemFonts.__FONTS = [family.get_name() for family in families]
             SystemFonts.__FONTS.sort()
 
diff --git a/src/plugins/gramplet/gramplet.gpr.py b/src/plugins/gramplet/gramplet.gpr.py
index b6c0dd4bd..e3993c9a8 100644
--- a/src/plugins/gramplet/gramplet.gpr.py
+++ b/src/plugins/gramplet/gramplet.gpr.py
@@ -296,25 +296,26 @@ register(GRAMPLET,
 #------------------------------------------------------------------------
 # Edit Image Exif Metadata class
 #------------------------------------------------------------------------
-register(GRAMPLET, 
-         id                    = "Edit Image Exif Metadata", 
-         name                  = _("Edit Image Exif Metadata"), 
-         description           = _("Gramplet to view, edit, and save image Exif metadata"),
-         height                = 450,
-         expand                = False,
-         gramplet              = 'EditExifMetadata',
-         gramplet_title        = _("Edit Exif Metadata"),
-         detached_width        = 510,
-         detached_height       = 550,
-         version               = '1.5.0',
-         gramps_target_version = '4.0',
-         status                = STABLE,
-         fname                 = "editexifmetadata.py",
-         help_url              = "Edit Image Exif Metadata",
-         authors               = ['Rob G. Healey'],
-         authors_email         = ['robhealey1@gmail.com'],
-         navtypes              = ["Media"],
-    )
+# GTK3 TODO: The pyexiv2 module causes problems - see bug #6042
+#register(GRAMPLET, 
+         #id                    = "Edit Image Exif Metadata", 
+         #name                  = _("Edit Image Exif Metadata"), 
+         #description           = _("Gramplet to view, edit, and save image Exif metadata"),
+         #height                = 450,
+         #expand                = False,
+         #gramplet              = 'EditExifMetadata',
+         #gramplet_title        = _("Edit Exif Metadata"),
+         #detached_width        = 510,
+         #detached_height       = 550,
+         #version               = '1.5.0',
+         #gramps_target_version = '4.0',
+         #status                = STABLE,
+         #fname                 = "editexifmetadata.py",
+         #help_url              = "Edit Image Exif Metadata",
+         #authors               = ['Rob G. Healey'],
+         #authors_email         = ['robhealey1@gmail.com'],
+         #navtypes              = ["Media"],
+    #)
 
 #------------------------------------------------------------------------
 # Bottombar
@@ -375,29 +376,30 @@ register(GRAMPLET,
          navtypes=["Media"],
          )
 
-try:
-    import pyexiv2
-    available = True
-except:
-    import logging
-    logging.warning(_("WARNING: pyexiv2 module not loaded.  "
-                      "Image metadata functionality will not be available."))
-    available = False
+# GTK3 TODO: The pyexiv2 module causes problems - see bug #6042
+#try:
+    #import pyexiv2
+    #available = True
+#except:
+    #import logging
+    #logging.warning(_("WARNING: pyexiv2 module not loaded.  "
+                      #"Image metadata functionality will not be available."))
+    #available = False
 
-if available:
-    register(GRAMPLET, 
-            id = "Metadata Viewer", 
-            name = _("Metadata Viewer"), 
-            description = _("Gramplet showing metadata for a media object"),
-            version = "1.0.0",
-            gramps_target_version = "4.0",
-            status = STABLE,
-            fname = "metadataviewer.py",
-            height = 200,
-            gramplet = 'MetadataViewer',
-            gramplet_title = _("Image Metadata"),
-            navtypes=["Media"],
-            )
+#if available:
+    #register(GRAMPLET, 
+            #id = "Metadata Viewer", 
+            #name = _("Metadata Viewer"), 
+            #description = _("Gramplet showing metadata for a media object"),
+            #version = "1.0.0",
+            #gramps_target_version = "4.0",
+            #status = STABLE,
+            #fname = "metadataviewer.py",
+            #height = 200,
+            #gramplet = 'MetadataViewer',
+            #gramplet_title = _("Image Metadata"),
+            #navtypes=["Media"],
+            #)
 
 register(GRAMPLET, 
          id="Person Residence",