From 01b4a6d993b999516c5e47a0b731a0d4e9a104ca Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Fri, 9 Feb 2007 11:20:46 +0000
Subject: [PATCH] fixed #2176

---
 .../products/gLiveSupport/etc/campcaster-studio.xml | 13 +++++++++++++
 .../gLiveSupport/etc/campcaster-studio.xml.template | 13 +++++++++++++
 .../etc/campcaster-studio.xml.user-template         | 13 +++++++++++++
 .../src/products/gLiveSupport/src/RdsEntry.cxx      |  2 +-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
index 5160b7ec1..b6fafd0c9 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
@@ -14,6 +14,7 @@
                                        taskbarIcons,
                                        testAudioUrl,
                                        serialPort,
+                                       rdsContainer,
                                        metadataTypeContainer,
                                        keyboardShortcutList) >
 
@@ -105,6 +106,12 @@
 <!ELEMENT serialPort     EMPTY                     >
 <!ATTLIST serialPort     path    CDATA   #REQUIRED >
 
+<!ELEMENT rdsContainer   (rdsItem*) >
+<!ELEMENT rdsItem        EMPTY      >
+<!ATTLIST rdsItem        key        CDATA   #REQUIRED >
+<!ATTLIST rdsItem        value      CDATA   #REQUIRED >
+<!ATTLIST rdsItem        enabled    CDATA   #REQUIRED >
+
 <!ELEMENT metadataTypeContainer           (metadataType+)       >
 
 <!ELEMENT metadataType                    (constraint?)         >
@@ -195,6 +202,12 @@
 
     <serialPort     path = "/dev/ttyS0" />
 
+    <rdsContainer>
+        <rdsItem key="PS" value="" enabled="0"/>
+        <rdsItem key="PI" value="" enabled="0"/>
+        <rdsItem key="RT" value="" enabled="0"/>
+    </rdsContainer>
+
     <metadataTypeContainer>
         <metadataType   dcName          = "dc:title"
                         id3Tag          = "TIT2"
diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
index ece9d6f83..00daf7953 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
@@ -14,6 +14,7 @@
                                        taskbarIcons,
                                        testAudioUrl,
                                        serialPort,
+                                       rdsContainer,
                                        metadataTypeContainer,
                                        keyboardShortcutList) >
 
@@ -105,6 +106,12 @@
 <!ELEMENT serialPort     EMPTY                     >
 <!ATTLIST serialPort     path    CDATA   #REQUIRED >
 
+<!ELEMENT rdsContainer   (rdsItem*) >
+<!ELEMENT rdsItem        EMPTY      >
+<!ATTLIST rdsItem        key        CDATA   #REQUIRED >
+<!ATTLIST rdsItem        value      CDATA   #REQUIRED >
+<!ATTLIST rdsItem        enabled    CDATA   #REQUIRED >
+
 <!ELEMENT metadataTypeContainer           (metadataType+)       >
 
 <!ELEMENT metadataType                    (constraint?)         >
@@ -194,6 +201,12 @@
 
     <serialPort     path = "/dev/ttyS0" />
 
+    <rdsContainer>
+        <rdsItem key="PS" value="" enabled="0"/>
+        <rdsItem key="PI" value="" enabled="0"/>
+        <rdsItem key="RT" value="" enabled="0"/>
+    </rdsContainer>
+
     <metadataTypeContainer>
         <metadataType   dcName          = "dc:title"
                         id3Tag          = "TIT2"
diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template
index aeb8f08ea..b6aab5f76 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template
@@ -14,6 +14,7 @@
                                        taskbarIcons,
                                        testAudioUrl,
                                        serialPort,
+                                       rdsContainer,
                                        metadataTypeContainer,
                                        keyboardShortcutList) >
 
@@ -105,6 +106,12 @@
 <!ELEMENT serialPort     EMPTY                     >
 <!ATTLIST serialPort     path    CDATA   #REQUIRED >
 
+<!ELEMENT rdsContainer   (rdsItem*) >
+<!ELEMENT rdsItem        EMPTY      >
+<!ATTLIST rdsItem        key        CDATA   #REQUIRED >
+<!ATTLIST rdsItem        value      CDATA   #REQUIRED >
+<!ATTLIST rdsItem        enabled    CDATA   #REQUIRED >
+
 <!ELEMENT metadataTypeContainer           (metadataType+)       >
 
 <!ELEMENT metadataType                    (constraint?)         >
@@ -194,6 +201,12 @@
 
     <serialPort     path = "/dev/ttyS0" />
 
+    <rdsContainer>
+        <rdsItem key="PS" value="" enabled="0"/>
+        <rdsItem key="PI" value="" enabled="0"/>
+        <rdsItem key="RT" value="" enabled="0"/>
+    </rdsContainer>
+
     <metadataTypeContainer>
         <metadataType   dcName          = "dc:title"
                         id3Tag          = "TIT2"
diff --git a/campcaster/src/products/gLiveSupport/src/RdsEntry.cxx b/campcaster/src/products/gLiveSupport/src/RdsEntry.cxx
index 07111e37d..5d462e85e 100644
--- a/campcaster/src/products/gLiveSupport/src/RdsEntry.cxx
+++ b/campcaster/src/products/gLiveSupport/src/RdsEntry.cxx
@@ -113,7 +113,7 @@ RdsEntry :: saveChanges(Ptr<GLiveSupport>::Ref      gLiveSupport)   throw ()
                     entryBinNow(new const Glib::ustring(entryBin->get_text()));
     
     if (!entryBinSaved || checkBoxNow != checkBoxSaved
-                       || entryBinNow != entryBinSaved) {
+                       || *entryBinNow != *entryBinSaved) {
         Ptr<OptionsContainer>::Ref      optionsContainer =
                                         gLiveSupport->getOptionsContainer();
         optionsContainer->setRdsOptions(type, entryBinNow, checkBoxNow);