[rygel] Don't expose UDN in the config UI



commit a67ce909ed909bede722cd9c2fcca1538fe727b9
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sat May 2 23:20:54 2009 +0300

    Don't expose UDN in the config UI
---
 data/rygel-preferences.ui          |  111 +-----------------------------------
 src/ui/rygel-plugin-pref-page.vala |   12 +----
 2 files changed, 3 insertions(+), 120 deletions(-)

diff --git a/data/rygel-preferences.ui b/data/rygel-preferences.ui
index 80e5d1d..ae1811b 100644
--- a/data/rygel-preferences.ui
+++ b/data/rygel-preferences.ui
@@ -276,40 +276,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox4">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="tracker-udn-label">
-                            <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes">The Unique Device Name (UDN) for this media source. Usually, there is no need to change this.</property>
-                            <property name="label" translatable="yes">UDN</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="tracker-udn-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">The Unique Device Name (UDN) for this media source. Usually, there is no need to change this.</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <property name="width_chars">30</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -387,41 +353,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox6">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="dvb-udn-label">
-                            <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes">The Unique Device Name (UDN) for this media source. Usually, there is no need to change this.</property>
-                            <property name="label" translatable="yes">UDN</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="dvb-udn-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">The Unique Device Name (UDN) for this media source. Usually, there is no need to change this.</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <property name="width_chars">30</property>
-                            <property name="invisible_char_set">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -499,41 +430,6 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox8">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="test-udn-label">
-                            <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes">The Unique Device Name (UDN) for this media source. Usually, there is no need to change this.</property>
-                            <property name="label" translatable="yes">UDN</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="test-udn-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">The Unique Device Name (UDN) for this media source. Usually, there is no need to change this.</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <property name="width_chars">30</property>
-                            <property name="invisible_char_set">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -628,12 +524,9 @@
   </object>
   <object class="GtkSizeGroup" id="plugin-labels-sizegroup">
     <widgets>
-      <widget name="tracker-title-label"/>
-      <widget name="tracker-udn-label"/>
-      <widget name="dvb-title-label"/>
-      <widget name="dvb-udn-label"/>
       <widget name="test-title-label"/>
-      <widget name="test-udn-label"/>
+      <widget name="dvb-title-label"/>
+      <widget name="tracker-title-label"/>
     </widgets>
   </object>
 </interface>
diff --git a/src/ui/rygel-plugin-pref-page.vala b/src/ui/rygel-plugin-pref-page.vala
index 97d9e69..214b633 100644
--- a/src/ui/rygel-plugin-pref-page.vala
+++ b/src/ui/rygel-plugin-pref-page.vala
@@ -25,11 +25,9 @@ using Gtk;
 public class Rygel.PluginPrefPage : PreferencesPage {
     const string ENABLED_CHECK = "-enabled-checkbutton";
     const string TITLE_ENTRY = "-title-entry";
-    const string UDN_ENTRY = "-udn-entry";
 
     private CheckButton enabled_check;
     private Entry title_entry;
-    private Entry udn_entry;
 
     public PluginPrefPage (Builder       builder,
                            Configuration config,
@@ -42,13 +40,9 @@ public class Rygel.PluginPrefPage : PreferencesPage {
         this.title_entry = (Entry) builder.get_object (section.down () +
                                                        TITLE_ENTRY);
         assert (this.title_entry != null);
-        this.udn_entry = (Entry) builder.get_object (section.down () +
-                                                     UDN_ENTRY);
-        assert (this.udn_entry != null);
 
         this.enabled_check.active = config.get_enabled (section);
         this.title_entry.set_text (config.get_title (section));
-        this.udn_entry.set_text (config.get_udn (section));
 
         this.enabled_check.toggled += this.on_enabled_check_toggled;
     }
@@ -60,13 +54,9 @@ public class Rygel.PluginPrefPage : PreferencesPage {
         this.config.set_string (this.section,
                                 Configuration.TITLE_KEY,
                                 this.title_entry.get_text ());
-        this.config.set_string (this.section,
-                                Configuration.UDN_KEY,
-                                this.udn_entry.get_text ());
     }
 
     private void on_enabled_check_toggled (CheckButton enabled_check) {
-        this.title_entry.sensitive =
-        this.udn_entry.sensitive = enabled_check.active;
+        this.title_entry.sensitive = enabled_check.active;
     }
 }



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