Fixed a bug where the keywords entry was not being displayed and therefore only Active Image and Description were being displayed.

svn: r16759
2011-03-05 09:41:05 +00:00 · 2011-03-05 09:41:05 +00:00 · db1c7c4b25
commit db1c7c4b25
parent d8d4acb2e0
1 changed files with 4 additions and 14 deletions
--- 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