[shotwell] Revert "Incl matching folder names keyword search: Closes bgo#722756"

[Jim Nelson <jnelson src gnome org>]

commit 6321cbf488c147e394e52c77badfed34f33352f6
Author: Jim Nelson <jim yorba org>
Date:   Tue Feb 11 14:08:58 2014 -0800

    Revert "Incl matching folder names keyword search: Closes bgo#722756"
    
    This reverts commit 51f04e9c1f9c8605a9945a63d93681823fc39c50.

 THANKS                           |    1 -
 src/MediaDataRepresentation.vala |   18 +-----------------
 2 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/THANKS b/THANKS
index 64b3ef2..c609bc5 100644
--- a/THANKS
+++ b/THANKS
@@ -57,7 +57,6 @@ Norbert Preining <preining logic at>
 Nikola Radovanovic <nrad eunet rs>
 Tobias Rapp <yahuxo gmx de>
 Louis-Francis Ratté-Boulianne <louis-francis ratte-boulianne com>
-ritchiew <rawilson52 gmail com>
 Martin Robinson <martin james robinson gmail com>
 Laurent Rocher <rocher laurent gmail com>
 Alexandre Rosenfeld <alexandre rosenfeld gmail com>
diff --git a/src/MediaDataRepresentation.vala b/src/MediaDataRepresentation.vala
index 21b4a63..6a54718 100644
--- a/src/MediaDataRepresentation.vala
+++ b/src/MediaDataRepresentation.vala
@@ -80,11 +80,10 @@ public abstract class MediaSource : ThumbnailSource, Indexable {
     }
     
     private void update_indexable_keywords() {
-        string[] indexables = new string[4];
+        string[] indexables = new string[3];
         indexables[0] = get_title();
         indexables[1] = get_basename();
         indexables[2] = get_comment();
-        indexables[3] = get_keywords_from_path();
         
         indexable_keywords = prepare_indexable_strings(indexables);
     }
@@ -149,21 +148,6 @@ public abstract class MediaSource : ThumbnailSource, Indexable {
         return get_file().get_basename();
     }
     
-    // If in library, match anywhere along the library's children directories, otherwise
-    // only match against the photo's parent directory
-    public string get_keywords_from_path(){
-        File parent = get_master_file().get_parent();
-        string path_keywords = parent.get_basename();
-        if (AppDirs.is_in_import_dir(get_file())){
-            parent = parent.get_parent();
-            while(!parent.equal(AppDirs.get_import_dir())){
-                path_keywords += " " + parent.get_basename();
-                parent = parent.get_parent();
-            }
-        }
-        return path_keywords;
-    }
-    
     public abstract File get_file();
     public abstract File get_master_file();
     public abstract uint64 get_master_filesize();