[rygel] core: Use 'const' rather than 'static' for constants



commit 0d4a66004db2cab487a6285029a8aa9168d2ac9e
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Oct 18 21:19:17 2011 +0300

    core: Use 'const' rather than 'static' for constants
    
    https://bugzilla.gnome.org/show_bug.cgi?id=661336

 src/rygel/rygel-client-hacks.vala    |    4 ++--
 src/rygel/rygel-panasonic-hacks.vala |    2 +-
 src/rygel/rygel-xbox-hacks.vala      |   14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/rygel/rygel-client-hacks.vala b/src/rygel/rygel-client-hacks.vala
index baf7380..de74a70 100644
--- a/src/rygel/rygel-client-hacks.vala
+++ b/src/rygel/rygel-client-hacks.vala
@@ -29,7 +29,7 @@ internal errordomain Rygel.ClientHacksError {
 }
 
 internal abstract class Rygel.ClientHacks : GLib.Object {
-    private static string OBJECT_ID = "ObjectID";
+    private const string CORRECT_OBJECT_ID = "ObjectID";
 
     public unowned string object_id { get; protected set; }
 
@@ -68,7 +68,7 @@ internal abstract class Rygel.ClientHacks : GLib.Object {
             this.check_headers (headers);
         }
 
-        this.object_id = OBJECT_ID;
+        this.object_id = CORRECT_OBJECT_ID;
     }
 
     public bool is_album_art_request (Soup.Message message) {
diff --git a/src/rygel/rygel-panasonic-hacks.vala b/src/rygel/rygel-panasonic-hacks.vala
index 5a3a56f..e13a6a1 100644
--- a/src/rygel/rygel-panasonic-hacks.vala
+++ b/src/rygel/rygel-panasonic-hacks.vala
@@ -24,7 +24,7 @@ using Soup;
 using GUPnP;
 
 internal class Rygel.PanasonicHacks : ClientHacks {
-    private static string AGENT = ".*Panasonic MIL DLNA CP.*";
+    private const string AGENT = ".*Panasonic MIL DLNA CP.*";
 
     private static Regex mime_regex;
     private static Regex dlna_regex;
diff --git a/src/rygel/rygel-xbox-hacks.vala b/src/rygel/rygel-xbox-hacks.vala
index 2d61326..92c4d0c 100644
--- a/src/rygel/rygel-xbox-hacks.vala
+++ b/src/rygel/rygel-xbox-hacks.vala
@@ -25,14 +25,14 @@ using Soup;
 using GUPnP;
 
 internal class Rygel.XBoxHacks : ClientHacks {
-    private static string AGENT =
+    private const string AGENT =
         ".*Xbox.*|.*Allegro-Software-WebClient.*|.*SEC_HHP_Galaxy S/1\\.0.*";
-    private static string DMS = "urn:schemas-upnp-org:device:MediaServer";
-    private static string DMS_V1 = DMS + ":1";
-    private static string FRIENDLY_NAME_POSTFIX = ":";
-    private static string MODEL_NAME = "Windows Media Player Sharing";
-    private static string MODEL_VERSION = "11";
-    private static string CONTAINER_ID = "ContainerID";
+    private const string DMS = "urn:schemas-upnp-org:device:MediaServer";
+    private const string DMS_V1 = DMS + ":1";
+    private const string FRIENDLY_NAME_POSTFIX = ":";
+    private const string MODEL_NAME = "Windows Media Player Sharing";
+    private const string MODEL_VERSION = "11";
+    private const string CONTAINER_ID = "ContainerID";
 
     public XBoxHacks () throws ClientHacksError {
         base (AGENT);



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