[rygel/wip/track-changes: 18/18] wip: Strip ws and newlines from lastchange

[Jens Georg <jensgeorg src gnome org>]

commit ae2f51c397758a1e10a75068c8d8b38b7e9714a1
Author: Jens Georg <jensg openismus com>
Date:   Sun Oct 21 19:07:54 2012 +0200

    wip: Strip ws and newlines from lastchange

 src/librygel-server/rygel-last-change-entry.vala   |   10 +++++-----
 src/librygel-server/rygel-last-change-obj-add.vala |    6 +++---
 src/librygel-server/rygel-last-change-obj-del.vala |    2 +-
 src/librygel-server/rygel-last-change-obj-mod.vala |    2 +-
 src/librygel-server/rygel-last-change.vala         |   18 +++++++++---------
 5 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/librygel-server/rygel-last-change-entry.vala b/src/librygel-server/rygel-last-change-entry.vala
index d547761..7130fef 100644
--- a/src/librygel-server/rygel-last-change-entry.vala
+++ b/src/librygel-server/rygel-last-change-entry.vala
@@ -39,14 +39,14 @@ internal abstract class Rygel.LastChangeEntry : Object {
         var str = new StringBuilder ();
         var info = this.additional_info ();
 
-        str.append ("  <" + this.tag + "\n" +
-                    "   objID=\"" + this.id + "\"\n" +
-                    "   updateID=\"" + this.update_id.to_string () + "\"");
+        str.append ("<" + this.tag + " " +
+                    "objID=\"" + this.id + "\" " +
+                    "updateID=\"" + this.update_id.to_string () + "\"");
 
         if (info.length > 0) {
-            str.append ("\n" + info);
+            str.append (" " + info);
         }
-        str.append ("/>\n");
+        str.append ("/>");
 
         return str.str;
     }
diff --git a/src/librygel-server/rygel-last-change-obj-add.vala b/src/librygel-server/rygel-last-change-obj-add.vala
index c95e120..fe7886a 100644
--- a/src/librygel-server/rygel-last-change-obj-add.vala
+++ b/src/librygel-server/rygel-last-change-obj-add.vala
@@ -42,9 +42,9 @@ internal class Rygel.LastChangeObjAdd : Rygel.LastChangeEntry {
         var str = new StringBuilder ();
         var st_update = (this.sub_tree_update ? "1" : "0");
 
-        str.append ("   stUpdate=\"" + st_update + "\"\n" +
-                    "   objParentID=\"" + this.parent_id + "\"\n" +
-                    "   objClass=\"" + this.upnp_class + "\"");
+        str.append ("stUpdate=\"" + st_update + "\" " +
+                    "objParentID=\"" + this.parent_id + "\" " +
+                    "objClass=\"" + this.upnp_class + "\"");
 
         return str.str;
     }
diff --git a/src/librygel-server/rygel-last-change-obj-del.vala b/src/librygel-server/rygel-last-change-obj-del.vala
index 6598715..5c50267 100644
--- a/src/librygel-server/rygel-last-change-obj-del.vala
+++ b/src/librygel-server/rygel-last-change-obj-del.vala
@@ -36,7 +36,7 @@ internal class Rygel.LastChangeObjDel : Rygel.LastChangeEntry {
         var str = new StringBuilder ();
         var st_update = (this.sub_tree_update ? "1" : "0");
 
-        str.append ("   stUpdate=\"" + st_update + "\"");
+        str.append ("stUpdate=\"" + st_update + "\"");
 
         return str.str;
     }
diff --git a/src/librygel-server/rygel-last-change-obj-mod.vala b/src/librygel-server/rygel-last-change-obj-mod.vala
index 80e4db6..b17a100 100644
--- a/src/librygel-server/rygel-last-change-obj-mod.vala
+++ b/src/librygel-server/rygel-last-change-obj-mod.vala
@@ -36,7 +36,7 @@ internal class Rygel.LastChangeObjMod : Rygel.LastChangeEntry {
         var str = new StringBuilder ();
         var st_update = (this.sub_tree_update ? "1" : "0");
 
-        str.append ("   stUpdate=\"" + st_update + "\"");
+        str.append ("stUpdate=\"" + st_update + "\"");
 
         return str.str;
     }
diff --git a/src/librygel-server/rygel-last-change.vala b/src/librygel-server/rygel-last-change.vala
index 312ba3f..93061d3 100644
--- a/src/librygel-server/rygel-last-change.vala
+++ b/src/librygel-server/rygel-last-change.vala
@@ -24,16 +24,16 @@ using Gee;
 // Helper class for building ContentDirectory LastChange messages
 internal class Rygel.LastChange : Object {
     private const string HEADER =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-        "<StateEvent\n" +
-        " xmlns=\"urn:schemas-upnp-org:av:cds-event\"\n" +
-        " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n"; +
-        " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
-        " xsi:schemaLocation=\"\n" +
-        "   urn:schemas-upnp-org:av:cds-event\n" +
-        "   http://www.upnp.org/schemas/av/cds-events.xsd\";>\n";
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+        "<StateEvent " +
+         "xmlns=\"urn:schemas-upnp-org:av:cds-event\" " +
+         "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"; " +
+         "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " +
+         "xsi:schemaLocation=\"" +
+            "urn:schemas-upnp-org:av:cds-event" +
+            "http://www.upnp.org/schemas/av/cds-events.xsd\";>";
 
-    private const string FOOTER = "</StateEvent>\n";
+    private const string FOOTER = "</StateEvent>";
 
     private LinkedList<LastChangeEntry> entries;
     private StringBuilder str;