media-export: Fix critical warnings
authorJens Georg <mail@jensge.org>
Fri, 11 Sep 2009 23:08:06 +0000 (01:08 +0200)
committerJens Georg <mail@jensge.org>
Tue, 15 Sep 2009 14:06:36 +0000 (16:06 +0200)
src/plugins/media-export/rygel-media-export-harvester.vala
src/plugins/media-export/rygel-media-export-root-container.vala
src/ui/Makefile.am

index 20c533d..c931303 100644 (file)
@@ -95,8 +95,8 @@ public class Rygel.MediaExportHarvester : GLib.Object {
 
             if (this.files.get_length() == 0 &&
                     this.containers.get_length () != 0) {
+                this.containers.peek_head ().updated ();
                 this.containers.pop_head ();
-            this.containers.peek_head ().updated ();
             }
         } catch (MediaDBError err) {
             warning("Failed to get children of container %s: %s",
index dd41f4b..97dd721 100644 (file)
@@ -182,7 +182,7 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer {
                 if (obj != null) {
                     this.media_db.delete_object (obj);
                     if (obj.parent != null) {
-                        parent.updated ();
+                        obj.parent.updated ();
                     }
                 }
                 break;
index 9d62e0e..cb259d4 100644 (file)
@@ -36,14 +36,14 @@ rygel_preferences_VALAFLAGS = \
        --pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0
 
 rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
-                         $(LIBGUPNP_AV_LIBS) \
+                          $(LIBGUPNP_AV_LIBS) \
                           $(LIBGSTREAMER_LIBS) \
                           $(GIO_LIBS) \
                           $(GEE_LIBS) \
                           $(UUID_LIBS) \
                           $(LIBSOUP_LIBS) \
                           $(GTK_LIBS) \
-                         $(LIBDBUS_GLIB_LIBS) \
+                          $(LIBDBUS_GLIB_LIBS) \
                           -L$(abs_top_builddir)/src/rygel \
                           -lrygel-configuration
 rygel_preferences_LDFLAGS = -export-dynamic