[network-manager-applet/NMA_0_8] security: get rid of toplevels where they aren't required



commit 1de8ed97644803457305bfde447b6bd08d127bd9
Author: Dan Williams <dcbw redhat com>
Date:   Tue Mar 29 14:34:46 2011 -0500

    security: get rid of toplevels where they aren't required
    
    See related editor commit:
    
    editor: fix widget refcounting by cleanup up .ui toplevel widgets
    
    for what's going on here.  Kill the toplevel widgets (which aren't
    used anyway) so we don't forget to destroy them.

 src/wireless-security/eap-method-leap.ui   |    6 ------
 src/wireless-security/eap-method-peap.ui   |    6 ------
 src/wireless-security/eap-method-simple.ui |    6 ------
 src/wireless-security/eap-method-tls.ui    |    6 ------
 src/wireless-security/eap-method-ttls.ui   |    6 ------
 src/wireless-security/ws-dynamic-wep.ui    |    6 ------
 src/wireless-security/ws-leap.ui           |    6 ------
 src/wireless-security/ws-wep-key.ui        |    6 ------
 src/wireless-security/ws-wpa-eap.ui        |    6 ------
 src/wireless-security/ws-wpa-psk.ui        |    6 ------
 10 files changed, 0 insertions(+), 60 deletions(-)
---
diff --git a/src/wireless-security/eap-method-leap.ui b/src/wireless-security/eap-method-leap.ui
index 97c7285..8d52bfc 100644
--- a/src/wireless-security/eap-method-leap.ui
+++ b/src/wireless-security/eap-method-leap.ui
@@ -2,10 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="eap_leap_widget">
-    <property name="visible">False</property>
-    <property name="title">eap_leap_widget</property>
-    <child>
       <object class="GtkNotebook" id="eap_leap_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -102,6 +98,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui
index bb0d916..6ebdbbd 100644
--- a/src/wireless-security/eap-method-peap.ui
+++ b/src/wireless-security/eap-method-peap.ui
@@ -28,10 +28,6 @@
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="eap_peap_widget">
-    <property name="visible">False</property>
-    <property name="title">eap_peap_widget</property>
-    <child>
       <object class="GtkNotebook" id="eap_peap_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -191,6 +187,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui
index 13bf457..db65ae8 100644
--- a/src/wireless-security/eap-method-simple.ui
+++ b/src/wireless-security/eap-method-simple.ui
@@ -2,10 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="eap_simple_widget">
-    <property name="visible">False</property>
-    <property name="title">eap_simple_widget</property>
-    <child>
       <object class="GtkNotebook" id="eap_simple_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -130,6 +126,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/eap-method-tls.ui b/src/wireless-security/eap-method-tls.ui
index 698b7c8..0150d6d 100644
--- a/src/wireless-security/eap-method-tls.ui
+++ b/src/wireless-security/eap-method-tls.ui
@@ -2,10 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="eap_tls_widget">
-    <property name="visible">False</property>
-    <property name="title">eap_tls_widget</property>
-    <child>
       <object class="GtkNotebook" id="eap_tls_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -186,6 +182,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui
index f75ecab..97a9c72 100644
--- a/src/wireless-security/eap-method-ttls.ui
+++ b/src/wireless-security/eap-method-ttls.ui
@@ -12,10 +12,6 @@
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="eap_ttls_widget">
-    <property name="visible">False</property>
-    <property name="title">eap_ttls_widget</property>
-    <child>
       <object class="GtkNotebook" id="eap_ttls_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -141,6 +137,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/ws-dynamic-wep.ui b/src/wireless-security/ws-dynamic-wep.ui
index f68a8e7..d993f60 100644
--- a/src/wireless-security/ws-dynamic-wep.ui
+++ b/src/wireless-security/ws-dynamic-wep.ui
@@ -12,10 +12,6 @@
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="dynamic_wep_widget">
-    <property name="visible">False</property>
-    <property name="title">dynamic_wep_widget</property>
-    <child>
       <object class="GtkNotebook" id="dynamic_wep_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -90,6 +86,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/ws-leap.ui b/src/wireless-security/ws-leap.ui
index e0c36a1..1e29880 100644
--- a/src/wireless-security/ws-leap.ui
+++ b/src/wireless-security/ws-leap.ui
@@ -2,10 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="leap_widget">
-    <property name="visible">False</property>
-    <property name="title">leap_widget</property>
-    <child>
       <object class="GtkNotebook" id="leap_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -102,7 +98,5 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
 
diff --git a/src/wireless-security/ws-wep-key.ui b/src/wireless-security/ws-wep-key.ui
index 8476273..7282c67 100644
--- a/src/wireless-security/ws-wep-key.ui
+++ b/src/wireless-security/ws-wep-key.ui
@@ -34,10 +34,6 @@
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="wep_key_widget">
-    <property name="visible">False</property>
-    <property name="title">wep_key_widget</property>
-    <child>
       <object class="GtkNotebook" id="wep_key_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -186,7 +182,5 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
 
diff --git a/src/wireless-security/ws-wpa-eap.ui b/src/wireless-security/ws-wpa-eap.ui
index fd1fe07..e98290c 100644
--- a/src/wireless-security/ws-wpa-eap.ui
+++ b/src/wireless-security/ws-wpa-eap.ui
@@ -12,10 +12,6 @@
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="wpa_eap_widget">
-    <property name="visible">False</property>
-    <property name="title">wpa_eap_widget</property>
-    <child>
       <object class="GtkNotebook" id="wpa_eap_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -83,6 +79,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/wireless-security/ws-wpa-psk.ui b/src/wireless-security/ws-wpa-psk.ui
index 123e86d..a9089f0 100644
--- a/src/wireless-security/ws-wpa-psk.ui
+++ b/src/wireless-security/ws-wpa-psk.ui
@@ -2,10 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="wpa_psk_widget">
-    <property name="visible">False</property>
-    <property name="title">wpa_psk_widget</property>
-    <child>
       <object class="GtkNotebook" id="wpa_psk_notebook">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
@@ -112,6 +108,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>



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