[rygel] DirectorySearchResult adheres the style guide

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 387f8ccc5fdd958b5f6d9f198b3b62ceb6b868cb
Author: Jens Georg <mail jensge org>
Date:   Sun May 3 00:49:43 2009 +0200

    DirectorySearchResult adheres the style guide
---
 ...a => rygel-folder-directory-search-result.vala} |   10 ++++------
 .../folder/rygel-folder-foldercontainer.vala       |    7 +++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/plugins/folder/rygel-folder-directorysearch.vala b/src/plugins/folder/rygel-folder-directory-search-result.vala
similarity index 88%
rename from src/plugins/folder/rygel-folder-directorysearch.vala
rename to src/plugins/folder/rygel-folder-directory-search-result.vala
index 3e77088..b914e1b 100644
--- a/src/plugins/folder/rygel-folder-directorysearch.vala
+++ b/src/plugins/folder/rygel-folder-directory-search-result.vala
@@ -22,14 +22,14 @@ using Gee;
 using Rygel;
 using GLib;
 
-public class Folder.DirectorySearchResult : Rygel.SimpleAsyncResult<Gee.List<MediaObject>> {
+public class Rygel.FolderDirectorySearchResult : Rygel.SimpleAsyncResult<Gee.List<MediaObject>> {
     private uint max_count;
     private uint offset;
     private File file;
 
     private const int MAX_CHILDREN = 10;
 
-    public DirectorySearchResult(MediaContainer parent, uint offset, uint max_count, AsyncReadyCallback callback) {
+    public FolderDirectorySearchResult(MediaContainer parent, uint offset, uint max_count, AsyncReadyCallback callback) {
         base(parent, callback);
 
         this.data = new ArrayList<MediaObject>();
@@ -68,17 +68,16 @@ public class Folder.DirectorySearchResult : Rygel.SimpleAsyncResult<Gee.List<Med
             var list = enumerator.next_files_finish(res);
             if (list != null) {
                 foreach (FileInfo file_info in list) {
-                    debug("new file info");
                     var f = file.get_child(file_info.get_name());
                         MediaObject item = null;
                         if (file_info.get_file_type() == FileType.DIRECTORY) {
-                            item = new FolderContainer((MediaContainer)source_object, 
+                            item = new Folder.FolderContainer((MediaContainer)source_object, 
                                                        f, false);
 
                         }
                         else {
                             var upnp_class = get_upnp_class_from_content_type(file_info.get_content_type());
-                            item = new FilesystemMediaItem((MediaContainer)source_object, f, upnp_class, file_info);
+                            item = new Folder.FilesystemMediaItem((MediaContainer)source_object, f, upnp_class, file_info);
                         }
                         if (item != null)
                             data.add(item);
@@ -101,7 +100,6 @@ public class Folder.DirectorySearchResult : Rygel.SimpleAsyncResult<Gee.List<Med
 
     public void enumerate_children_ready(Object obj, AsyncResult res) {
         file = (File)obj;
-        debug("enumerate ready");
         try {
             var enumerator = file.enumerate_children_finish(res);
             enumerator.next_files_async(MAX_CHILDREN,
diff --git a/src/plugins/folder/rygel-folder-foldercontainer.vala b/src/plugins/folder/rygel-folder-foldercontainer.vala
index 11e6f49..7c0ad5a 100644
--- a/src/plugins/folder/rygel-folder-foldercontainer.vala
+++ b/src/plugins/folder/rygel-folder-foldercontainer.vala
@@ -49,9 +49,8 @@ public class Folder.FolderContainer : MediaContainer {
                                       Cancellable? cancellable, 
                                       AsyncReadyCallback callback)
     {
-        debug("GetChildren called");
         if (items.size == 0) {
-            DirectorySearchResult res = new DirectorySearchResult(this, offset, max_count, callback);
+            var res = new FolderDirectorySearchResult(this, offset, max_count, callback);
             root_dir.enumerate_children_async(FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE + "," +
                                               FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME + "," +
                                               FILE_ATTRIBUTE_STANDARD_TYPE + "," +
@@ -73,8 +72,8 @@ public class Folder.FolderContainer : MediaContainer {
     }
 
     public override Gee.List<MediaObject>? get_children_finish (AsyncResult res) throws GLib.Error {
-        if (res is DirectorySearchResult) {
-            var dsr = (DirectorySearchResult)res;
+        if (res is FolderDirectorySearchResult) {
+            var dsr = (FolderDirectorySearchResult)res;
             foreach (var item in dsr.data) {
                 this.items.add(item);
             }