[rygel] media-export: Initialize fields in constructor only



commit e7e970af1c2c6fc227a3d3da6633c98cd32bcbec
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sun Feb 14 17:30:27 2010 +0200

    media-export: Initialize fields in constructor only
    
    We shouldn't be doing anything other than instantiation in singleton's
    instance getter static method.

 .../rygel-media-export-root-container.vala         |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala
index d21dd4d..02fc038 100644
--- a/src/plugins/media-export/rygel-media-export-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-root-container.vala
@@ -95,11 +95,8 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer {
     public static MediaContainer get_instance() {
         if (MediaExportRootContainer.instance == null) {
             try {
-                var db = MediaDB.create_with_factory (
-                                        "media-export",
-                                        new MediaExportObjectFactory ());
                 MediaExportRootContainer.instance =
-                                             new MediaExportRootContainer (db);
+                                             new MediaExportRootContainer ();
             } catch (MediaDBError err) {
                 warning("Failed to create instance of database");
                 MediaExportRootContainer.instance = new NullContainer ();
@@ -143,7 +140,10 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer {
     /**
      * Create a new root container.
      */
-    private MediaExportRootContainer (MediaDB db) {
+    private MediaExportRootContainer () throws MediaDBError {
+        var object_factory = new MediaExportObjectFactory ();
+        var db = MediaDB.create_with_factory ("media-export", object_factory);
+
         base (db, "0", "MediaExportRoot");
 
         this.extractor = MetadataExtractor.create ();



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