[rygel] More style consistency fixes for Folder plugin

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit c258936c4552be24660d40213b32064252750eaf
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sun May 3 22:53:24 2009 +0300

    More style consistency fixes for Folder plugin
---
 src/plugins/folder/rygel-folder-container.vala     |    8 ++----
 .../rygel-folder-directory-search-result.vala      |   25 +++++++++----------
 .../folder/rygel-folder-gio-media-item.vala        |    6 +---
 .../folder/rygel-folder-root-container.vala        |    8 ++++--
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/plugins/folder/rygel-folder-container.vala b/src/plugins/folder/rygel-folder-container.vala
index 964e773..040801c 100644
--- a/src/plugins/folder/rygel-folder-container.vala
+++ b/src/plugins/folder/rygel-folder-container.vala
@@ -69,8 +69,7 @@ public class Rygel.FolderContainer : MediaContainer {
                                 null,
                                 res.enumerate_children_ready);
             this.results.add (res);
-        }
-        else {
+        } else {
             uint stop = offset + max_count;
             stop = stop.clamp (0, this.child_count);
             var children = this.items.slice ((int) offset, (int) stop);
@@ -96,8 +95,7 @@ public class Rygel.FolderContainer : MediaContainer {
             this.child_count = this.items.size;
             this.results.remove (res);
             return dsr.get_children ();
-        }
-        else {
+        } else {
             var simple_res = (Rygel.SimpleAsyncResult<Gee.List<MediaObject>>)
                             res;
             return simple_res.data;
@@ -161,7 +159,7 @@ public class Rygel.FolderContainer : MediaContainer {
      */
     public FolderContainer (MediaContainer parent, File file, bool full) {
         string id = Checksum.compute_for_string (ChecksumType.MD5, 
-                                                file.get_uri ());
+                                                 file.get_uri ());
 
         base(id, parent, file.get_basename (), 0);
         this.root_dir = file;
diff --git a/src/plugins/folder/rygel-folder-directory-search-result.vala b/src/plugins/folder/rygel-folder-directory-search-result.vala
index 6c6a031..58f18c1 100644
--- a/src/plugins/folder/rygel-folder-directory-search-result.vala
+++ b/src/plugins/folder/rygel-folder-directory-search-result.vala
@@ -43,22 +43,23 @@ public class Rygel.FolderDirectorySearchResult :
 
     public void enumerator_closed (Object obj, AsyncResult res) {
         var enumerator = (FileEnumerator) obj;
+
         try {
             enumerator.close_finish (res);
-        }
-        catch (Error e) {
+        } catch (Error e) {
             this.error = e;
         }
+
         this.complete();
     }
 
     public void enumerate_next_ready (Object obj, AsyncResult res) {
         var enumerator = (FileEnumerator) obj;
         try {
-            var list = enumerator.next_files_finish(res);
+            var list = enumerator.next_files_finish (res);
             if (list != null) {
                 foreach (FileInfo file_info in list) {
-                    var f = file.get_child(file_info.get_name());
+                    var f = file.get_child (file_info.get_name ());
                     MediaObject item = null;
                     if (file_info.get_file_type () == FileType.DIRECTORY) {
                         item = new Rygel.FolderContainer (
@@ -66,28 +67,25 @@ public class Rygel.FolderDirectorySearchResult :
                                                f, 
                                                false);
 
-                    }
-                    else {
+                    } else {
                         try {
                             item = FolderGioMediaItem.create (
                                         (MediaContainer) source_object, 
                                         f, 
                                         file_info);
-                        } 
-                        catch (Error error) {
+                        }  catch (Error error) {
                         }
                     }
 
                     if (item != null) {
                         data.add (item);
                     }
-
                 }
+
                 enumerator.next_files_async (MAX_CHILDREN,
                                              Priority.DEFAULT,
                                              null, enumerate_next_ready);
-            }
-            else {
+            } else {
                 enumerator.close_async (Priority.DEFAULT,
                                         null, 
                                         enumerator_closed);
@@ -101,14 +99,15 @@ public class Rygel.FolderDirectorySearchResult :
 
     public void enumerate_children_ready(Object obj, AsyncResult res) {
         file = (File) obj;
+
         try {
             var enumerator = file.enumerate_children_finish (res);
+
             enumerator.next_files_async (MAX_CHILDREN,
                                          Priority.DEFAULT,
                                          null, 
                                          enumerate_next_ready);
-        }
-        catch (Error error) {
+        } catch (Error error) {
             this.error = error;
             this.complete ();
         }
diff --git a/src/plugins/folder/rygel-folder-gio-media-item.vala b/src/plugins/folder/rygel-folder-gio-media-item.vala
index 605cbb3..d410091 100644
--- a/src/plugins/folder/rygel-folder-gio-media-item.vala
+++ b/src/plugins/folder/rygel-folder-gio-media-item.vala
@@ -32,11 +32,9 @@ public class Rygel.FolderGioMediaItem : Rygel.MediaItem {
     private static string? get_upnp_class (string content_type) {
         if (content_type.has_prefix ("video/")) {
             return MediaItem.VIDEO_CLASS;
-        }
-        else if (content_type.has_prefix ("audio/")) {
+        } else if (content_type.has_prefix ("audio/")) {
             return MediaItem.AUDIO_CLASS;
-        }
-        else if (content_type.has_prefix ("image/")) {
+        } else if (content_type.has_prefix ("image/")) {
             return MediaItem.IMAGE_CLASS;
         }
 
diff --git a/src/plugins/folder/rygel-folder-root-container.vala b/src/plugins/folder/rygel-folder-root-container.vala
index 8f91593..8865fa9 100644
--- a/src/plugins/folder/rygel-folder-root-container.vala
+++ b/src/plugins/folder/rygel-folder-root-container.vala
@@ -39,7 +39,7 @@ public class Rygel.FolderRootContainer : MediaContainer {
         stop = stop.clamp (0, this.child_count);
         var children = this.items.slice ((int) offset, (int) stop);
         var res = new Rygel.SimpleAsyncResult<Gee.List<MediaObject>> (this, 
-                                                callback);
+                                                                      callback);
         res.data = children;
         res.complete_in_idle ();
     }
@@ -48,6 +48,7 @@ public class Rygel.FolderRootContainer : MediaContainer {
                                                     AsyncResult res) 
                                                     throws GLib.Error {
         var simple_res = (Rygel.SimpleAsyncResult<Gee.List<MediaObject>>) res;
+
         return simple_res.data;
     }
 
@@ -97,14 +98,15 @@ public class Rygel.FolderRootContainer : MediaContainer {
      */
     public FolderRootContainer () {
         base.root ("FolderRoot", 0);
+
         GConf.Client client = GConf.Client.get_default ();
         this.items = new ArrayList<FolderContainer> ();
         unowned SList<string> dirs = null;
+
         try {
             dirs = client.get_list ("/apps/rygel/Folder/folder", 
                                     GConf.ValueType.STRING);
-        }
-        catch (GLib.Error error) {
+        } catch (GLib.Error error) {
             message("Error fetching configuration, error was %s", 
                     error.message);
         }