From db1c7c4b2516314d22d42a3f581994055ef57d07 Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Sat, 5 Mar 2011 09:41:05 +0000
Subject: [PATCH] Fixed a bug where the keywords entry was not being displayed
 and therefore only Active Image and Description were being displayed.

svn: r16759
---
 src/plugins/gramplet/MediaMetadata.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/plugins/gramplet/MediaMetadata.py b/src/plugins/gramplet/MediaMetadata.py
index 25cd8896e..7bb2603f7 100644
--- a/src/plugins/gramplet/MediaMetadata.py
+++ b/src/plugins/gramplet/MediaMetadata.py
@@ -444,21 +444,11 @@ def _get_value(KeyTag, image):
     @param: image -- pyexiv2 ImageMetadata instance
     """
 
-    # Exif KeyValue Family?
-    if "Exif" in KeyTag:
-        try:
-            KeyValue = image[KeyTag].raw_value
+    try:
+        KeyValue = image[KeyTag].raw_value
 
-        except KeyError:
-            KeyValue = ""
-
-    # Iptc KeyValue family?
-    else:
-        try:
-            KeyValue = image[KeyTag]
-
-        except KeyError:
-            KeyValue = ""
+    except KeyError:
+        KeyValue = ""
 
     return KeyValue