[rygel] Make FolderContainer adhere style guide



commit 49472a8d12cba1de906feafbcb334887d3f23fe4
Author: Jens Georg <mail jensge org>
Date:   Sun May 3 00:58:02 2009 +0200

    Make FolderContainer adhere style guide
---
 src/plugins/folder/Makefile.am                     |   13 ++++++-------
 ...rcontainer.vala => rygel-folder-container.vala} |    2 +-
 .../rygel-folder-directory-search-result.vala      |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/plugins/folder/Makefile.am b/src/plugins/folder/Makefile.am
index 8da68c2..e3493e3 100644
--- a/src/plugins/folder/Makefile.am
+++ b/src/plugins/folder/Makefile.am
@@ -12,8 +12,8 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 
 BUILT_SOURCES = rygel-media-folder.stamp \
 	rygel-folder-rootcontainer.c \
-	rygel-folder-foldercontainer.c \
-	rygel-folder-directorysearch.c \
+	rygel-folder-container.c \
+	rygel-folder-directory-search-result.c \
 	rygel-folder-media-item.c \
 	rygel-folder-plugin.c
 
@@ -22,11 +22,10 @@ librygel_media_folder_la_SOURCES = \
 	rygel-folder-plugin.vala \
 	rygel-folder-rootcontainer.c \
 	rygel-folder-rootcontainer.vala \
-	rygel-folder-foldercontainer.c \
-	rygel-folder-foldercontainer.vala \
-	rygel-folder-directorysearch.vala \
-	rygel-folder-directorysearch.c \
-	rygel-folder-directorysearch.vala \
+	rygel-folder-container.c \
+	rygel-folder-container.vala \
+	rygel-folder-directory-search-result.c \
+	rygel-folder-directory-search-result.vala \
 	rygel-folder-media-item.c \
 	rygel-folder-media-item.vala
 
diff --git a/src/plugins/folder/rygel-folder-foldercontainer.vala b/src/plugins/folder/rygel-folder-container.vala
similarity index 98%
rename from src/plugins/folder/rygel-folder-foldercontainer.vala
rename to src/plugins/folder/rygel-folder-container.vala
index 7c0ad5a..77b49ca 100644
--- a/src/plugins/folder/rygel-folder-foldercontainer.vala
+++ b/src/plugins/folder/rygel-folder-container.vala
@@ -26,7 +26,7 @@ using Rygel;
  * MediaContainer which exposes the contents of a directory 
  * as items
  */
-public class Folder.FolderContainer : MediaContainer {
+public class Rygel.FolderContainer : MediaContainer {
 
     private const int MAX_CHILDREN = 10;
 
diff --git a/src/plugins/folder/rygel-folder-directory-search-result.vala b/src/plugins/folder/rygel-folder-directory-search-result.vala
index b914e1b..30f29ab 100644
--- a/src/plugins/folder/rygel-folder-directory-search-result.vala
+++ b/src/plugins/folder/rygel-folder-directory-search-result.vala
@@ -71,7 +71,7 @@ public class Rygel.FolderDirectorySearchResult : Rygel.SimpleAsyncResult<Gee.Lis
                     var f = file.get_child(file_info.get_name());
                         MediaObject item = null;
                         if (file_info.get_file_type() == FileType.DIRECTORY) {
-                            item = new Folder.FolderContainer((MediaContainer)source_object, 
+                            item = new Rygel.FolderContainer((MediaContainer)source_object, 
                                                        f, false);
 
                         }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]