[PATCH 1/2] Remove the useless, confusing and lying PoolsNote

Vratislav Podzimek vpodzime at redhat.com
Tue Jul 30 09:44:10 UTC 2013


The problem with NTP server pools was caused by our usage of rdate, with ntpdate
or ntplib there shouldn't be any such problems.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/gui/spokes/datetime_spoke.glade | 14 --------------
 pyanaconda/ui/gui/spokes/datetime_spoke.py    |  7 -------
 2 files changed, 21 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
index a01e514..ce60e4b 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
@@ -787,20 +787,6 @@
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkLabel" id="poolsNote">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <attributes>
-              <attribute name="font-desc" value="Sans Italic 9"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 5e0c9ce..979ad61 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -55,8 +55,6 @@ SERVER_QUERY = 2
 
 DEFAULT_TZ = "America/New_York"
 
-POOL_SERVERS_NOTE = N_("Note: pool servers may not be available all the time")
-
 class NTPconfigDialog(GUIObject):
     builderObjects = ["ntpConfigDialog", "addImage", "serversStore"]
     mainWidgetName = "ntpConfigDialog"
@@ -112,13 +110,11 @@ class NTPconfigDialog(GUIObject):
 
         self._serverEntry = self.builder.get_object("serverEntry")
         self._serversStore = self.builder.get_object("serversStore")
-        self._poolsNote = self.builder.get_object("poolsNote")
 
         self._initialize_store_from_config()
 
     def _initialize_store_from_config(self):
         self._serversStore.clear()
-        self._poolsNote.set_text("")
 
         if self.data.timezone.ntpservers:
             for server in self.data.timezone.ntpservers:
@@ -242,9 +238,6 @@ class NTPconfigDialog(GUIObject):
 
         itr = self._serversStore.append([server, SERVER_QUERY, True])
 
-        if "pool" in server:
-            self._poolsNote.set_text(_(POOL_SERVERS_NOTE))
-
         #do not block UI while starting thread (may take some time)
         self._refresh_server_working(itr)
 
-- 
1.7.11.7



More information about the anaconda-patches mailing list